REMOVE BEFORE MERGE test drape stylepoi_displacement_designer_gen

415 files changed, 51032 insertions, 32282 deletions

diff --git a/android/assets/resources-6plus b/android/assets/resources-6plus
deleted file mode 120000
index 6d583e0106..0000000000
--- a/android/assets/resources-6plus
+++ /dev/null
@@ -1 +0,0 @@
-./../../data/resources-6plus
\ No newline at end of file
diff --git a/android/assets/resources-6plus_clear b/android/assets/resources-6plus_clear
deleted file mode 120000
index 1bdc16fa18..0000000000
--- a/android/assets/resources-6plus_clear
+++ /dev/null
@@ -1 +0,0 @@
-./../../data/resources-6plus_clear/
\ No newline at end of file
diff --git a/android/assets/resources-6plus_dark b/android/assets/resources-6plus_dark
deleted file mode 120000
index 67012541d8..0000000000
--- a/android/assets/resources-6plus_dark
+++ /dev/null
@@ -1 +0,0 @@
-./../../data/resources-6plus_dark/
\ No newline at end of file
diff --git a/data/colors.txt b/data/colors.txt
index fab7d43578..c7ee8397f6 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -2,7 +2,6 @@
 68
 255
 4369
-6425
 8738
 17408
 17510
@@ -56,14 +55,14 @@
 5592405
 5835017
 5835097
+5855577
 6052945
 6072320
 6316128
 6373439
-6381914
 6510384
 6513500
-6645086
+6645093
 6710886
 7368816
 7565931
@@ -100,7 +99,6 @@
 11579568
 11584112
 11710882
-11711154
 11720357
 11781233
 11899980
@@ -124,7 +122,6 @@
 13158496
 13158575
 13224123
-13229526
 13484259
 13487540
 13487565
@@ -162,6 +159,8 @@
 15132390
 15262932
 15326578
+15453902
+15456432
 15527148
 15591634
 15592411
@@ -183,8 +182,6 @@
 16241558
 16280377
 16284746
-16308697
-16311482
 16313580
 16314600
 16316632
@@ -198,9 +195,9 @@
 16645629
 16711680
 16728128
+16737830
 16741158
 16742144
-16742950
 16746062
 16746278
 16746413
@@ -212,10 +209,6 @@
 16777104
 16777164
 16777215
-436207616
-437326080
-451800027
-452984831
 656090368
 666683518
 855638016
@@ -227,45 +220,49 @@
 862151516
 863203947
 868862139
-871230427
 871954680
 872349696
 872384429
 872415231
-1292964096
 1297438020
 1298359132
 1300267136
 1307767538
-1308622847
 1712394496
 1713512994
-1715749956
 1716407869
+1719105399
 1724500155
+1726868443
 1727592696
-1728053247
+2148602112
 2149720610
 2155905152
 2158010528
 2160707771
+2163076059
 2163245296
 2163800312
 2164260863
 2578625202
 2583691263
+3003121664
+3003130402
 3003147264
 3003147776
 3003590793
 3004108620
+3004240128
 3011543168
 3012251804
+3012285408
 3012619920
 3014514918
 3014832818
 3015407360
 3015885506
 3017605120
+3018714075
 3018752750
 3019359744
 3019863808
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index c9a0569808..3c8305bd82 100644
--- a/data/drules_proto_clear.bin
+++ b/data/drules_proto_clear.bin
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 82dba2e20a..90f8438163 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -4,185 +4,185 @@ cont {
     scale: 14
     lines {
       width: 0.5
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
-      color: 1715749956
+      color: 1719105399
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
     scale: 15
     lines {
       width: 0.5
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 16
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1729
+      color: 7829367
+      priority: 1736
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -194,314 +194,185 @@ cont {
     scale: 14
     lines {
       width: 0.5
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
-      color: 1715749956
+      color: 1719105399
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
     scale: 15
     lines {
       width: 0.5
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 16
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1729
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.5
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "aerialway-drag_lift"
-  element {
-    scale: 14
-    lines {
-      width: 0.5
-      color: 4473924
-      priority: 1729
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.5
-      color: 1715749956
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 0.5
-      color: 4473924
-      priority: 1729
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.5
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1729
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.5
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1729
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.5
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1729
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.5
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15847
     }
   }
   element {
     scale: 19
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1729
+      color: 7829367
+      priority: 1736
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -513,185 +384,185 @@ cont {
     scale: 14
     lines {
       width: 0.5
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
-      color: 1715749956
+      color: 1719105399
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
     scale: 15
     lines {
       width: 0.5
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 16
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1729
+      color: 7829367
+      priority: 1736
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -703,185 +574,185 @@ cont {
     scale: 14
     lines {
       width: 0.5
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
-      color: 1715749956
+      color: 1719105399
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
     scale: 15
     lines {
       width: 0.5
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 16
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1864
+      color: 7829367
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     lines {
       width: 1.0
-      color: 4473924
-      priority: 1729
+      color: 7829367
+      priority: 1736
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 2.5
-      color: 4473924
+      color: 7829367
       dashdot {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -894,24 +765,24 @@ cont {
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
     scale: 15
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -919,16 +790,16 @@ cont {
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -936,16 +807,16 @@ cont {
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -953,16 +824,16 @@ cont {
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -970,249 +841,215 @@ cont {
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "aeroway-aerodrome"
   element {
-    scale: 10
-    area {
-      color: 13942770
-      priority: -15987
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 13942770
-      priority: -15987
-    }
-  }
-  element {
     scale: 12
     area {
       color: 13746411
-      priority: -15068
-    }
-    symbol {
-      name: "airport-m"
-      priority: 16932
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
-        text: "int_name"
-      }
-      priority: 15932
+      priority: -15987
     }
   }
   element {
     scale: 13
     area {
       color: 13615592
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 11
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 14
     area {
       color: 13484259
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 11
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 15
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 16
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 17
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 18
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 19
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
 }
@@ -1222,273 +1059,348 @@ cont {
     scale: 10
     area {
       color: 13942770
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-s"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 11
     area {
       color: 13942770
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-m"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 12
     area {
       color: 13746411
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-m"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 13
     area {
       color: 13615592
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 11
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 14
     area {
       color: 13484259
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 11
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 15
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 16
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 17
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 18
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 19
     area {
       color: 13155550
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
+        height: 14
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
       }
       secondary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 20
+        stroke_color: 16777215
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
 }
 cont {
   name: "aeroway-gate"
   element {
+    scale: 12
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
@@ -1496,47 +1408,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "aeroway-helipad"
   element {
+    scale: 12
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
-      name: "heliport-l"
-      priority: 16864
+      name: "heliport-m"
+      priority: 16847
     }
     caption {
       primary {
@@ -1544,14 +1531,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
-      name: "heliport-l"
-      priority: 16864
+      name: "heliport-m"
+      priority: 16847
     }
     caption {
       primary {
@@ -1559,14 +1546,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
-      name: "heliport-l"
-      priority: 16864
+      name: "heliport-m"
+      priority: 16847
     }
     caption {
       primary {
@@ -1574,7 +1561,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
@@ -1585,7 +1572,7 @@ cont {
     lines {
       width: 1.0
       color: 2163800312
-      priority: 1216
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1595,7 +1582,7 @@ cont {
     lines {
       width: 1.5
       color: 871954680
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1605,7 +1592,7 @@ cont {
     lines {
       width: 2.4
       color: 16316664
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1615,7 +1602,7 @@ cont {
     lines {
       width: 2.4
       color: 16316664
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1625,7 +1612,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1635,7 +1622,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1645,7 +1632,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1655,7 +1642,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1668,7 +1655,7 @@ cont {
     lines {
       width: 0.6
       color: 1727592696
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1678,7 +1665,7 @@ cont {
     lines {
       width: 1.2
       color: 1727592696
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1688,7 +1675,7 @@ cont {
     lines {
       width: 1.2
       color: 1727592696
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1698,7 +1685,7 @@ cont {
     lines {
       width: 1.2
       color: 1727592696
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1708,7 +1695,7 @@ cont {
     lines {
       width: 1.2
       color: 1727592696
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1718,7 +1705,7 @@ cont {
     lines {
       width: 1.2
       color: 1727592696
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1730,77 +1717,77 @@ cont {
     scale: 14
     area {
       color: 868862139
-      priority: -15690
+      priority: -15695
     }
   }
   element {
     scale: 15
     area {
       color: 868862139
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
-        color: 6381914
+        color: 6645093
       }
-      priority: 15310
+      priority: 15305
     }
   }
   element {
     scale: 16
     area {
       color: 13224123
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
-        color: 6381914
+        color: 6645093
       }
-      priority: 15310
+      priority: 15305
     }
   }
   element {
     scale: 17
     area {
       color: 12763315
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
-        color: 6381914
+        color: 6645093
       }
-      priority: 15310
+      priority: 15305
     }
   }
   element {
     scale: 18
     area {
       color: 12763315
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
-        color: 6381914
+        color: 6645093
       }
-      priority: 15310
+      priority: 15305
     }
   }
   element {
     scale: 19
     area {
       color: 12763315
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
-        color: 6381914
+        color: 6645093
       }
-      priority: 15310
+      priority: 15305
     }
   }
 }
@@ -1814,7 +1801,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -1825,43 +1812,208 @@ cont {
 cont {
   name: "amenity-atm"
   element {
+    scale: 12
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "atm-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "atm-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-bank"
   element {
+    scale: 12
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "bank-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -1869,139 +2021,442 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "bank-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "bank-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-bar"
   element {
+    scale: 12
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "beer-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "beer-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-bbq"
   element {
+    scale: 12
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bbq-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "bbq-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-bench"
   element {
+    scale: 12
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bench"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 19
     symbol {
       name: "bench"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-bicycle_rental"
   element {
+    scale: 12
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "bicycle-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -2009,37 +2464,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "bicycle-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "bicycle-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -2053,7 +2508,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -2064,34 +2519,130 @@ cont {
 cont {
   name: "amenity-bureau_de_change"
   element {
+    scale: 12
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "banknote-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "banknote-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -2100,7 +2651,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "bus-m"
+      name: "bus-l"
       apply_for_type: 1
       priority: 16000
     }
@@ -2108,103 +2659,167 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "bus-m"
-      priority: 16878
+      name: "bus-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "bus-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "bus-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "none"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "amenity-cafe"
   element {
+    scale: 12
+    symbol {
+      name: "cafe-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "cafe-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "cafe-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "cafe-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "cafe-m"
-      priority: 16864
+      name: "cafe-l"
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -2213,14 +2828,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "cafe-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -2228,136 +2843,406 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "cafe-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "cafe-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-car_rental"
   element {
+    scale: 12
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-car_sharing"
   element {
+    scale: 12
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-casino"
   element {
+    scale: 12
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "casino-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "casino-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -2371,7 +3256,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -2382,10 +3267,70 @@ cont {
 cont {
   name: "amenity-clinic"
   element {
+    scale: 12
+    symbol {
+      name: "hospital-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hospital-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hospital-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hospital-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "hospital-m"
-      priority: 16837
+      name: "hospital-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -2393,14 +3338,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 17
     symbol {
       name: "hospital-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
@@ -2408,47 +3353,107 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "hospital-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "hospital-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-college"
   element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "college-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "college-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "college-m"
-      priority: 16864
+      name: "college-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -2456,14 +3461,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "college-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -2471,37 +3476,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "college-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "college-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
@@ -2515,7 +3520,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -2533,7 +3538,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -2544,42 +3549,152 @@ cont {
 cont {
   name: "amenity-drinking_water"
   element {
+    scale: 12
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "drinking-water-l"
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 18
     symbol {
       name: "drinking-water-l"
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 19
     symbol {
       name: "drinking-water-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-embassy"
   element {
+    scale: 12
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "embassy-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -2587,70 +3702,160 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "embassy-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "embassy-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-fast_food"
   element {
+    scale: 12
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "fastfood-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "fastfood-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -2661,15 +3866,15 @@ cont {
     symbol {
       name: "ship-s"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
   }
   element {
     scale: 15
     symbol {
-      name: "ship-m"
+      name: "ship-s"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
   }
   element {
@@ -2677,16 +3882,16 @@ cont {
     symbol {
       name: "ship-m"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -2694,16 +3899,16 @@ cont {
     symbol {
       name: "ship-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -2711,86 +3916,248 @@ cont {
     symbol {
       name: "ship-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "none"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "amenity-fire_station"
   element {
+    scale: 12
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "fire_station-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "none"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-fountain"
   element {
+    scale: 12
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 16
     area {
       color: 9163744
-      priority: -15771
+      priority: -15167
+    }
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 9163744
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "fountain-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -2798,55 +4165,130 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 9163744
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "fountain-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 9163744
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "fountain-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-fuel"
   element {
+    scale: 12
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "fuel-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -2854,37 +4296,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "fuel-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "fuel-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
@@ -2894,32 +4336,32 @@ cont {
     scale: 14
     area {
       color: 666683518
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 15
     area {
       color: 12372094
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 16
     area {
       color: 11781233
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 17
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -2927,18 +4369,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 18
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -2946,26 +4388,26 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 19
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "none"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
 }
@@ -2975,32 +4417,32 @@ cont {
     scale: 14
     area {
       color: 666683518
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 15
     area {
       color: 12372094
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 16
     area {
       color: 11781233
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 17
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -3008,18 +4450,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 18
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -3027,54 +4469,108 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 19
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "none"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
 }
 cont {
   name: "amenity-hospital"
   element {
+    scale: 12
+    symbol {
+      name: "hospital-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hospital-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 14
     area {
-      color: 16308697
-      priority: -15973
+      color: 15453902
+      priority: -15139
+    }
+    symbol {
+      name: "hospital-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 15
     area {
-      color: 16308697
-      priority: -15973
+      color: 15453902
+      priority: -15139
+    }
+    symbol {
+      name: "hospital-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 16
     area {
-      color: 16308697
-      priority: -15122
+      color: 15453902
+      priority: -15139
     }
     symbol {
-      name: "hospital-m"
-      priority: 16878
+      name: "hospital-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -3082,18 +4578,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     area {
-      color: 16308697
-      priority: -15122
+      color: 15453902
+      priority: -15139
     }
     symbol {
       name: "hospital-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -3101,56 +4597,100 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     area {
-      color: 16308697
-      priority: -15122
+      color: 15453902
+      priority: -15139
     }
     symbol {
       name: "hospital-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     area {
-      color: 16308697
-      priority: -15122
+      color: 15453902
+      priority: -15139
     }
     symbol {
       name: "hospital-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "amenity-hunting_stand"
   element {
+    scale: 12
+    symbol {
+      name: "hunting-tower-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hunting-tower-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hunting-tower-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 15
     symbol {
-      name: "hunting-tower-m"
-      apply_for_type: 1
-      priority: 16851
+      name: "hunting-tower-l"
+      priority: 16833
     }
     caption {
       primary {
@@ -3158,15 +4698,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 16
     symbol {
-      name: "hunting-tower-m"
-      apply_for_type: 1
-      priority: 16851
+      name: "hunting-tower-l"
+      priority: 16833
     }
     caption {
       primary {
@@ -3174,15 +4713,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 17
     symbol {
-      name: "hunting-tower-m"
-      apply_for_type: 1
-      priority: 16851
+      name: "hunting-tower-l"
+      priority: 16833
     }
     caption {
       primary {
@@ -3190,47 +4728,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "hunting-tower-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "hunting-tower-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-kindergarten"
   element {
+    scale: 12
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "kindergarten-l"
-      priority: 16824
+      priority: 16819
     }
     caption {
       primary {
@@ -3238,844 +4851,2315 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15824
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "kindergarten-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "kindergarten-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-library"
   element {
+    scale: 12
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "library-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "library-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-marketplace"
   element {
+    scale: 12
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "marketplace-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "marketplace-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-nightclub"
   element {
+    scale: 12
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bar-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "bar-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-parking"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-fee"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-multi-storey"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-multi-storey-fee"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-no-access"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-park_and_ride"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-permissive"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "zero-icon"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-permissive-fee"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "zero-icon"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-private"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "zero-icon"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-underground"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-underground-fee"
   element {
+    scale: 12
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 15921870
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 15921870
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-pharmacy"
   element {
+    scale: 12
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "pharmacy-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "pharmacy-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-place_of_worship"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4083,18 +7167,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4102,59 +7186,119 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4162,18 +7306,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4181,59 +7325,119 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-christian"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4241,18 +7445,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4260,59 +7464,119 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-hindu"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4320,18 +7584,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4339,59 +7603,119 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-jewish"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4399,18 +7723,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4418,59 +7742,119 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-muslim"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4478,18 +7862,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4497,59 +7881,119 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-shinto"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4557,18 +8001,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4576,59 +8020,119 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-taoist"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4636,18 +8140,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4655,55 +8159,130 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 16316664
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-police"
   element {
+    scale: 12
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "police-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4711,81 +8290,251 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "police-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "police-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-post_box"
   element {
+    scale: 12
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "postbox-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "postbox-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-post_office"
   element {
+    scale: 12
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
-      name: "mail-l"
+      name: "mail-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
@@ -4793,7 +8542,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
@@ -4801,63 +8550,153 @@ cont {
     symbol {
       name: "mail-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "mail-m"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-pub"
   element {
+    scale: 12
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "beer-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "beer-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
@@ -4867,25 +8706,89 @@ cont {
     scale: 19
     symbol {
       name: "recycling-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-restaurant"
   element {
+    scale: 12
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "restaurant-m"
-      priority: 16864
+      name: "restaurant-l"
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -4894,14 +8797,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4909,47 +8812,111 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-restaurant-vegan"
   element {
+    scale: 12
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "restaurant-m"
-      priority: 16864
+      name: "restaurant-l"
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -4958,14 +8925,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4973,47 +8940,111 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-restaurant-vegetarian"
   element {
+    scale: 12
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "restaurant-m"
-      priority: 16864
+      name: "restaurant-l"
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -5022,14 +9053,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -5037,47 +9068,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-school"
   element {
+    scale: 12
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "school-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -5085,47 +9191,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "school-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "school-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-shelter"
   element {
+    scale: 12
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "picnic-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -5133,37 +9314,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "picnic-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "none"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -5177,7 +9358,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -5188,33 +9369,123 @@ cont {
 cont {
   name: "amenity-taxi"
   element {
+    scale: 12
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "taxi-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "taxi-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -5224,25 +9495,89 @@ cont {
     scale: 19
     symbol {
       name: "phone-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-theatre"
   element {
+    scale: 12
+    symbol {
+      name: "theatre-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "theatre-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "theatre-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "theatre-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
       name: "theatre-l"
-      priority: 16864
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -5251,14 +9586,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "theatre-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -5266,70 +9601,160 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "theatre-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "theatre-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-toilets"
   element {
+    scale: 12
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "toilets-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "toilets-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -5343,7 +9768,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -5354,23 +9779,490 @@ cont {
 cont {
   name: "amenity-university"
   element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
     scale: 14
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
   }
   element {
     scale: 15
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
-      name: "college-m"
-      apply_for_type: 1
+      name: "college-l"
       priority: 16013
-      min_distance: 12
+      min_distance: 11
     }
     caption {
       primary {
@@ -5378,15 +10270,163 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 15
     area {
-      color: 16311482
-      priority: -15122
+      color: 15456432
+      priority: -15167
     }
     caption {
       primary {
@@ -5394,18 +10434,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15833
     }
     apply_if: "!name"
   }
   element {
     scale: 16
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
-      name: "college-m"
+      name: "college-l"
       priority: 16013
       min_distance: 11
     }
@@ -5415,16 +10455,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 16
     area {
-      color: 16311482
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 16
+    area {
+      color: 15456432
       priority: -15987
     }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
     caption {
       primary {
         height: 10
@@ -5433,16 +10494,32 @@ cont {
       }
       priority: 15013
     }
+    apply_if: "name"
+  }
+  element {
+    scale: 16
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
     apply_if: "!name"
   }
   element {
     scale: 16
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
-      name: "college-m"
+      name: "college-l"
       priority: 16013
       min_distance: 11
     }
@@ -5452,16 +10529,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 16
     area {
-      color: 16311482
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 16
+    area {
+      color: 15456432
       priority: -15987
     }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
     caption {
       primary {
         height: 10
@@ -5470,12 +10568,28 @@ cont {
       }
       priority: 15013
     }
+    apply_if: "name"
+  }
+  element {
+    scale: 16
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
     apply_if: "!name"
   }
   element {
     scale: 17
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
@@ -5489,15 +10603,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 17
     area {
-      color: 16311482
-      priority: -15136
+      color: 15456432
+      priority: -15167
     }
     caption {
       primary {
@@ -5505,14 +10619,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
   element {
     scale: 17
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
@@ -5526,15 +10640,89 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 15456432
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 15456432
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 17
     area {
-      color: 16311482
-      priority: -15136
+      color: 15456432
+      priority: -15167
     }
     caption {
       primary {
@@ -5542,14 +10730,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
   element {
     scale: 18
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
@@ -5558,34 +10746,34 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 18
     area {
-      color: 16311482
-      priority: -15136
+      color: 15456432
+      priority: -15167
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
   element {
     scale: 18
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
@@ -5594,34 +10782,34 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 18
     area {
-      color: 16311482
-      priority: -15136
+      color: 15456432
+      priority: -15167
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
   element {
     scale: 19
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
@@ -5630,38 +10818,38 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 19
     area {
-      color: 16311482
-      priority: -15136
+      color: 15456432
+      priority: -15167
     }
     symbol {
       name: "none"
-      priority: 16864
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
   element {
     scale: 19
     area {
-      color: 16311482
+      color: 15456432
       priority: -15987
     }
     symbol {
@@ -5670,31 +10858,31 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
   element {
     scale: 19
     area {
-      color: 16311482
-      priority: -15136
+      color: 15456432
+      priority: -15167
     }
     symbol {
       name: "none"
-      priority: 16864
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
@@ -5702,99 +10890,369 @@ cont {
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
+    scale: 12
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "vending-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-vending_machine-public_transport_tickets"
   element {
+    scale: 12
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "vending-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-waste_disposal"
   element {
+    scale: 12
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "recycling-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "recycling-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -5804,77 +11262,77 @@ cont {
     scale: 14
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 15
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 16
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 17
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 18
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 19
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
 }
@@ -5884,42 +11342,42 @@ cont {
     scale: 14
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 15
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 16
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 17
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 18
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 19
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
   }
 }
@@ -5929,184 +11387,136 @@ cont {
     scale: 14
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 15
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 16
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 17
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 18
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
+        color: 5855577
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 19
     area {
       color: 15592411
-      priority: -15838
-    }
-    caption {
-      primary {
-        height: 11
-        color: 6710886
-      }
-      priority: 15162
-    }
-  }
-}
-cont {
-  name: "barrier-block"
-  element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dot-m"
-      priority: 16851
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 4473924
-        offset_y: 10
+        color: 5855577
       }
-      priority: 15851
+      priority: 15166
     }
   }
 }
 cont {
-  name: "barrier-bollard"
+  name: "barrier-border_control"
   element {
-    scale: 17
+    scale: 12
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "bcontrol-l"
+      apply_for_type: 1
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15861
     }
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "bcontrol-l"
+      apply_for_type: 1
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15861
     }
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "bcontrol-l"
+      apply_for_type: 1
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15861
     }
   }
-}
-cont {
-  name: "barrier-border_control"
   element {
     scale: 15
     symbol {
-      name: "bcontrol-m"
+      name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6114,15 +11524,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "bcontrol-m"
+      name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6130,7 +11540,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -6138,7 +11548,7 @@ cont {
     symbol {
       name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6146,7 +11556,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -6154,7 +11564,7 @@ cont {
     symbol {
       name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6162,7 +11572,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -6170,7 +11580,7 @@ cont {
     symbol {
       name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6178,7 +11588,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -6187,13 +11597,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6201,13 +11611,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6215,13 +11625,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6229,78 +11639,89 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "barrier-entrance"
+  name: "barrier-fence"
   element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      priority: 16851
+    scale: 16
+    lines {
+      width: 0.5
+      color: 8355446
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 1638
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 8355446
+      dashdot {
+        dd: 1.0
+        dd: 1.0
       }
-      priority: 15851
+      priority: 1638
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
+    lines {
+      width: 1.0
+      color: 8355446
+      dashdot {
+        dd: 1.0
+        dd: 1.0
       }
-      priority: 15851
+      priority: 1638
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
+    lines {
+      width: 1.0
+      color: 8355446
+      dashdot {
+        dd: 1.0
+        dd: 1.0
       }
-      priority: 15851
+      priority: 1638
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "barrier-fence"
+  name: "barrier-hedge"
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6308,13 +11729,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6322,13 +11743,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6336,155 +11757,138 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "barrier-gate"
+  name: "barrier-lift_gate"
   element {
-    scale: 17
+    scale: 12
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "lift_gate-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "lift_gate-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "lift_gate-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
-}
-cont {
-  name: "barrier-hedge"
   element {
-    scale: 16
-    lines {
-      width: 0.7
-      color: 8355446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1635
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    scale: 15
+    symbol {
+      name: "lift_gate-l"
+      priority: 16819
     }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.2
-      color: 8355446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
       }
-      priority: 1635
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15819
     }
   }
   element {
-    scale: 18
-    lines {
-      width: 1.4
-      color: 8355446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
+    scale: 16
+    symbol {
+      name: "lift_gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
       }
-      priority: 1635
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15819
     }
   }
   element {
-    scale: 19
-    lines {
-      width: 1.4
-      color: 8355446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
+    scale: 17
+    symbol {
+      name: "lift_gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
       }
-      priority: 1635
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15819
     }
   }
-}
-cont {
-  name: "barrier-lift_gate"
   element {
     scale: 18
     symbol {
       name: "lift_gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "lift_gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -6493,13 +11897,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6507,13 +11911,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6521,13 +11925,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6535,73 +11939,70 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "barrier-stile"
+  name: "barrier-toll_booth"
   element {
-    scale: 17
+    scale: 12
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
-}
-cont {
-  name: "barrier-toll_booth"
   element {
     scale: 15
     symbol {
-      name: "toll_booth-m"
-      priority: 16878
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -6609,14 +12010,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15819
     }
   }
   element {
     scale: 16
     symbol {
-      name: "toll_booth-m"
-      priority: 16878
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -6624,14 +12025,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15819
     }
   }
   element {
     scale: 17
     symbol {
       name: "toll_booth-l"
-      priority: 16878
+      priority: 16819
     }
     caption {
       primary {
@@ -6639,37 +12040,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "toll_booth-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "toll_booth-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -6678,13 +12079,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6692,13 +12093,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6706,13 +12107,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6720,13 +12121,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6739,7 +12140,7 @@ cont {
     lines {
       width: 0.5
       color: 1298359132
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6749,7 +12150,7 @@ cont {
     lines {
       width: 0.5
       color: 862151516
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6759,7 +12160,7 @@ cont {
     lines {
       width: 0.6
       color: 6513500
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6769,7 +12170,7 @@ cont {
     lines {
       width: 0.8
       color: 6513500
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6779,7 +12180,7 @@ cont {
     lines {
       width: 0.85
       color: 6513500
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6789,7 +12190,7 @@ cont {
     lines {
       width: 1.0
       color: 6513500
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6799,121 +12200,11 @@ cont {
     lines {
       width: 1.1
       color: 6513500
-      priority: 1283
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 10
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
   }
-  element {
-    scale: 13
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.4
-      color: 6513500
-      priority: 1283
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
 }
 cont {
   name: "boundary-administrative-3"
@@ -6926,7 +12217,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6943,7 +12234,7 @@ cont {
         dd: 1.35
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6957,7 +12248,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6971,7 +12262,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6985,7 +12276,7 @@ cont {
         dd: 1.44
         dd: 1.44
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6999,7 +12290,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7013,7 +12304,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7027,7 +12318,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7041,7 +12332,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7055,7 +12346,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7069,7 +12360,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7083,7 +12374,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7097,7 +12388,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7111,7 +12402,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7125,7 +12416,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7139,7 +12430,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7156,7 +12447,7 @@ cont {
         dd: 1.35
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7170,7 +12461,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7184,7 +12475,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7198,7 +12489,7 @@ cont {
         dd: 1.44
         dd: 1.44
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7212,7 +12503,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7226,7 +12517,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7240,7 +12531,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7254,7 +12545,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7268,7 +12559,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7282,7 +12573,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7296,7 +12587,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7310,7 +12601,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7324,7 +12615,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7338,7 +12629,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7352,7 +12643,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7364,77 +12655,77 @@ cont {
     scale: 14
     area {
       color: 2160707771
-      priority: 1298
+      priority: 1292
     }
   }
   element {
     scale: 15
     area {
       color: 1724500155
-      priority: 1298
+      priority: 1292
     }
   }
   element {
     scale: 16
     area {
       color: 868862139
-      priority: 1352
+      priority: 1348
     }
     caption {
       primary {
-        height: 9
-        color: 6645086
+        height: 8
+        color: 8355446
         text: "addr:housename"
       }
-      priority: 15351
+      priority: 15347
     }
   }
   element {
     scale: 17
     area {
       color: 12763315
-      priority: 1352
+      priority: 1348
     }
     caption {
       primary {
         height: 9
-        color: 6381914
+        color: 6645093
       }
       secondary {
         height: 8
-        color: 6381914
+        color: 6645093
         offset_y: 20
         text: "int_name"
       }
-      priority: 15351
+      priority: 15347
     }
   }
   element {
     scale: 18
     area {
       color: 12763315
-      priority: 1352
+      priority: 1348
     }
     caption {
       primary {
-        height: 11
-        color: 6381914
+        height: 10
+        color: 6645093
       }
-      priority: 15351
+      priority: 15347
     }
   }
   element {
     scale: 19
     area {
       color: 12763315
-      priority: 1352
+      priority: 1348
     }
     caption {
       primary {
-        height: 11
-        color: 6381914
+        height: 10
+        color: 6645093
       }
-      priority: 15351
+      priority: 15347
     }
   }
 }
@@ -7444,11 +12735,11 @@ cont {
     scale: 16
     caption {
       primary {
-        height: 9
-        color: 6645086
+        height: 8
+        color: 8355446
         text: "addr:housename"
       }
-      priority: 15351
+      priority: 15347
     }
   }
   element {
@@ -7456,398 +12747,35 @@ cont {
     caption {
       primary {
         height: 9
-        color: 6381914
+        color: 6645093
       }
       secondary {
         height: 8
-        color: 6381914
+        color: 6645093
         offset_y: 20
         text: "int_name"
       }
-      priority: 15351
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 6381914
-      }
-      priority: 15351
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 6381914
-      }
-      priority: 15351
-    }
-  }
-}
-cont {
-  name: "craft-brewery"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-carpenter"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
+      priority: 15347
     }
   }
   element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-electrician"
-  element {
     scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
     caption {
       primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-gardener"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-hvac"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-metal_construction"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-painter"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-photographer"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-plumber"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-shoemaker"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-tailor"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
+        height: 10
+        color: 6645093
       }
-      priority: 15837
+      priority: 15347
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
     caption {
       primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
+        height: 10
+        color: 6645093
       }
-      priority: 15837
+      priority: 15347
     }
   }
 }
@@ -7858,16 +12786,16 @@ cont {
     symbol {
       name: "entrance-s"
       apply_for_type: 1
-      priority: 16081
+      priority: 16083
     }
     caption {
       primary {
         height: 10
-        color: 6381914
+        color: 6645093
         offset_x: 9
         text: "ref"
       }
-      priority: 15081
+      priority: 15083
     }
   }
   element {
@@ -7875,22 +12803,22 @@ cont {
     symbol {
       name: "entrance-s"
       apply_for_type: 1
-      priority: 16081
+      priority: 16083
     }
     caption {
       primary {
         height: 10
-        color: 6381914
+        color: 6645093
         offset_x: 9
         text: "ref"
       }
       secondary {
         height: 12
-        color: 6381914
+        color: 6645093
         offset_y: 10
         text: "addr:flats"
       }
-      priority: 15081
+      priority: 15083
     }
   }
 }
@@ -7905,7 +12833,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1418
+      priority: 1416
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7919,17 +12847,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -7941,17 +12869,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -7963,17 +12891,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -7985,17 +12913,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8007,17 +12935,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
 }
@@ -8032,7 +12960,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1418
+      priority: 1416
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8046,17 +12974,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8068,17 +12996,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8090,17 +13018,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8112,17 +13040,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8134,17 +13062,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
 }
@@ -8159,7 +13087,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1418
+      priority: 1416
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8173,17 +13101,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8195,17 +13123,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8217,17 +13145,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8239,17 +13167,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8261,17 +13189,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
 }
@@ -8286,7 +13214,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1418
+      priority: 1416
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8300,17 +13228,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8322,17 +13250,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8344,17 +13272,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8366,17 +13294,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8388,89 +13316,73 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16432
+      priority: 16430
     }
   }
 }
 cont {
   name: "highway-bus_stop"
   element {
-    scale: 16
-    symbol {
-      name: "bus-m"
-      priority: 16878
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "bus-l"
-      priority: 16878
-    }
-    caption {
-      primary {
-        height: 11
-        color: 3355443
-        stroke_color: 452984831
-        offset_y: 10
-      }
-      priority: 15878
+      name: "bus-m"
+      priority: 16861
     }
   }
   element {
     scale: 18
     symbol {
       name: "bus-l"
-      priority: 16878
+      priority: 16861
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15878
+      priority: 16861
     }
   }
   element {
     scale: 19
     symbol {
       name: "bus-l"
-      priority: 16878
+      priority: 16861
     }
-    caption {
+    path_text {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15878
+      priority: 16861
     }
   }
 }
@@ -8485,7 +13397,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8499,7 +13411,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8513,7 +13425,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8527,7 +13439,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8541,7 +13453,7 @@ cont {
         dd: 10.8
         dd: 4.5
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8555,7 +13467,7 @@ cont {
         dd: 13.5
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8569,7 +13481,7 @@ cont {
         dd: 18.0
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8582,7 +13494,7 @@ cont {
     lines {
       width: 1.0
       color: 872384429
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8592,7 +13504,7 @@ cont {
     lines {
       width: 1.2
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8602,90 +13514,50 @@ cont {
     lines {
       width: 1.4
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 16
     lines {
       width: 1.6
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 17
     lines {
       width: 1.8
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 18
     lines {
       width: 2.0
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 19
     lines {
       width: 2.2
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
 }
 cont {
@@ -8695,7 +13567,7 @@ cont {
     lines {
       width: 1.0
       color: 872384429
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8705,7 +13577,7 @@ cont {
     lines {
       width: 1.2
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8715,90 +13587,50 @@ cont {
     lines {
       width: 1.4
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 16
     lines {
       width: 1.6
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 17
     lines {
       width: 1.8
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 18
     lines {
       width: 2.0
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 19
     lines {
       width: 2.2
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
 }
 cont {
@@ -8808,7 +13640,7 @@ cont {
     lines {
       width: 1.0
       color: 872384429
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8818,7 +13650,7 @@ cont {
     lines {
       width: 1.2
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8828,90 +13660,50 @@ cont {
     lines {
       width: 1.4
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 16
     lines {
       width: 1.6
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 17
     lines {
       width: 1.8
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 18
     lines {
       width: 2.0
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 19
     lines {
       width: 2.2
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
 }
 cont {
@@ -8921,7 +13713,7 @@ cont {
     lines {
       width: 1.0
       color: 872384429
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8931,7 +13723,7 @@ cont {
     lines {
       width: 1.2
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8941,90 +13733,50 @@ cont {
     lines {
       width: 1.4
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 8
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 16
     lines {
       width: 1.6
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 17
     lines {
       width: 1.8
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 18
     lines {
       width: 2.0
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 19
     lines {
       width: 2.2
       color: 16746413
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16662
-    }
   }
 }
 cont {
@@ -9038,7 +13790,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9052,17 +13804,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9074,7 +13826,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9082,9 +13834,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9096,7 +13848,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9104,9 +13856,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9118,17 +13870,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9140,17 +13892,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9165,7 +13917,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9179,17 +13931,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9201,7 +13953,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9209,9 +13961,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9223,7 +13975,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9231,9 +13983,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9245,17 +13997,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9267,17 +14019,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9292,13 +14044,13 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
   }
   element {
@@ -9310,21 +14062,21 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 872415231
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -9336,21 +14088,21 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 872415231
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -9362,21 +14114,21 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 872415231
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -9388,21 +14140,21 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 872415231
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -9414,21 +14166,21 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 872415231
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
 }
@@ -9443,21 +14195,21 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9471,31 +14223,31 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9507,21 +14259,21 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9529,9 +14281,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9543,21 +14295,21 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 5.2
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9565,9 +14317,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9579,31 +14331,31 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 7.2
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9615,31 +14367,31 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9654,7 +14406,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9668,17 +14420,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9690,7 +14442,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9698,9 +14450,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9712,7 +14464,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9720,9 +14472,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9734,17 +14486,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9756,17 +14508,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9781,7 +14533,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9795,17 +14547,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9817,7 +14569,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9825,9 +14577,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9839,7 +14591,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9847,9 +14599,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9861,17 +14613,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9883,17 +14635,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9908,7 +14660,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9922,17 +14674,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9944,7 +14696,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9952,9 +14704,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9966,7 +14718,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9974,9 +14726,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9988,17 +14740,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10010,17 +14762,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10035,7 +14787,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10049,17 +14801,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10071,7 +14823,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10079,9 +14831,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10093,7 +14845,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10101,9 +14853,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10115,17 +14867,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10137,17 +14889,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10162,7 +14914,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10176,17 +14928,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10198,7 +14950,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10206,9 +14958,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10220,7 +14972,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10228,9 +14980,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10242,17 +14994,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10264,17 +15016,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10289,7 +15041,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10303,17 +15055,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10325,7 +15077,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10333,9 +15085,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10347,7 +15099,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10355,9 +15107,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10369,17 +15121,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10391,17 +15143,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10416,7 +15168,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10430,17 +15182,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10452,7 +15204,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10460,9 +15212,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10474,7 +15226,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10482,9 +15234,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10496,17 +15248,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10518,17 +15270,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10543,7 +15295,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10557,17 +15309,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10579,7 +15331,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10587,9 +15339,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10597,7 +15349,7 @@ cont {
     lines {
       width: 5.8
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10608,7 +15360,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10619,7 +15371,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10627,9 +15379,9 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10637,7 +15389,7 @@ cont {
     lines {
       width: 7.8
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10648,7 +15400,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10659,17 +15411,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10677,7 +15429,7 @@ cont {
     lines {
       width: 9.0
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10688,7 +15440,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10699,118 +15451,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
-    }
-  }
-}
-cont {
-  name: "highway-ford"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 16316664
-      dashdot {
-        dd: 2.0
-        dd: 1.0
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 16316664
-      dashdot {
-        dd: 3.6
-        dd: 1.6
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 16316664
-      dashdot {
-        dd: 5.0
-        dd: 2.2
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.4
-      color: 16316664
-      dashdot {
-        dd: 5.4
-        dd: 2.7
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 16316664
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 16316664
-      dashdot {
-        dd: 7.0
-        dd: 3.0
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 5.0
-      color: 16316664
-      dashdot {
-        dd: 16.2
-        dd: 8.1
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 16444
     }
   }
 }
@@ -10819,9 +15470,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -10849,7 +15500,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -10867,7 +15518,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -10885,7 +15536,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -10903,7 +15554,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -10921,7 +15572,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -10939,7 +15590,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -10950,9 +15601,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -10980,7 +15631,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -10998,7 +15649,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -11016,7 +15667,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -11034,7 +15685,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -11052,7 +15703,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -11070,7 +15721,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -11081,9 +15732,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11111,7 +15762,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -11129,7 +15780,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -11158,7 +15809,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -11187,7 +15838,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -11216,7 +15867,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -11245,7 +15896,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -11256,9 +15907,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
-      color: 16742950
-      priority: 1621
+      width: 0.6
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11266,9 +15917,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
-      color: 16742950
-      priority: 1621
+      width: 0.7
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11276,9 +15927,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
-      color: 16741158
-      priority: 1621
+      width: 1.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11286,9 +15937,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
-      color: 16741158
-      priority: 1621
+      width: 1.3
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11296,24 +15947,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
-      color: 16742950
-      priority: 1621
+      width: 1.8
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11321,24 +15972,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.9
-      color: 16741158
-      priority: 1621
+      width: 2.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11346,15 +15997,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11362,8 +16013,8 @@ cont {
     scale: 13
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11371,15 +16022,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11387,8 +16038,8 @@ cont {
     scale: 14
     lines {
       width: 3.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11396,15 +16047,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11412,8 +16063,8 @@ cont {
     scale: 15
     lines {
       width: 4.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11421,15 +16072,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -11437,8 +16088,8 @@ cont {
     scale: 16
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11446,15 +16097,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -11462,8 +16113,8 @@ cont {
     scale: 17
     lines {
       width: 9.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11471,15 +16122,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -11487,8 +16138,8 @@ cont {
     scale: 18
     lines {
       width: 12.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11496,15 +16147,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -11512,8 +16163,8 @@ cont {
     scale: 19
     lines {
       width: 15.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -11521,15 +16172,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -11539,9 +16190,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
-      color: 16742950
-      priority: 1621
+      width: 0.6
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11549,9 +16200,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
-      color: 16742950
-      priority: 1621
+      width: 0.7
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11559,9 +16210,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
-      color: 16741158
-      priority: 1621
+      width: 1.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11569,9 +16220,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
-      color: 16741158
-      priority: 1621
+      width: 1.3
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11579,24 +16230,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
-      color: 16742950
-      priority: 1621
+      width: 1.8
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11604,24 +16255,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.9
-      color: 16741158
-      priority: 1621
+      width: 2.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11629,15 +16280,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11645,22 +16296,22 @@ cont {
     scale: 13
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11668,15 +16319,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11684,22 +16335,22 @@ cont {
     scale: 14
     lines {
       width: 3.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11707,15 +16358,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11723,22 +16374,22 @@ cont {
     scale: 15
     lines {
       width: 4.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11746,15 +16397,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -11762,22 +16413,22 @@ cont {
     scale: 16
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11785,15 +16436,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -11801,22 +16452,22 @@ cont {
     scale: 17
     lines {
       width: 9.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 19.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 21.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11824,15 +16475,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -11840,22 +16491,22 @@ cont {
     scale: 18
     lines {
       width: 12.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 26.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11863,15 +16514,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -11879,22 +16530,22 @@ cont {
     scale: 19
     lines {
       width: 15.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 32.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 34.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -11902,15 +16553,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -11920,9 +16571,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
-      color: 16742950
-      priority: 1621
+      width: 0.6
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11930,9 +16581,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
-      color: 16742950
-      priority: 1621
+      width: 0.7
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11940,9 +16591,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
-      color: 16741158
-      priority: 1621
+      width: 1.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11950,9 +16601,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
-      color: 16741158
-      priority: 1621
+      width: 1.3
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11960,24 +16611,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
-      color: 16742950
-      priority: 1621
+      width: 1.8
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11985,35 +16636,35 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 2.9
+      width: 3.0
       color: 8421504
       dashdot {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.0
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -12021,15 +16672,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -12042,14 +16693,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12057,15 +16708,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -12078,14 +16729,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12093,15 +16744,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -12114,14 +16765,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12129,15 +16780,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -12150,14 +16801,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12165,15 +16816,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -12186,14 +16837,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12201,15 +16852,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -12222,14 +16873,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12237,15 +16888,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -12258,14 +16909,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12273,15 +16924,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -12295,7 +16946,7 @@ cont {
         height: 9
         color: 3355443
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -12305,7 +16956,7 @@ cont {
         height: 10
         color: 3355443
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -12315,7 +16966,7 @@ cont {
         height: 10
         color: 3355443
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -12325,7 +16976,7 @@ cont {
         height: 10
         color: 3355443
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -12335,7 +16986,7 @@ cont {
         height: 10
         color: 3355443
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
@@ -12347,7 +16998,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -12358,7 +17009,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -12369,7 +17020,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -12378,8 +17029,8 @@ cont {
     scale: 13
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12387,15 +17038,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12403,8 +17054,8 @@ cont {
     scale: 14
     lines {
       width: 3.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12412,15 +17063,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12428,8 +17079,8 @@ cont {
     scale: 15
     lines {
       width: 2.4
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12437,15 +17088,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -12453,8 +17104,8 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12462,17 +17113,17 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 17
     lines {
       width: 4.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12480,17 +17131,17 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 18
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12498,17 +17149,17 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 19
     lines {
       width: 7.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12516,9 +17167,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -12530,7 +17181,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -12541,7 +17192,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -12552,7 +17203,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -12561,8 +17212,8 @@ cont {
     scale: 13
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12570,15 +17221,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12586,22 +17237,22 @@ cont {
     scale: 14
     lines {
       width: 3.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12609,15 +17260,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12625,22 +17276,22 @@ cont {
     scale: 15
     lines {
       width: 2.4
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12648,15 +17299,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -12664,22 +17315,22 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12687,31 +17338,31 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 17
     lines {
       width: 4.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12719,31 +17370,31 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 18
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12751,31 +17402,31 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 19
     lines {
       width: 7.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 19.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12783,9 +17434,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -12797,7 +17448,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -12808,7 +17459,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -12819,7 +17470,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -12833,14 +17484,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12848,15 +17499,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12869,14 +17520,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 16557154
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12884,15 +17535,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12905,14 +17556,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12920,15 +17571,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -12941,14 +17592,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12956,9 +17607,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12970,14 +17621,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12985,9 +17636,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12999,14 +17650,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13014,9 +17665,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -13028,14 +17679,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13043,9 +17694,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -13060,7 +17711,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13074,17 +17725,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13096,17 +17747,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13118,17 +17769,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13140,17 +17791,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13162,17 +17813,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13187,7 +17838,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13201,17 +17852,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13223,17 +17874,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13245,17 +17896,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13267,17 +17918,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13289,17 +17940,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13314,7 +17965,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13328,17 +17979,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13350,17 +18001,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13372,17 +18023,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13394,17 +18045,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13416,17 +18067,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13441,7 +18092,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13455,17 +18106,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13477,17 +18128,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13499,17 +18150,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13521,17 +18172,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13543,17 +18194,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13568,7 +18219,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13582,17 +18233,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13604,17 +18255,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13626,17 +18277,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13648,17 +18299,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13666,7 +18317,7 @@ cont {
     lines {
       width: 9.0
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13677,7 +18328,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13688,17 +18339,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13713,7 +18364,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13727,17 +18378,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13749,17 +18400,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13771,17 +18422,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13793,17 +18444,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13815,17 +18466,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13840,7 +18491,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13854,17 +18505,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13876,17 +18527,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13898,17 +18549,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13920,17 +18571,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13942,17 +18593,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13967,7 +18618,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13981,17 +18632,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14003,17 +18654,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14025,17 +18676,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14047,17 +18698,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14069,17 +18720,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14094,7 +18745,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14108,17 +18759,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14130,17 +18781,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14152,17 +18803,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14174,17 +18825,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14196,17 +18847,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14221,7 +18872,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14235,17 +18886,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14257,17 +18908,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14279,17 +18930,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14301,17 +18952,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14323,17 +18974,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14348,7 +18999,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14362,17 +19013,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14384,17 +19035,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14406,17 +19057,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14428,17 +19079,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14450,17 +19101,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14475,7 +19126,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14489,17 +19140,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14511,17 +19162,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14533,17 +19184,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14555,17 +19206,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14577,17 +19228,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14602,7 +19253,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14616,17 +19267,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14638,17 +19289,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14660,17 +19311,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14682,17 +19333,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14704,17 +19355,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14729,7 +19380,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14743,17 +19394,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14765,17 +19416,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14787,17 +19438,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14809,17 +19460,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14831,17 +19482,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14856,7 +19507,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14870,17 +19521,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14892,17 +19543,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14914,17 +19565,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14936,17 +19587,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14954,7 +19605,7 @@ cont {
     lines {
       width: 9.0
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14965,7 +19616,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14976,17 +19627,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -15023,7 +19674,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16472
     }
@@ -15045,7 +19696,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16472
     }
@@ -15065,9 +19716,9 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15087,9 +19738,9 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -15111,7 +19762,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15133,7 +19784,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15164,21 +19815,21 @@ cont {
         dd: 3.6
         dd: 1.6
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
     path_text {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16162
+      priority: 16166
     }
   }
   element {
@@ -15190,21 +19841,21 @@ cont {
         dd: 5.0
         dd: 2.2
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 871230427
+        color: 5855577
+        stroke_color: 2163076059
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -15216,21 +19867,21 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 872415231
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -15242,21 +19893,21 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 872415231
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -15268,21 +19919,21 @@ cont {
         dd: 7.0
         dd: 3.0
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 16777215
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -15294,21 +19945,21 @@ cont {
         dd: 16.2
         dd: 8.1
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 15592411
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 16777215
+        color: 5855577
+        stroke_color: 2164260863
       }
-      priority: 15162
+      priority: 15166
     }
   }
 }
@@ -15330,7 +19981,7 @@ cont {
     lines {
       width: 1.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15351,14 +20002,14 @@ cont {
     lines {
       width: 3.2
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15366,7 +20017,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16472
     }
@@ -15387,14 +20038,14 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15402,7 +20053,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16472
     }
@@ -15423,22 +20074,22 @@ cont {
     lines {
       width: 5.2
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15459,22 +20110,22 @@ cont {
     lines {
       width: 6.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -15495,14 +20146,14 @@ cont {
     lines {
       width: 8.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15510,7 +20161,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15531,14 +20182,14 @@ cont {
     lines {
       width: 10.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15546,7 +20197,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15585,7 +20236,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16472
     }
@@ -15607,7 +20258,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16472
     }
@@ -15638,9 +20289,9 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15671,9 +20322,9 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -15706,7 +20357,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15739,7 +20390,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16472
     }
@@ -15750,9 +20401,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 0.9
+      width: 0.5
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15760,9 +20411,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 0.8
+      width: 0.7
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15770,9 +20421,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.2
+      width: 1.0
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15780,24 +20431,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.5
+      width: 1.4
       color: 16749632
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15805,24 +20456,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.7
-      color: 16749632
-      priority: 1594
+      width: 1.6
+      color: 16746278
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15830,15 +20481,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
@@ -15846,8 +20497,8 @@ cont {
     scale: 13
     lines {
       width: 2.4
-      color: 16749632
-      priority: 1594
+      color: 16752972
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15855,24 +20506,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
   element {
     scale: 14
     lines {
-      width: 3.2
+      width: 2.9
       color: 16749632
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15880,15 +20531,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 25
     }
   }
@@ -15897,7 +20548,7 @@ cont {
     lines {
       width: 4.2
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15905,15 +20556,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 24
     }
   }
@@ -15922,7 +20573,7 @@ cont {
     lines {
       width: 4.8
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15930,9 +20581,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -15940,7 +20591,7 @@ cont {
     lines {
       width: 7.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15948,9 +20599,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -15958,7 +20609,7 @@ cont {
     lines {
       width: 10.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15966,9 +20617,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -15976,7 +20627,7 @@ cont {
     lines {
       width: 13.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -15984,9 +20635,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
 }
@@ -15995,9 +20646,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 0.9
+      width: 0.5
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16005,9 +20656,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 0.8
+      width: 0.7
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16015,9 +20666,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.2
+      width: 1.0
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16025,24 +20676,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.5
+      width: 1.4
       color: 16749632
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16050,24 +20701,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.7
-      color: 16749632
-      priority: 1594
+      width: 1.6
+      color: 16746278
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16075,15 +20726,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
@@ -16091,8 +20742,8 @@ cont {
     scale: 13
     lines {
       width: 2.4
-      color: 16749632
-      priority: 1594
+      color: 16752972
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16100,38 +20751,38 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
   element {
     scale: 14
     lines {
-      width: 3.2
+      width: 2.9
       color: 16749632
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.4
+      width: 5.8
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 6.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16139,15 +20790,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 25
     }
   }
@@ -16156,21 +20807,21 @@ cont {
     lines {
       width: 4.2
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16178,15 +20829,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 24
     }
   }
@@ -16195,21 +20846,21 @@ cont {
     lines {
       width: 4.8
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16217,9 +20868,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16227,21 +20878,21 @@ cont {
     lines {
       width: 7.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16249,9 +20900,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16259,21 +20910,21 @@ cont {
     lines {
       width: 10.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 24.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16281,9 +20932,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16291,21 +20942,21 @@ cont {
     lines {
       width: 13.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 28.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 30.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16313,9 +20964,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
 }
@@ -16324,9 +20975,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 0.9
+      width: 0.5
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16334,9 +20985,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 0.8
+      width: 0.7
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16344,9 +20995,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.2
+      width: 1.0
       color: 16746278
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16354,24 +21005,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.5
+      width: 1.4
       color: 16749632
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16379,24 +21030,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.7
-      color: 16749632
-      priority: 1594
+      width: 1.6
+      color: 16746278
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16404,15 +21055,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
@@ -16420,8 +21071,8 @@ cont {
     scale: 13
     lines {
       width: 2.4
-      color: 16749632
-      priority: 1594
+      color: 16752972
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16429,35 +21080,35 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.9
       color: 8421504
       dashdot {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
+      width: 2.9
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16465,15 +21116,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 25
     }
   }
@@ -16486,14 +21137,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.2
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16501,15 +21152,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16594
+      priority: 16597
       min_distance: 24
     }
   }
@@ -16522,14 +21173,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16537,9 +21188,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16551,14 +21202,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16566,9 +21217,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16580,14 +21231,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16595,9 +21246,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16609,14 +21260,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 13.0
       color: 16752972
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16624,9 +21275,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16594
+      priority: 16597
     }
   }
 }
@@ -16638,7 +21289,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -16649,7 +21300,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -16660,7 +21311,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
       priority: 16000
     }
@@ -16671,7 +21322,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
       priority: 16000
     }
@@ -16679,9 +21330,9 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.2
+      width: 2.9
       color: 16749632
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16689,15 +21340,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16581
+      priority: 16583
       min_distance: 20
     }
   }
@@ -16706,7 +21357,7 @@ cont {
     lines {
       width: 2.1
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16714,15 +21365,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16581
+      priority: 16583
       min_distance: 24
     }
   }
@@ -16731,7 +21382,7 @@ cont {
     lines {
       width: 2.4
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16739,9 +21390,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16749,7 +21400,7 @@ cont {
     lines {
       width: 3.5
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16757,9 +21408,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16767,7 +21418,7 @@ cont {
     lines {
       width: 5.0
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16775,9 +21426,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16785,7 +21436,7 @@ cont {
     lines {
       width: 7.0
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16793,9 +21444,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
 }
@@ -16807,7 +21458,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -16818,7 +21469,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -16829,7 +21480,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
       priority: 16000
     }
@@ -16840,7 +21491,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
       priority: 16000
     }
@@ -16848,23 +21499,23 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.2
+      width: 2.9
       color: 16749632
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.4
+      width: 5.8
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 6.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16872,15 +21523,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16581
+      priority: 16583
       min_distance: 20
     }
   }
@@ -16889,21 +21540,21 @@ cont {
     lines {
       width: 2.1
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.2
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16911,15 +21562,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16581
+      priority: 16583
       min_distance: 24
     }
   }
@@ -16928,21 +21579,21 @@ cont {
     lines {
       width: 2.4
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.8
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16950,9 +21601,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16960,21 +21611,21 @@ cont {
     lines {
       width: 3.5
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16982,9 +21633,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16992,21 +21643,21 @@ cont {
     lines {
       width: 5.0
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17014,9 +21665,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -17024,21 +21675,21 @@ cont {
     lines {
       width: 7.0
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 18.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17046,9 +21697,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
 }
@@ -17060,7 +21711,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -17071,7 +21722,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -17082,7 +21733,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
       priority: 16000
     }
@@ -17093,7 +21744,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2163076059
       }
       priority: 16000
     }
@@ -17101,20 +21752,20 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.9
       color: 8421504
       dashdot {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
+      width: 2.9
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17122,15 +21773,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16581
+      priority: 16583
       min_distance: 20
     }
   }
@@ -17143,14 +21794,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.1
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17158,15 +21809,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16581
+      priority: 16583
       min_distance: 24
     }
   }
@@ -17179,14 +21830,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17194,9 +21845,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -17208,14 +21859,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.5
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17223,9 +21874,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -17237,14 +21888,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17252,9 +21903,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -17266,14 +21917,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16752972
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17281,173 +21932,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16581
-    }
-  }
-}
-cont {
-  name: "highway-proposed"
-  element {
-    scale: 13
-    lines {
-      width: 1.2
-      color: 12303274
-      dashdot {
-        dd: 3.6
-        dd: 1.8
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 12303274
-      dashdot {
-        dd: 4.5
-        dd: 1.8
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 12303274
-      dashdot {
-        dd: 7.2
-        dd: 2.7
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 12303274
-      dashdot {
-        dd: 9.0
-        dd: 3.6
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 12303274
-      dashdot {
-        dd: 10.8
-        dd: 4.5
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 12303274
-      dashdot {
-        dd: 13.5
-        dd: 5.4
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 6.0
-      color: 12303274
-      dashdot {
-        dd: 18.0
-        dd: 6.3
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "highway-raceway"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.8
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 16583
     }
   }
 }
@@ -17456,9 +21943,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17466,9 +21953,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17476,16 +21963,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17493,7 +21972,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17501,16 +21980,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17518,7 +21989,7 @@ cont {
     lines {
       width: 1.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17526,16 +21997,9 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -17543,7 +22007,7 @@ cont {
     lines {
       width: 3.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17551,16 +22015,9 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -17568,7 +22025,7 @@ cont {
     lines {
       width: 4.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17576,9 +22033,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17586,7 +22043,7 @@ cont {
     lines {
       width: 6.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17594,9 +22051,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17604,7 +22061,7 @@ cont {
     lines {
       width: 9.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17612,9 +22069,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17622,7 +22079,7 @@ cont {
     lines {
       width: 12.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17630,9 +22087,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -17641,9 +22098,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17651,9 +22108,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17661,16 +22118,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17678,7 +22127,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17686,16 +22135,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17703,7 +22144,7 @@ cont {
     lines {
       width: 1.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17711,16 +22152,9 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -17728,7 +22162,7 @@ cont {
     lines {
       width: 3.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17736,16 +22170,9 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -17753,7 +22180,7 @@ cont {
     lines {
       width: 4.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17761,9 +22188,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17771,7 +22198,7 @@ cont {
     lines {
       width: 6.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17779,9 +22206,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17789,7 +22216,7 @@ cont {
     lines {
       width: 9.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17797,9 +22224,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17807,7 +22234,7 @@ cont {
     lines {
       width: 12.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17815,9 +22242,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -17826,9 +22253,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17836,9 +22263,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17846,16 +22273,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17863,7 +22282,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17871,16 +22290,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17888,21 +22299,21 @@ cont {
     lines {
       width: 1.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17910,16 +22321,9 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -17927,21 +22331,21 @@ cont {
     lines {
       width: 3.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17949,16 +22353,9 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -17966,21 +22363,21 @@ cont {
     lines {
       width: 4.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.8
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17988,9 +22385,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17998,21 +22395,21 @@ cont {
     lines {
       width: 6.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18020,9 +22417,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18030,21 +22427,21 @@ cont {
     lines {
       width: 9.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 22.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18052,9 +22449,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18062,21 +22459,21 @@ cont {
     lines {
       width: 12.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 26.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18084,9 +22481,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -18095,9 +22492,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18105,9 +22502,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18115,16 +22512,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -18132,7 +22521,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18140,16 +22529,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -18157,7 +22538,7 @@ cont {
     lines {
       width: 1.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18165,16 +22546,9 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -18182,7 +22556,7 @@ cont {
     lines {
       width: 3.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18190,16 +22564,9 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -18211,14 +22578,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 16777215
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18226,9 +22593,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18240,14 +22607,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18255,9 +22622,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18269,14 +22636,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18284,9 +22651,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18298,14 +22665,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18313,9 +22680,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -18324,9 +22691,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18407,9 +22774,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18456,14 +22823,14 @@ cont {
     lines {
       width: 8.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18480,14 +22847,14 @@ cont {
     lines {
       width: 12.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18504,14 +22871,14 @@ cont {
     lines {
       width: 18.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 18.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18528,14 +22895,14 @@ cont {
     lines {
       width: 24.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 24.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18546,9 +22913,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18629,9 +22996,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.8
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18639,17 +23006,17 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.3
+      width: 1.1
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18657,9 +23024,9 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18667,7 +23034,7 @@ cont {
     lines {
       width: 1.6
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18675,15 +23042,15 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
+        stroke_color: 3019898879
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -18692,7 +23059,7 @@ cont {
     lines {
       width: 2.2
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18700,15 +23067,15 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
+        stroke_color: 3019898879
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -18717,7 +23084,7 @@ cont {
     lines {
       width: 3.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18725,15 +23092,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 25
     }
   }
@@ -18742,7 +23109,7 @@ cont {
     lines {
       width: 4.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18750,15 +23117,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 24
     }
   }
@@ -18767,7 +23134,7 @@ cont {
     lines {
       width: 4.8
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18775,9 +23142,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18785,7 +23152,7 @@ cont {
     lines {
       width: 7.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18793,9 +23160,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18803,7 +23170,7 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18811,9 +23178,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18821,7 +23188,7 @@ cont {
     lines {
       width: 13.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18829,9 +23196,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
 }
@@ -18840,9 +23207,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.8
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18850,17 +23217,17 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.3
+      width: 1.1
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18868,9 +23235,9 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18878,7 +23245,7 @@ cont {
     lines {
       width: 1.6
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18886,15 +23253,15 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
+        stroke_color: 3019898879
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -18903,7 +23270,7 @@ cont {
     lines {
       width: 2.2
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18911,15 +23278,15 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
+        stroke_color: 3019898879
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -18928,21 +23295,21 @@ cont {
     lines {
       width: 3.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18950,15 +23317,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 25
     }
   }
@@ -18967,21 +23334,21 @@ cont {
     lines {
       width: 4.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18989,15 +23356,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 24
     }
   }
@@ -19006,21 +23373,21 @@ cont {
     lines {
       width: 4.8
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19028,9 +23395,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19038,21 +23405,21 @@ cont {
     lines {
       width: 7.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19060,9 +23427,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19070,21 +23437,21 @@ cont {
     lines {
       width: 10.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 24.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19092,9 +23459,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19102,21 +23469,21 @@ cont {
     lines {
       width: 13.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 28.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 30.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19124,9 +23491,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
 }
@@ -19135,9 +23502,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.8
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -19145,17 +23512,17 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.3
+      width: 1.1
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -19163,9 +23530,9 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19173,7 +23540,7 @@ cont {
     lines {
       width: 1.6
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -19181,15 +23548,15 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
+        stroke_color: 3019898879
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -19198,7 +23565,7 @@ cont {
     lines {
       width: 2.2
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19206,15 +23573,15 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
+        stroke_color: 3019898879
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -19223,7 +23590,7 @@ cont {
     lines {
       width: 3.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19231,15 +23598,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 25
     }
   }
@@ -19248,7 +23615,7 @@ cont {
     lines {
       width: 4.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19256,15 +23623,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16567
+      priority: 16569
       min_distance: 24
     }
   }
@@ -19277,14 +23644,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1566
+      priority: 1568
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19292,9 +23659,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19306,14 +23673,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1566
+      priority: 1568
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19321,9 +23688,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19335,14 +23702,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1566
+      priority: 1568
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19350,9 +23717,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19364,14 +23731,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1566
+      priority: 1568
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 13.0
       color: 16777215
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19379,9 +23746,9 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16567
+      priority: 16569
     }
   }
 }
@@ -19392,7 +23759,7 @@ cont {
     lines {
       width: 1.5
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19402,7 +23769,7 @@ cont {
     lines {
       width: 2.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19412,7 +23779,7 @@ cont {
     lines {
       width: 2.4
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19422,7 +23789,7 @@ cont {
     lines {
       width: 3.5
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19432,7 +23799,7 @@ cont {
     lines {
       width: 5.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19442,7 +23809,7 @@ cont {
     lines {
       width: 7.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19455,21 +23822,21 @@ cont {
     lines {
       width: 1.5
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19479,21 +23846,21 @@ cont {
     lines {
       width: 2.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19503,21 +23870,21 @@ cont {
     lines {
       width: 2.4
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.8
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19527,21 +23894,21 @@ cont {
     lines {
       width: 3.5
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19551,21 +23918,21 @@ cont {
     lines {
       width: 5.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19575,21 +23942,21 @@ cont {
     lines {
       width: 7.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 18.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19602,7 +23969,7 @@ cont {
     lines {
       width: 1.5
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19612,7 +23979,7 @@ cont {
     lines {
       width: 2.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19626,14 +23993,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1553
+      priority: 1554
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19647,14 +24014,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1553
+      priority: 1554
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.5
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19668,14 +24035,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1553
+      priority: 1554
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19689,14 +24056,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1553
+      priority: 1554
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16777215
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19709,7 +24076,7 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19719,7 +24086,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19729,43 +24096,27 @@ cont {
     lines {
       width: 1.6
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19773,9 +24124,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -19783,7 +24134,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19791,9 +24142,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -19804,7 +24155,7 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19814,7 +24165,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19824,43 +24175,27 @@ cont {
     lines {
       width: 1.6
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19868,9 +24203,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -19878,7 +24213,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19886,9 +24221,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -19899,7 +24234,7 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19909,7 +24244,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19919,85 +24254,69 @@ cont {
     lines {
       width: 1.6
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20005,9 +24324,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20015,21 +24334,21 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20037,9 +24356,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20050,46 +24369,27 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
   element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
-  }
-  element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20097,9 +24397,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20107,7 +24407,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20115,9 +24415,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20128,46 +24428,27 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
   element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
-  }
-  element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20175,9 +24456,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20185,7 +24466,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20193,9 +24474,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20206,81 +24487,55 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 0.4
-      color: 8421504
-      priority: 1363
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20288,9 +24543,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20298,21 +24553,21 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20320,9 +24575,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20333,46 +24588,27 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
   element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
-  }
-  element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20380,9 +24616,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20390,7 +24626,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20398,9 +24634,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20411,7 +24647,7 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20421,7 +24657,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20431,43 +24667,27 @@ cont {
     lines {
       width: 1.6
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20475,9 +24695,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20485,7 +24705,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20493,9 +24713,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20506,7 +24726,7 @@ cont {
     lines {
       width: 0.7
       color: 4294506744
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20516,7 +24736,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20526,43 +24746,27 @@ cont {
     lines {
       width: 1.6
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 872415231
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20570,9 +24774,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20580,7 +24784,7 @@ cont {
     lines {
       width: 4.0
       color: 16316664
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20588,44 +24792,76 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
 cont {
   name: "highway-speed_camera"
   element {
+    scale: 12
+    symbol {
+      name: "speedcam-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "speedcam-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "speedcam-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "speedcam-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
     scale: 16
     symbol {
       name: "speedcam-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 17
     symbol {
-      name: "speedcam-l"
+      name: "speedcam-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 18
     symbol {
-      name: "speedcam-l"
+      name: "speedcam-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "speedcam-l"
+      name: "speedcam-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
 }
@@ -20640,7 +24876,7 @@ cont {
         dd: 1.5
         dd: 1.5
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20654,7 +24890,7 @@ cont {
         dd: 2.3
         dd: 2.3
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20668,7 +24904,7 @@ cont {
         dd: 3.2
         dd: 3.2
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20682,7 +24918,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20699,21 +24935,21 @@ cont {
         dd: 1.5
         dd: 1.5
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20727,21 +24963,21 @@ cont {
         dd: 2.3
         dd: 2.3
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20755,21 +24991,21 @@ cont {
         dd: 3.2
         dd: 3.2
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 18.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 18.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20783,21 +25019,21 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 22.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20814,7 +25050,7 @@ cont {
         dd: 1.5
         dd: 1.5
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20828,7 +25064,7 @@ cont {
         dd: 2.3
         dd: 2.3
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20842,7 +25078,7 @@ cont {
         dd: 3.2
         dd: 3.2
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20856,7 +25092,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20867,9 +25103,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -20877,9 +25113,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -20887,16 +25123,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -20904,7 +25132,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20912,16 +25140,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -20929,7 +25149,7 @@ cont {
     lines {
       width: 1.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20937,16 +25157,9 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -20954,7 +25167,7 @@ cont {
     lines {
       width: 3.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20962,16 +25175,9 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -20979,7 +25185,7 @@ cont {
     lines {
       width: 4.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20987,9 +25193,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -20997,7 +25203,7 @@ cont {
     lines {
       width: 6.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21005,9 +25211,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21015,7 +25221,7 @@ cont {
     lines {
       width: 9.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21023,9 +25229,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21033,7 +25239,7 @@ cont {
     lines {
       width: 12.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21041,9 +25247,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -21052,9 +25258,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -21062,9 +25268,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -21072,16 +25278,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -21089,7 +25287,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21097,16 +25295,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -21114,21 +25304,21 @@ cont {
     lines {
       width: 1.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21136,16 +25326,9 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -21153,21 +25336,21 @@ cont {
     lines {
       width: 3.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21175,16 +25358,9 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -21192,21 +25368,21 @@ cont {
     lines {
       width: 4.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.8
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21214,9 +25390,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21224,21 +25400,21 @@ cont {
     lines {
       width: 6.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21246,9 +25422,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21256,21 +25432,21 @@ cont {
     lines {
       width: 9.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 22.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21278,9 +25454,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21288,21 +25464,21 @@ cont {
     lines {
       width: 12.0
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 26.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21310,9 +25486,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -21321,9 +25497,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -21331,9 +25507,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -21341,16 +25517,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -21358,7 +25526,7 @@ cont {
     lines {
       width: 1.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21366,16 +25534,8 @@ cont {
       primary {
         height: 10
         color: 4473924
-        stroke_color: 452984831
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -21383,7 +25543,7 @@ cont {
     lines {
       width: 1.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21391,16 +25551,9 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -21408,7 +25561,7 @@ cont {
     lines {
       width: 3.2
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21416,16 +25569,9 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 4820806
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -21437,14 +25583,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 16777215
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21452,9 +25598,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21466,14 +25612,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16777215
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21481,9 +25627,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21495,14 +25641,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16777215
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21510,9 +25656,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21524,14 +25670,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16777215
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21539,9 +25685,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -21612,14 +25758,14 @@ cont {
     lines {
       width: 3.2
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21636,14 +25782,14 @@ cont {
     lines {
       width: 4.4
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21660,14 +25806,14 @@ cont {
     lines {
       width: 7.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21684,14 +25830,14 @@ cont {
     lines {
       width: 11.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 13.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21708,14 +25854,14 @@ cont {
     lines {
       width: 14.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21829,7 +25975,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21843,7 +25989,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21857,7 +26003,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21871,7 +26017,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21885,7 +26031,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21899,7 +26045,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21916,7 +26062,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21930,7 +26076,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21944,7 +26090,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21958,7 +26104,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21972,7 +26118,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21986,7 +26132,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22003,7 +26149,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22017,7 +26163,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22031,7 +26177,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22045,7 +26191,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22059,7 +26205,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22073,7 +26219,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22090,7 +26236,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22104,7 +26250,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22118,7 +26264,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22132,7 +26278,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22146,7 +26292,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22160,7 +26306,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22177,7 +26323,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22191,7 +26337,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22205,7 +26351,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22219,7 +26365,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22233,7 +26379,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22247,7 +26393,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22264,7 +26410,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22278,7 +26424,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22292,7 +26438,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22306,7 +26452,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22320,7 +26466,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22334,7 +26480,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22351,7 +26497,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22365,7 +26511,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22379,7 +26525,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22393,7 +26539,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22407,7 +26553,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22421,7 +26567,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22438,7 +26584,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22452,7 +26598,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22466,7 +26612,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22480,7 +26626,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22494,7 +26640,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22508,7 +26654,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22525,7 +26671,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22539,7 +26685,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22553,7 +26699,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22567,7 +26713,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22581,7 +26727,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22595,7 +26741,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22612,7 +26758,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22626,7 +26772,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22640,7 +26786,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22654,7 +26800,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22668,7 +26814,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22682,7 +26828,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22699,7 +26845,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22713,7 +26859,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22727,7 +26873,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22741,7 +26887,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22755,7 +26901,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22769,7 +26915,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22786,7 +26932,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22800,7 +26946,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22814,7 +26960,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22828,7 +26974,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22842,7 +26988,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22856,7 +27002,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22873,7 +27019,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22887,7 +27033,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22901,7 +27047,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22915,7 +27061,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22929,7 +27075,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22943,7 +27089,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22960,7 +27106,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22974,7 +27120,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22988,7 +27134,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23002,7 +27148,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23016,7 +27162,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23030,7 +27176,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23047,7 +27193,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23061,7 +27207,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23075,7 +27221,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23089,7 +27235,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23103,7 +27249,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23117,7 +27263,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23134,7 +27280,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23148,7 +27294,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23162,7 +27308,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23176,7 +27322,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23190,7 +27336,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23204,7 +27350,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23221,7 +27367,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23235,7 +27381,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23249,7 +27395,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23263,7 +27409,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23277,7 +27423,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23291,7 +27437,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23302,9 +27448,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
-      color: 16742950
-      priority: 1621
+      width: 0.6
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23312,9 +27458,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
-      color: 16742950
-      priority: 1621
+      width: 0.7
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23322,9 +27468,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
-      color: 16741158
-      priority: 1621
+      width: 1.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23332,9 +27478,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
-      color: 16741158
-      priority: 1621
+      width: 1.3
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23342,24 +27488,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
-      color: 16742950
-      priority: 1621
+      width: 1.8
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23367,24 +27513,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.9
-      color: 16741158
-      priority: 1621
+      width: 2.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23392,15 +27538,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23408,8 +27554,8 @@ cont {
     scale: 13
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23417,15 +27563,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23433,8 +27579,8 @@ cont {
     scale: 14
     lines {
       width: 3.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23442,15 +27588,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23458,8 +27604,8 @@ cont {
     scale: 15
     lines {
       width: 4.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23467,15 +27613,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -23483,8 +27629,8 @@ cont {
     scale: 16
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23492,15 +27638,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -23508,8 +27654,8 @@ cont {
     scale: 17
     lines {
       width: 9.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23517,15 +27663,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -23533,8 +27679,8 @@ cont {
     scale: 18
     lines {
       width: 12.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23542,15 +27688,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -23558,8 +27704,8 @@ cont {
     scale: 19
     lines {
       width: 15.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23567,15 +27713,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -23585,9 +27731,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
-      color: 16742950
-      priority: 1621
+      width: 0.6
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23595,9 +27741,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
-      color: 16742950
-      priority: 1621
+      width: 0.7
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23605,9 +27751,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
-      color: 16741158
-      priority: 1621
+      width: 1.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23615,9 +27761,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
-      color: 16741158
-      priority: 1621
+      width: 1.3
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23625,24 +27771,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
-      color: 16742950
-      priority: 1621
+      width: 1.8
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23650,24 +27796,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.9
-      color: 16741158
-      priority: 1621
+      width: 2.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23675,15 +27821,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23691,22 +27837,22 @@ cont {
     scale: 13
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23714,15 +27860,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23730,22 +27876,22 @@ cont {
     scale: 14
     lines {
       width: 3.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23753,15 +27899,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23769,22 +27915,22 @@ cont {
     scale: 15
     lines {
       width: 4.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23792,15 +27938,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -23808,22 +27954,22 @@ cont {
     scale: 16
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23831,15 +27977,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -23847,22 +27993,22 @@ cont {
     scale: 17
     lines {
       width: 9.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 19.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 21.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23870,15 +28016,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -23886,22 +28032,22 @@ cont {
     scale: 18
     lines {
       width: 12.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 26.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23909,15 +28055,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -23925,22 +28071,22 @@ cont {
     scale: 19
     lines {
       width: 15.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 32.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 34.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23948,15 +28094,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -23966,9 +28112,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
-      color: 16742950
-      priority: 1621
+      width: 0.6
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23976,9 +28122,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
-      color: 16742950
-      priority: 1621
+      width: 0.7
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23986,9 +28132,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
-      color: 16741158
-      priority: 1621
+      width: 1.0
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23996,9 +28142,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
-      color: 16741158
-      priority: 1621
+      width: 1.3
+      color: 16737830
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -24006,24 +28152,24 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
-      color: 16742950
-      priority: 1621
+      width: 1.8
+      color: 16741158
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -24031,35 +28177,35 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 2.9
+      width: 3.0
       color: 8421504
       dashdot {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.0
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -24067,15 +28213,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -24088,14 +28234,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24103,15 +28249,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -24124,14 +28270,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24139,15 +28285,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -24160,14 +28306,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24175,15 +28321,15 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -24196,14 +28342,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24211,15 +28357,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -24232,14 +28378,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24247,15 +28393,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -24268,14 +28414,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24283,15 +28429,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -24304,14 +28450,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.0
-      color: 16742950
-      priority: 1621
+      color: 16741158
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24319,15 +28465,15 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
       color: 16777215
       stroke_color: 4820806
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -24340,7 +28486,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -24351,7 +28497,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -24362,7 +28508,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -24371,8 +28517,8 @@ cont {
     scale: 13
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24380,15 +28526,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24396,8 +28542,8 @@ cont {
     scale: 14
     lines {
       width: 3.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24405,15 +28551,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24421,8 +28567,8 @@ cont {
     scale: 15
     lines {
       width: 2.4
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24430,15 +28576,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -24446,8 +28592,8 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24455,17 +28601,17 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 17
     lines {
       width: 4.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24473,17 +28619,17 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 18
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24491,17 +28637,17 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 19
     lines {
       width: 7.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24509,9 +28655,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -24523,7 +28669,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -24534,7 +28680,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -24545,7 +28691,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -24554,8 +28700,8 @@ cont {
     scale: 13
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24563,15 +28709,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24579,22 +28725,22 @@ cont {
     scale: 14
     lines {
       width: 3.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24602,15 +28748,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24618,22 +28764,22 @@ cont {
     scale: 15
     lines {
       width: 2.4
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.6
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24641,15 +28787,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -24657,22 +28803,22 @@ cont {
     scale: 16
     lines {
       width: 3.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24680,31 +28826,31 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 17
     lines {
       width: 4.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24712,31 +28858,31 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 18
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24744,31 +28890,31 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
     scale: 19
     lines {
       width: 7.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 19.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24776,9 +28922,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -24790,7 +28936,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -24801,7 +28947,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 3018714075
       }
       priority: 16000
     }
@@ -24812,7 +28958,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
       priority: 16000
     }
@@ -24826,14 +28972,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24841,15 +28987,15 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 451800027
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24862,14 +29008,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 16557154
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24877,15 +29023,15 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24898,14 +29044,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24913,15 +29059,15 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
       color: 16777215
       stroke_color: 4820806
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -24934,14 +29080,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24949,9 +29095,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24963,14 +29109,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24978,9 +29124,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24992,14 +29138,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25007,9 +29153,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -25021,14 +29167,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.5
-      color: 16742950
-      priority: 1608
+      color: 16741158
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25036,9 +29182,9 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -25047,9 +29193,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -25077,7 +29223,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -25095,7 +29241,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -25113,7 +29259,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25131,7 +29277,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25149,7 +29295,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25167,7 +29313,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25178,9 +29324,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -25208,7 +29354,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -25226,7 +29372,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -25244,7 +29390,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25262,7 +29408,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25280,7 +29426,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25298,7 +29444,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25309,9 +29455,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -25338,14 +29484,14 @@ cont {
     lines {
       width: 3.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25353,7 +29499,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -25370,14 +29516,14 @@ cont {
     lines {
       width: 6.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25385,7 +29531,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -25402,14 +29548,14 @@ cont {
     lines {
       width: 8.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.8
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25417,7 +29563,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25434,14 +29580,14 @@ cont {
     lines {
       width: 13.6
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.2
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25449,7 +29595,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25466,14 +29612,14 @@ cont {
     lines {
       width: 20.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 22.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25481,7 +29627,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25498,14 +29644,14 @@ cont {
     lines {
       width: 26.0
       color: 14934482
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 8421504
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25513,7 +29659,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25524,9 +29670,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 16316664
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -25554,7 +29700,7 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -25572,7 +29718,7 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 871230427
+        stroke_color: 2163076059
       }
       priority: 16513
     }
@@ -25601,7 +29747,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25630,7 +29776,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25659,7 +29805,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25688,7 +29834,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       priority: 16513
     }
@@ -25697,10 +29843,85 @@ cont {
 cont {
   name: "historic-archaeological_site"
   element {
+    scale: 12
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25708,14 +29929,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25723,14 +29944,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25738,65 +29959,215 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "historic-boundary_stone"
   element {
+    scale: 12
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "boundary_stone-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "boundary_stone-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "historic-castle"
   element {
+    scale: 12
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "remains-m"
-      priority: 16878
+      name: "remains-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25804,14 +30175,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25819,14 +30190,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25834,7 +30205,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -25843,13 +30214,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25857,13 +30228,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25871,13 +30242,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25885,13 +30256,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 8355446
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25900,10 +30271,85 @@ cont {
 cont {
   name: "historic-memorial"
   element {
+    scale: 12
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -25911,62 +30357,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "historic-monument"
   element {
+    scale: 12
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "monument-m"
-      priority: 16878
+      name: "monument-l"
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -25974,62 +30480,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "historic-museum"
   element {
+    scale: 12
+    symbol {
+      name: "museum-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "museum-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "museum-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "museum-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "museum-m"
-      priority: 16878
+      name: "museum-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -26037,47 +30603,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "historic-ruins"
   element {
+    scale: 12
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -26085,14 +30726,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -26100,14 +30741,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -26115,139 +30756,499 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "historic-ship"
   element {
+    scale: 12
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
-      name: "historic-ship-l"
-      priority: 16837
+      name: "ship-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "historic-ship-l"
-      priority: 16837
+      name: "ship-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "historic-tomb"
   element {
+    scale: 12
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "tomb-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "tomb-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "historic-wayside_cross"
   element {
+    scale: 12
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "wayside_cross-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "wayside_cross-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "historic-wayside_shrine"
   element {
+    scale: 12
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "wayside_shrine-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "wayside_shrine-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -26258,7 +31259,7 @@ cont {
     lines {
       width: 0
       color: 0
-      priority: 1405
+      priority: 1402
       pathsym {
         name: "arrow-s"
         step: 144.0
@@ -26271,7 +31272,7 @@ cont {
     lines {
       width: 0
       color: 0
-      priority: 1662
+      priority: 1666
       pathsym {
         name: "arrow-s"
         step: 184.0
@@ -26284,7 +31285,7 @@ cont {
     lines {
       width: 0
       color: 0
-      priority: 1662
+      priority: 1666
       pathsym {
         name: "arrow-m"
         step: 184.0
@@ -26297,7 +31298,7 @@ cont {
     lines {
       width: 0
       color: 0
-      priority: 1662
+      priority: 1666
       pathsym {
         name: "arrow-m"
         step: 184.0
@@ -26309,94 +31310,87 @@ cont {
 cont {
   name: "landuse-allotments"
   element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 13620648
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
 }
@@ -26406,56 +31400,56 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 13
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 14
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 15
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 16
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 17
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 18
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 19
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
 }
@@ -26465,18 +31459,18 @@ cont {
     scale: 14
     area {
       color: 666683518
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 15
     area {
       color: 12372094
-      priority: -15852
+      priority: -15848
     }
     symbol {
       name: "cemetery-m"
-      priority: 16148
+      priority: 16152
     }
     caption {
       primary {
@@ -26484,18 +31478,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15148
+      priority: 15152
     }
   }
   element {
     scale: 16
     area {
       color: 11781233
-      priority: -15852
+      priority: -15848
     }
     symbol {
       name: "cemetery-m"
-      priority: 16148
+      priority: 16152
     }
     caption {
       primary {
@@ -26503,18 +31497,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15148
+      priority: 15152
     }
   }
   element {
     scale: 17
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26522,18 +31516,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 18
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26541,18 +31535,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 19
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26560,7 +31554,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
 }
@@ -26570,18 +31564,18 @@ cont {
     scale: 14
     area {
       color: 666683518
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 15
     area {
       color: 12372094
-      priority: -15852
+      priority: -15848
     }
     symbol {
       name: "cemetery-m"
-      priority: 16148
+      priority: 16152
     }
     caption {
       primary {
@@ -26589,18 +31583,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15148
+      priority: 15152
     }
   }
   element {
     scale: 16
     area {
       color: 11781233
-      priority: -15852
+      priority: -15848
     }
     symbol {
       name: "cemetery-m"
-      priority: 16148
+      priority: 16152
     }
     caption {
       primary {
@@ -26608,18 +31602,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15148
+      priority: 15152
     }
   }
   element {
     scale: 17
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26627,18 +31621,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 18
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26646,18 +31640,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 19
     area {
       color: 11781233
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26665,7 +31659,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
 }
@@ -26708,223 +31702,157 @@ cont {
     scale: 15
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 16
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 17
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 18
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 19
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
 }
 cont {
   name: "landuse-farmland"
   element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 13620648
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
-    }
-  }
-}
-cont {
-  name: "landuse-field"
-  element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 13029267
-      priority: -15865
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 13029267
-      priority: -15865
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 13029267
-      priority: -15865
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 13029267
-      priority: -15865
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 13029267
-      priority: -15865
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 13029267
-      priority: -15865
+      priority: 15138
     }
   }
 }
@@ -26934,39 +31862,39 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -26982,7 +31910,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -26990,7 +31918,7 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -26998,11 +31926,11 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27018,7 +31946,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27026,11 +31954,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27046,7 +31974,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27054,7 +31982,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27062,11 +31990,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27082,7 +32010,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27090,11 +32018,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27110,7 +32038,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27118,11 +32046,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27138,7 +32066,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27146,7 +32074,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27154,15 +32082,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -27174,7 +32102,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27182,7 +32110,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27190,15 +32118,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -27210,7 +32138,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27218,15 +32146,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -27238,7 +32166,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27246,15 +32174,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -27266,7 +32194,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27274,15 +32202,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -27294,7 +32222,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27302,7 +32230,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27310,15 +32238,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -27330,7 +32258,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27338,7 +32266,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27346,11 +32274,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27366,7 +32294,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27374,7 +32302,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27382,11 +32310,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27402,7 +32330,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27410,11 +32338,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27430,7 +32358,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27438,11 +32366,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27458,7 +32386,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27466,11 +32394,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27486,7 +32414,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27494,7 +32422,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27502,11 +32430,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27522,7 +32450,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27530,11 +32458,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27543,7 +32471,7 @@ cont {
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -27551,11 +32479,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27571,7 +32499,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27579,11 +32507,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27599,7 +32527,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27607,11 +32535,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27627,7 +32555,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27635,11 +32563,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27655,7 +32583,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27663,11 +32591,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27676,7 +32604,7 @@ cont {
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -27684,11 +32612,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27704,7 +32632,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27712,11 +32640,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27732,7 +32660,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27740,11 +32668,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27760,7 +32688,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27771,39 +32699,39 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27819,7 +32747,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27827,7 +32755,7 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27835,11 +32763,11 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27855,7 +32783,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27863,11 +32791,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27883,7 +32811,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27891,7 +32819,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27899,11 +32827,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27919,7 +32847,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27927,11 +32855,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27947,7 +32875,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27955,11 +32883,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27975,7 +32903,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27983,7 +32911,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27991,15 +32919,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28011,7 +32939,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28019,7 +32947,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28027,15 +32955,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28047,7 +32975,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28055,15 +32983,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28075,7 +33003,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28083,15 +33011,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28103,7 +33031,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28111,15 +33039,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28131,7 +33059,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28139,7 +33067,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28147,15 +33075,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28167,7 +33095,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28175,7 +33103,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28183,11 +33111,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28203,7 +33131,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28211,7 +33139,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28219,11 +33147,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28239,7 +33167,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28247,11 +33175,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28267,7 +33195,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28275,11 +33203,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28295,7 +33223,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28303,11 +33231,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28323,7 +33251,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28331,7 +33259,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28339,11 +33267,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28359,7 +33287,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28367,11 +33295,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28380,7 +33308,7 @@ cont {
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -28388,11 +33316,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28408,7 +33336,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28416,11 +33344,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28436,7 +33364,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28444,11 +33372,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28464,7 +33392,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28472,11 +33400,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28492,7 +33420,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28500,11 +33428,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28513,7 +33441,7 @@ cont {
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -28521,11 +33449,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28541,7 +33469,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28549,11 +33477,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28569,7 +33497,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28577,11 +33505,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28597,7 +33525,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28608,39 +33536,39 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28656,7 +33584,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28664,7 +33592,7 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28672,11 +33600,11 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28692,7 +33620,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28700,11 +33628,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28720,7 +33648,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28728,7 +33656,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28736,11 +33664,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28756,7 +33684,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28764,11 +33692,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28784,7 +33712,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28792,11 +33720,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28812,7 +33740,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28820,7 +33748,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28828,15 +33756,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28848,7 +33776,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28856,7 +33784,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28864,15 +33792,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28884,7 +33812,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28892,15 +33820,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28912,7 +33840,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28920,15 +33848,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28940,7 +33868,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28948,15 +33876,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -28968,7 +33896,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28976,7 +33904,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28984,15 +33912,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -29004,7 +33932,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29012,7 +33940,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29020,11 +33948,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29040,7 +33968,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29048,7 +33976,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29056,11 +33984,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29076,7 +34004,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29084,11 +34012,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29104,7 +34032,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29112,11 +34040,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29132,7 +34060,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29140,11 +34068,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29160,7 +34088,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29168,7 +34096,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29176,11 +34104,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29196,7 +34124,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29204,11 +34132,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29217,7 +34145,7 @@ cont {
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -29225,11 +34153,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29245,7 +34173,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29253,11 +34181,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29273,7 +34201,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29281,11 +34209,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29301,7 +34229,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29309,11 +34237,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29329,7 +34257,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29337,11 +34265,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29350,7 +34278,7 @@ cont {
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -29358,11 +34286,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29378,7 +34306,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29386,11 +34314,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29406,7 +34334,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29414,11 +34342,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29434,7 +34362,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29445,39 +34373,39 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29493,7 +34421,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29501,7 +34429,7 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29509,11 +34437,11 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29529,7 +34457,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29537,11 +34465,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29557,7 +34485,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29565,7 +34493,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29573,11 +34501,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29593,7 +34521,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29601,11 +34529,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29621,7 +34549,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29629,11 +34557,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29649,7 +34577,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29657,7 +34585,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29665,15 +34593,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -29685,7 +34613,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29693,7 +34621,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29701,15 +34629,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -29721,7 +34649,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29729,15 +34657,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -29749,7 +34677,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29757,15 +34685,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -29777,7 +34705,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29785,15 +34713,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -29805,7 +34733,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29813,7 +34741,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29821,15 +34749,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -29841,7 +34769,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29849,7 +34777,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29857,11 +34785,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29877,7 +34805,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29885,7 +34813,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29893,11 +34821,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29913,7 +34841,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29921,11 +34849,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29941,7 +34869,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29949,11 +34877,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29969,7 +34897,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29977,11 +34905,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29997,7 +34925,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30005,7 +34933,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -30013,11 +34941,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30033,7 +34961,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30041,11 +34969,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30054,7 +34982,7 @@ cont {
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -30062,11 +34990,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30082,7 +35010,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30090,11 +35018,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30110,7 +35038,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30118,11 +35046,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30138,7 +35066,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30146,11 +35074,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30166,7 +35094,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30174,11 +35102,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30187,7 +35115,7 @@ cont {
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -30195,11 +35123,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30215,7 +35143,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30223,11 +35151,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30243,7 +35171,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30251,11 +35179,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30271,112 +35199,60 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
 }
 cont {
-  name: "landuse-garages"
-  element {
-    scale: 14
-    area {
-      color: 2160707771
-      priority: 1298
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 1724500155
-      priority: 1298
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 868862139
-      priority: 1298
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 12763315
-      priority: 1298
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 12763315
-      priority: 1298
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 12763315
-      priority: 1298
-    }
-  }
-}
-cont {
   name: "landuse-grass"
   element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15825
-    }
-  }
-  element {
     scale: 13
     area {
       color: 13620648
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
 }
@@ -30386,242 +35262,122 @@ cont {
     scale: 15
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 16
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 17
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 18
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 19
     area {
       color: 15000299
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
-      priority: 15040
-    }
-  }
-}
-cont {
-  name: "landuse-landfill"
-  element {
-    scale: 14
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 15000299
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15000299
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 15000299
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15000299
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15000299
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
+      priority: 15041
     }
   }
 }
 cont {
   name: "landuse-meadow"
   element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 13620648
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
 }
@@ -30631,7 +35387,7 @@ cont {
     scale: 17
     symbol {
       name: "military-l"
-      priority: 16662
+      priority: 16666
     }
     caption {
       primary {
@@ -30639,14 +35395,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
     scale: 18
     symbol {
       name: "military-l"
-      priority: 16662
+      priority: 16666
     }
     caption {
       primary {
@@ -30654,14 +35410,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
     scale: 19
     symbol {
       name: "military-l"
-      priority: 16662
+      priority: 16666
     }
     caption {
       primary {
@@ -30669,341 +35425,181 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
 cont {
   name: "landuse-orchard"
   element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 13620648
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
-    }
-  }
-}
-cont {
-  name: "landuse-quarry"
-  element {
-    scale: 15
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-}
-cont {
-  name: "landuse-railway"
-  element {
-    scale: 15
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 15000299
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 6710886
-      }
-      priority: 15040
+      priority: 15138
     }
   }
 }
 cont {
   name: "landuse-recreation_ground"
   element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 13620648
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15135
+      priority: 15138
     }
   }
 }
@@ -31016,7 +35612,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31027,7 +35623,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31035,14 +35631,14 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31050,7 +35646,7 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31058,7 +35654,7 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31066,14 +35662,14 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31081,7 +35677,7 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31089,7 +35685,7 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31097,14 +35693,14 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31112,7 +35708,7 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31120,7 +35716,7 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31128,14 +35724,14 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31143,7 +35739,7 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31151,7 +35747,7 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31159,14 +35755,14 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31174,7 +35770,7 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31182,7 +35778,7 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31190,14 +35786,14 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31205,7 +35801,7 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31213,7 +35809,7 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31221,14 +35817,14 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31236,7 +35832,7 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31244,7 +35840,7 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31252,14 +35848,14 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31267,7 +35863,7 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31275,348 +35871,355 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
 }
 cont {
-  name: "landuse-salt_pond"
-  element {
-    scale: 0
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 1
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 2
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 3
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 4
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 5
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 6
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 10
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
+  name: "landuse-village_green"
   element {
     scale: 13
     area {
-      color: 9163744
-      priority: -15771
+      color: 13620648
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
-      color: 9163744
-      priority: -15771
+      color: 13029267
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
-      color: 9163744
-      priority: -15771
+      color: 13029267
+      priority: -15862
     }
   }
   element {
     scale: 16
     area {
-      color: 9163744
-      priority: -15771
+      color: 13029267
+      priority: -15862
     }
   }
   element {
     scale: 17
     area {
-      color: 9163744
-      priority: -15771
+      color: 13029267
+      priority: -15862
     }
   }
   element {
     scale: 18
     area {
-      color: 9163744
-      priority: -15771
+      color: 13029267
+      priority: -15862
     }
   }
   element {
     scale: 19
     area {
-      color: 9163744
-      priority: -15771
+      color: 13029267
+      priority: -15862
     }
   }
 }
 cont {
-  name: "landuse-village_green"
-  element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
+  name: "landuse-vineyard"
   element {
     scale: 13
     area {
       color: 13620648
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+      }
+      priority: 15138
     }
   }
 }
 cont {
-  name: "landuse-vineyard"
+  name: "leisure-dog_park"
   element {
     scale: 12
-    area {
-      color: 13620648
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
     scale: 13
-    area {
-      color: 13620648
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
     scale: 14
-    area {
-      color: 13029267
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
     scale: 15
-    area {
-      color: 13029267
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 4473924
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
   element {
     scale: 16
-    area {
-      color: 13029267
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 4473924
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
   element {
     scale: 17
-    area {
-      color: 13029267
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 4473924
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
   element {
     scale: 18
-    area {
-      color: 13029267
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 4473924
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
   element {
     scale: 19
-    area {
-      color: 13029267
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 4473924
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
 }
 cont {
-  name: "leisure-dog_park"
+  name: "leisure-dog_park-tennis"
   element {
-    scale: 18
+    scale: 12
     symbol {
       name: "dog_park-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 13
     symbol {
       name: "dog_park-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "leisure-dog_park-tennis"
   element {
     scale: 17
     symbol {
-      name: "tennis-l"
-      apply_for_type: 1
-      priority: 16851
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -31624,37 +36227,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "dog_park-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "dog_park-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -31664,44 +36267,44 @@ cont {
     scale: 12
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-m"
-      priority: 16121
+      priority: 16125
       min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -31713,7 +36316,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -31721,7 +36324,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -31729,16 +36332,16 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-m"
-      priority: 16121
+      priority: 16125
       min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -31750,7 +36353,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -31758,7 +36361,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -31766,16 +36369,16 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-l"
-      priority: 16121
+      priority: 16125
       min_distance: 10
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -31787,7 +36390,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -31795,7 +36398,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -31803,16 +36406,16 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-l"
-      priority: 16121
+      priority: 16125
       min_distance: 10
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -31824,7 +36427,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -31832,7 +36435,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -31840,11 +36443,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -31860,18 +36463,18 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
   }
   element {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -31887,7 +36490,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
   }
 }
@@ -31895,71 +36498,86 @@ cont {
   name: "leisure-golf_course"
   element {
     scale: 12
-    area {
-      color: 13620648
-      priority: -15825
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 13
     area {
       color: 13620648
-      priority: -15825
+      priority: -15792
+    }
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15825
+      priority: -15792
+    }
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15825
+      priority: -15792
+    }
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15825
+      priority: -15792
+    }
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15784
+      priority: -15792
     }
     symbol {
       name: "golf-l"
-      apply_for_type: 1
-      priority: 16216
+      priority: 16208
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15784
+      priority: -15792
     }
     symbol {
       name: "golf-l"
-      priority: 16216
+      priority: 16208
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15784
+      priority: -15792
     }
     symbol {
       name: "golf-l"
-      priority: 16216
+      priority: 16208
     }
   }
 }
@@ -31969,174 +36587,174 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-s"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 3832097
         stroke_color: 872415231
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-s"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 3832097
         stroke_color: 872415231
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-s"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-m"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 3832097
-        stroke_color: 452984831
+        stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-m"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 3832097
-        stroke_color: 452984831
+        stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-l"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 3832097
-        stroke_color: 452984831
+        stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-l"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 3832097
-        stroke_color: 452984831
+        stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-l"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 3832097
-        stroke_color: 452984831
+        stroke_color: 872415231
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
 }
@@ -32146,39 +36764,39 @@ cont {
     scale: 10
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32194,7 +36812,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32202,7 +36820,7 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32210,11 +36828,11 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32230,7 +36848,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32238,11 +36856,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32258,7 +36876,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32266,7 +36884,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32274,11 +36892,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32294,7 +36912,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32302,11 +36920,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32322,7 +36940,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32330,11 +36948,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32350,7 +36968,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32358,7 +36976,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32366,15 +36984,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -32386,7 +37004,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32394,7 +37012,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32402,15 +37020,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -32422,7 +37040,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32430,15 +37048,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -32450,7 +37068,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32458,15 +37076,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -32478,7 +37096,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32486,15 +37104,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -32506,7 +37124,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32514,7 +37132,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32522,15 +37140,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -32542,7 +37160,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32550,7 +37168,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32558,11 +37176,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32578,7 +37196,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32586,7 +37204,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32594,11 +37212,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32614,7 +37232,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32622,11 +37240,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32642,7 +37260,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32650,11 +37268,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32670,7 +37288,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32678,11 +37296,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32698,7 +37316,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32706,7 +37324,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32714,11 +37332,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32734,7 +37352,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32742,7 +37360,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32750,11 +37368,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32770,7 +37388,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32778,11 +37396,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32798,7 +37416,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -32806,11 +37424,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32826,7 +37444,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32834,11 +37452,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32854,7 +37472,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32862,11 +37480,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32882,7 +37500,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32890,11 +37508,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32910,7 +37528,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32918,11 +37536,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32938,7 +37556,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -32946,11 +37564,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32966,7 +37584,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32974,11 +37592,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32994,7 +37612,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33002,11 +37620,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33022,7 +37640,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33033,39 +37651,39 @@ cont {
     scale: 10
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33081,7 +37699,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33089,7 +37707,7 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33097,11 +37715,11 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33117,7 +37735,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33125,11 +37743,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33145,7 +37763,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33153,7 +37771,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33161,11 +37779,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33181,7 +37799,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33189,11 +37807,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33209,7 +37827,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33217,11 +37835,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33237,7 +37855,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33245,7 +37863,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33253,15 +37871,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -33273,7 +37891,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33281,7 +37899,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33289,15 +37907,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -33309,7 +37927,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33317,15 +37935,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -33337,7 +37955,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33345,15 +37963,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -33365,7 +37983,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33373,15 +37991,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -33393,7 +38011,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33401,7 +38019,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33409,15 +38027,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -33429,7 +38047,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33437,7 +38055,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33445,11 +38063,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33465,7 +38083,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33473,7 +38091,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33481,11 +38099,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33501,7 +38119,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33509,11 +38127,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33529,7 +38147,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33537,11 +38155,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33557,7 +38175,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33565,11 +38183,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33585,7 +38203,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33593,7 +38211,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33601,11 +38219,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33621,7 +38239,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33629,7 +38247,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33637,11 +38255,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33657,7 +38275,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33665,11 +38283,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33685,7 +38303,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -33693,11 +38311,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33713,7 +38331,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33721,11 +38339,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33741,7 +38359,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33749,11 +38367,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33769,7 +38387,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33777,11 +38395,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33797,7 +38415,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33805,11 +38423,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33825,7 +38443,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -33833,11 +38451,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33853,7 +38471,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33861,11 +38479,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33881,7 +38499,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33889,11 +38507,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33909,7 +38527,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33920,39 +38538,39 @@ cont {
     scale: 10
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33968,7 +38586,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33976,7 +38594,7 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33984,11 +38602,11 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34004,7 +38622,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34012,11 +38630,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34032,7 +38650,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34040,7 +38658,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34048,11 +38666,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34068,7 +38686,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34076,11 +38694,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34096,7 +38714,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34104,11 +38722,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34124,7 +38742,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34132,7 +38750,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34140,15 +38758,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -34160,7 +38778,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34168,7 +38786,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34176,15 +38794,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -34196,7 +38814,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34204,15 +38822,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -34224,7 +38842,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34232,15 +38850,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -34252,7 +38870,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34260,15 +38878,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -34280,7 +38898,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34288,7 +38906,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34296,15 +38914,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -34316,7 +38934,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34324,7 +38942,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34332,11 +38950,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34352,7 +38970,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34360,7 +38978,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34368,11 +38986,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34388,7 +39006,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34396,11 +39014,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34416,7 +39034,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34424,11 +39042,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34444,7 +39062,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34452,11 +39070,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34472,7 +39090,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34480,7 +39098,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34488,11 +39106,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34508,7 +39126,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34516,7 +39134,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34524,11 +39142,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34544,7 +39162,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34552,11 +39170,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34572,7 +39190,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -34580,11 +39198,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34600,7 +39218,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34608,11 +39226,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34628,7 +39246,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34636,11 +39254,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34656,7 +39274,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34664,11 +39282,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34684,7 +39302,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34692,11 +39310,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34712,7 +39330,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -34720,11 +39338,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34740,7 +39358,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34748,11 +39366,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34768,7 +39386,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34776,11 +39394,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34796,7 +39414,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34807,39 +39425,39 @@ cont {
     scale: 10
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34855,7 +39473,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34863,7 +39481,7 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34871,11 +39489,11 @@ cont {
     scale: 14
     area {
       color: 11453035
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34891,7 +39509,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34899,11 +39517,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34919,7 +39537,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34927,7 +39545,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34935,11 +39553,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34955,7 +39573,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34963,11 +39581,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34983,7 +39601,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34991,11 +39609,11 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35011,7 +39629,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35019,7 +39637,7 @@ cont {
     scale: 15
     area {
       color: 11584112
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35027,15 +39645,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -35047,7 +39665,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35055,7 +39673,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35063,15 +39681,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -35083,7 +39701,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35091,15 +39709,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -35111,7 +39729,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35119,15 +39737,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -35139,7 +39757,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35147,15 +39765,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -35167,7 +39785,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35175,7 +39793,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35183,15 +39801,15 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3832097
         stroke_color: 872415231
         offset_y: 10
@@ -35203,7 +39821,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35211,7 +39829,7 @@ cont {
     scale: 16
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35219,11 +39837,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35239,7 +39857,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35247,7 +39865,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35255,11 +39873,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35275,7 +39893,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35283,11 +39901,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35303,7 +39921,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35311,11 +39929,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35331,7 +39949,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35339,11 +39957,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35359,7 +39977,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35367,7 +39985,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35375,11 +39993,11 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35395,7 +40013,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35403,7 +40021,7 @@ cont {
     scale: 17
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35411,11 +40029,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35431,7 +40049,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35439,11 +40057,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35459,7 +40077,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -35467,11 +40085,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35487,7 +40105,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35495,11 +40113,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35515,7 +40133,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35523,11 +40141,11 @@ cont {
     scale: 18
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35543,7 +40161,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35551,11 +40169,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35571,7 +40189,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35579,11 +40197,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35599,7 +40217,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -35607,11 +40225,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35627,7 +40245,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35635,11 +40253,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35655,7 +40273,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35663,11 +40281,11 @@ cont {
     scale: 19
     area {
       color: 11190117
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35683,7 +40301,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35691,29 +40309,99 @@ cont {
 cont {
   name: "leisure-pitch"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 15
-    area {
-      color: 13749671
-      priority: -15946
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 16
     area {
       color: 13749671
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -35721,19 +40409,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -35741,19 +40429,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -35761,36 +40449,106 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-pitch-tennis"
   element {
+    scale: 12
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 15
-    area {
-      color: 13749671
-      priority: -15946
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 16
     area {
       color: 13749671
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 13749671
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35798,19 +40556,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 13749671
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35818,19 +40576,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 13749671
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35838,72 +40596,181 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-playground"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
     scale: 17
     area {
       color: 13749671
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
     }
   }
   element {
     scale: 18
     area {
       color: 13749671
-      priority: -15163
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16837
+      priority: 16833
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 13749671
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+}
+cont {
+  name: "leisure-playground-tennis"
+  element {
+    scale: 12
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15833
     }
   }
   element {
-    scale: 19
-    area {
-      color: 13749671
-      priority: -15163
+    scale: 13
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
     symbol {
-      name: "pitch-l"
+      name: "tennis-l"
       apply_for_type: 1
-      priority: 16837
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
-}
-cont {
-  name: "leisure-playground-tennis"
   element {
     scale: 17
     area {
       color: 13749671
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35911,19 +40778,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 13749671
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35931,19 +40798,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 13749671
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35951,18 +40818,98 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-playing_fields-tennis"
   element {
+    scale: 12
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35970,7 +40917,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -35978,7 +40925,7 @@ cont {
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35986,7 +40933,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -35994,7 +40941,7 @@ cont {
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -36002,18 +40949,98 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-sports_centre"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16847
     }
     caption {
       primary {
@@ -36021,7 +41048,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15847
     }
   }
   element {
@@ -36029,7 +41056,7 @@ cont {
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16847
     }
     caption {
       primary {
@@ -36037,7 +41064,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15847
     }
   }
   element {
@@ -36045,7 +41072,7 @@ cont {
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16847
     }
     caption {
       primary {
@@ -36053,36 +41080,110 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15847
     }
   }
 }
 cont {
   name: "leisure-stadium"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 15
     area {
       color: 13749671
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 16
     area {
       color: 13749671
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -36090,19 +41191,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -36110,19 +41211,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -36130,87 +41231,104 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-swimming_pool"
   element {
+    scale: 12
+    symbol {
+      name: "swimming-l"
+      priority: 16847
+    }
+  }
+  element {
     scale: 13
     area {
       color: 9163744
-      priority: -15771
+      priority: -15153
+    }
+    symbol {
+      name: "swimming-l"
+      priority: 16847
     }
   }
   element {
     scale: 14
     area {
       color: 9163744
-      priority: -15771
+      priority: -15153
+    }
+    symbol {
+      name: "swimming-l"
+      priority: 16847
     }
   }
   element {
     scale: 15
     area {
       color: 9163744
-      priority: -15771
+      priority: -15153
+    }
+    symbol {
+      name: "swimming-l"
+      priority: 16847
     }
   }
   element {
     scale: 16
     area {
       color: 9163744
-      priority: -15771
+      priority: -15153
+    }
+    symbol {
+      name: "swimming-l"
+      priority: 16847
     }
   }
   element {
     scale: 17
     area {
       color: 9163744
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "swimming-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
+      priority: 16847
     }
   }
   element {
     scale: 18
     area {
       color: 9163744
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "swimming-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15864
+      priority: 16847
     }
   }
   element {
     scale: 19
     area {
       color: 9163744
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "swimming-l"
-      priority: 16864
+      priority: 16847
+    }
+  }
+}
+cont {
+  name: "leisure-water_park"
+  element {
+    scale: 12
+    symbol {
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -36218,80 +41336,59 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15819
     }
   }
-}
-cont {
-  name: "leisure-track"
   element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    scale: 13
+    symbol {
+      name: "diving-l"
+      priority: 16819
     }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
-    scale: 16
-    lines {
-      width: 1.8
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    scale: 14
+    symbol {
+      name: "diving-l"
+      priority: 16819
     }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    scale: 15
+    symbol {
+      name: "diving-l"
+      priority: 16819
     }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 6510384
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "leisure-water_park"
   element {
     scale: 16
     symbol {
-      name: "swimming-m"
-      priority: 16864
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -36299,14 +41396,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15819
     }
   }
   element {
     scale: 17
     symbol {
-      name: "swimming-l"
-      priority: 16864
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -36314,37 +41411,37 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
-      name: "swimming-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "swimming-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -36354,14 +41451,14 @@ cont {
     scale: 12
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
     scale: 13
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36369,13 +41466,13 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36383,13 +41480,13 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36397,13 +41494,13 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36411,20 +41508,20 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -36432,20 +41529,20 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -36453,117 +41550,75 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
 cont {
-  name: "man_made-cutline"
-  element {
-    scale: 14
-    lines {
-      width: 4.0
-      color: 14934482
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    area {
-      color: 14934482
-      priority: -15730
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 4.0
-      color: 14934482
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    area {
-      color: 14934482
-      priority: -15730
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 4.0
-      color: 14934482
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    area {
-      color: 14934482
-      priority: -15730
-    }
-  }
+  name: "man_made-lighthouse"
   element {
-    scale: 17
-    lines {
-      width: 4.0
-      color: 14934482
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    scale: 12
+    symbol {
+      name: "lighthouse-l"
+      priority: 16861
     }
-    area {
-      color: 14934482
-      priority: -15730
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 14934482
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    scale: 13
+    symbol {
+      name: "lighthouse-l"
+      priority: 16861
     }
-    area {
-      color: 14934482
-      priority: -15730
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 14934482
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    scale: 14
+    symbol {
+      name: "lighthouse-l"
+      priority: 16861
     }
-    area {
-      color: 14934482
-      priority: -15730
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
-}
-cont {
-  name: "man_made-lighthouse"
   element {
     scale: 15
     symbol {
-      name: "lighthouse-m"
-      priority: 16878
+      name: "lighthouse-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -36571,14 +41626,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "lighthouse-m"
-      priority: 16878
+      name: "lighthouse-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -36586,14 +41641,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "lighthouse-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -36601,14 +41656,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "lighthouse-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -36616,14 +41671,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "lighthouse-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -36631,7 +41686,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -36641,14 +41696,14 @@ cont {
     scale: 12
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
     scale: 13
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36656,13 +41711,13 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36670,13 +41725,13 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36684,13 +41739,13 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36698,20 +41753,20 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -36719,20 +41774,20 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -36740,142 +41795,317 @@ cont {
     lines {
       width: 4.0
       color: 14934482
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 14934482
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
 cont {
-  name: "man_made-survey_point"
+  name: "man_made-windmill"
   element {
-    scale: 19
+    scale: 12
     symbol {
-      name: "survey_point-l"
-      apply_for_type: 1
-      priority: 16837
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "man_made-windmill"
   element {
     scale: 18
     symbol {
       name: "windmill-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "windmill-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "natural-bare_rock"
   element {
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
     scale: 15
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -36885,112 +42115,112 @@ cont {
     scale: 10
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 11
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 12
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 13
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 14
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 4495803
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 15
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 4495803
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 16
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 17
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 18
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 19
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15229
+      priority: 15222
     }
   }
 }
@@ -37000,46 +42230,46 @@ cont {
     scale: 10
     area {
       color: 16575614
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 11
     area {
       color: 16575614
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 12
     area {
       color: 16575614
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 13
     area {
       color: 16575614
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 14
     area {
       color: 16575614
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 15
     area {
       color: 16575614
-      priority: -15163
+      priority: -15181
     }
     symbol {
-      name: "beach-m"
-      priority: 16837
+      name: "beach-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -37047,18 +42277,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 16
     area {
       color: 16575614
-      priority: -15163
+      priority: -15181
     }
     symbol {
-      name: "beach-m"
-      priority: 16837
+      name: "beach-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -37066,64 +42296,64 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 17
     area {
       color: 16575614
-      priority: -15163
+      priority: -15181
     }
     symbol {
       name: "beach-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 18
     area {
       color: 16575614
-      priority: -15163
+      priority: -15181
     }
     symbol {
       name: "beach-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     area {
       color: 16575614
-      priority: -15163
+      priority: -15181
     }
     symbol {
       name: "beach-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -37195,9 +42425,9 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "cave-s"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37205,15 +42435,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 13
     symbol {
-      name: "cave-s"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37221,15 +42451,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 14
     symbol {
-      name: "cave-s"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37237,15 +42467,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 15
     symbol {
-      name: "cave-m"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37253,15 +42483,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "cave-m"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37269,15 +42499,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
-      name: "cave-m"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37285,7 +42515,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -37293,15 +42523,15 @@ cont {
     symbol {
       name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -37309,15 +42539,15 @@ cont {
     symbol {
       name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -37610,118 +42840,52 @@ cont {
 cont {
   name: "natural-grassland"
   element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15825
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 13620648
-      priority: -15825
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 13029267
-      priority: -15825
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 13029267
-      priority: -15825
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 13029267
-      priority: -15825
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 13029267
-      priority: -15825
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 13029267
-      priority: -15825
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 13029267
-      priority: -15825
-    }
-  }
-}
-cont {
-  name: "natural-heath"
-  element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15825
-    }
-  }
-  element {
     scale: 13
     area {
       color: 13620648
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15825
+      priority: -15820
     }
   }
 }
@@ -37731,84 +42895,84 @@ cont {
     scale: 0
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37816,7 +42980,7 @@ cont {
     scale: 10
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37824,14 +42988,14 @@ cont {
     scale: 11
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37839,7 +43003,7 @@ cont {
     scale: 11
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37847,14 +43011,14 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37862,7 +43026,7 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37870,7 +43034,7 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -37878,14 +43042,14 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37893,7 +43057,7 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37901,7 +43065,7 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -37909,14 +43073,14 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37924,7 +43088,7 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37932,7 +43096,7 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -37940,14 +43104,14 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37955,7 +43119,7 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37963,7 +43127,7 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -37971,14 +43135,14 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37986,7 +43150,7 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37994,7 +43158,7 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -38002,14 +43166,14 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -38017,7 +43181,7 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -38025,7 +43189,7 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -38033,14 +43197,14 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -38048,7 +43212,7 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -38056,7 +43220,7 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -38064,14 +43228,14 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -38079,7 +43243,7 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -38087,7 +43251,7 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -38236,254 +43400,272 @@ cont {
   }
 }
 cont {
-  name: "natural-marsh"
-  element {
-    scale: 11
-    area {
-      color: 13229526
-      priority: -15798
-    }
-  }
+  name: "natural-peak"
   element {
     scale: 12
-    area {
-      color: 13229526
-      priority: -15798
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
-  }
-  element {
-    scale: 13
-    area {
-      color: 13229526
-      priority: -15798
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
+    apply_if: "name"
   }
   element {
-    scale: 14
-    area {
-      color: 13229526
-      priority: -15798
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
-  }
-  element {
-    scale: 15
-    area {
-      color: 13229526
-      priority: -15798
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 16
-    area {
-      color: 13229526
-      priority: -15798
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 4495803
+        color: 4473924
+        offset_y: 10
       }
-      priority: 15202
+      priority: 15861
     }
+    apply_if: "name"
   }
   element {
-    scale: 17
-    area {
-      color: 13229526
-      priority: -15798
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 4495803
+        color: 4473924
+        offset_y: 10
       }
-      priority: 15202
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 18
-    area {
-      color: 13229526
-      priority: -15798
+    scale: 13
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 4495803
+        color: 4473924
+        offset_y: 10
       }
-      priority: 15202
+      priority: 15861
     }
+    apply_if: "name"
   }
   element {
-    scale: 19
-    area {
-      color: 13229526
-      priority: -15798
+    scale: 13
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 4495803
+        color: 4473924
+        offset_y: 10
       }
-      priority: 15202
+      priority: 15861
     }
+    apply_if: "!name"
   }
-}
-cont {
-  name: "natural-peak"
   element {
-    scale: 12
+    scale: 13
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
     apply_if: "name"
   }
   element {
-    scale: 12
+    scale: 13
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
-    apply_if: "name"
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
   }
   element {
-    scale: 13
+    scale: 14
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 9
+        height: 11
         color: 4473924
-        offset_y: 6
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
     apply_if: "name"
   }
   element {
-    scale: 13
+    scale: 14
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 9
+        height: 11
         color: 4473924
-        offset_y: 6
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
-    apply_if: "name"
+    apply_if: "!name"
   }
   element {
     scale: 14
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 6
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
     apply_if: "name"
   }
   element {
     scale: 14
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
-        offset_y: 6
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
-    apply_if: "name"
+    apply_if: "!name"
   }
   element {
     scale: 15
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -38493,518 +43675,489 @@ cont {
     scale: 0
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 11
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 12
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 13
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 14
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 15
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 16
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 17
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 18
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 19
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
 }
 cont {
   name: "natural-rock"
   element {
-    scale: 15
+    scale: 12
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 16
+    scale: 12
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 17
+    scale: 13
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
-    }
-  }
-}
-cont {
-  name: "natural-salt_pond"
-  element {
-    scale: 0
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 1
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 2
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 3
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 4
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 5
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 6
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 10
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 9163744
-      priority: -15771
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 9163744
-      priority: -15771
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
     scale: 14
-    area {
-      color: 9163744
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
   }
   element {
     scale: 15
-    area {
-      color: 9163744
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 16
-    area {
-      color: 9163744
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 17
-    area {
-      color: 9163744
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 18
-    area {
-      color: 9163744
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 19
-    area {
-      color: 9163744
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
 }
 cont {
   name: "natural-scrub"
   element {
-    scale: 12
-    area {
-      color: 13620648
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 13620648
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 16
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 17
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 18
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 19
     area {
       color: 13029267
-      priority: -15865
+      priority: -15862
     }
   }
 }
 cont {
   name: "natural-spring"
   element {
-    scale: 15
+    scale: 12
     symbol {
-      name: "drinking-water-m"
-      apply_for_type: 1
-      priority: 16878
+      name: "drinking-water-l"
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
-    scale: 16
+    scale: 13
     symbol {
-      name: "drinking-water-m"
-      priority: 16878
+      name: "drinking-water-l"
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
-    scale: 17
+    scale: 14
     symbol {
       name: "drinking-water-l"
-      priority: 16878
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
-    scale: 18
+    scale: 15
     symbol {
       name: "drinking-water-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
-    scale: 19
+    scale: 16
     symbol {
       name: "drinking-water-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "drinking-water-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
     }
   }
-}
-cont {
-  name: "natural-tree"
   element {
     scale: 18
     symbol {
-      name: "tree-m"
-      apply_for_type: 1
-      priority: 16837
+      name: "drinking-water-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
-      name: "tree-m"
-      apply_for_type: 1
-      priority: 16837
+      name: "drinking-water-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
     }
   }
 }
@@ -39014,7 +44167,7 @@ cont {
     scale: 10
     symbol {
       name: "volcano-s"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39022,14 +44175,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 11
     symbol {
       name: "volcano-s"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39037,14 +44190,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 12
     symbol {
-      name: "volcano-s"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39052,14 +44205,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 13
     symbol {
-      name: "volcano-s"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39067,14 +44220,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 14
     symbol {
-      name: "volcano-s"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39082,14 +44235,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 15
     symbol {
-      name: "volcano-m"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39097,14 +44250,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "volcano-m"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39112,14 +44265,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "volcano-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39127,14 +44280,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "volcano-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39142,14 +44295,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "volcano-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39157,7 +44310,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -39167,84 +44320,84 @@ cont {
     scale: 0
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39252,7 +44405,7 @@ cont {
     scale: 10
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39260,14 +44413,14 @@ cont {
     scale: 11
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39275,7 +44428,7 @@ cont {
     scale: 11
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39283,14 +44436,14 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39298,7 +44451,7 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39306,7 +44459,7 @@ cont {
     scale: 12
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39314,14 +44467,14 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39329,7 +44482,7 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39337,7 +44490,7 @@ cont {
     scale: 13
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39345,14 +44498,14 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39360,14 +44513,14 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 4495803
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39375,14 +44528,14 @@ cont {
     scale: 14
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39390,14 +44543,14 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39405,14 +44558,14 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 4495803
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39420,14 +44573,14 @@ cont {
     scale: 15
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39435,14 +44588,14 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39450,14 +44603,14 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39465,14 +44618,14 @@ cont {
     scale: 16
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39480,14 +44633,14 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39495,14 +44648,14 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39510,14 +44663,14 @@ cont {
     scale: 17
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39525,14 +44678,14 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39540,14 +44693,14 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39555,14 +44708,14 @@ cont {
     scale: 18
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39570,14 +44723,14 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39585,14 +44738,14 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39600,14 +44753,14 @@ cont {
     scale: 19
     area {
       color: 9163744
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 4495803
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39617,8 +44770,8 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "waterfall-s"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39626,14 +44779,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 13
     symbol {
-      name: "waterfall-s"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39641,14 +44794,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 14
     symbol {
-      name: "waterfall-s"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39656,14 +44809,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 15
     symbol {
-      name: "waterfall-m"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39671,14 +44824,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "waterfall-m"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39686,52 +44839,52 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "waterfall-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "waterfall-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "waterfall-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -39740,92 +44893,64 @@ cont {
   element {
     scale: 11
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 12
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 13
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 14
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 15
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 16
     area {
-      color: 13229526
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15202
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 17
     area {
-      color: 13229526
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15202
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 18
     area {
-      color: 13229526
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15202
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 19
     area {
-      color: 13229526
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15202
+      color: 3012285408
+      priority: -15806
     }
   }
 }
@@ -39834,92 +44959,64 @@ cont {
   element {
     scale: 11
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 12
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 13
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 14
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 15
     area {
-      color: 13229526
-      priority: -15798
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 16
     area {
-      color: 13229526
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15202
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 17
     area {
-      color: 13229526
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15202
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 18
     area {
-      color: 13229526
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15202
+      color: 3012285408
+      priority: -15806
     }
   }
   element {
     scale: 19
     area {
-      color: 13229526
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4495803
-      }
-      priority: 15202
+      color: 3012285408
+      priority: -15806
     }
   }
 }
@@ -39929,70 +45026,70 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
 }
@@ -40002,70 +45099,70 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
 }
@@ -40075,70 +45172,70 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
 }
@@ -40148,268 +45245,808 @@ cont {
     scale: 10
     area {
       color: 13029267
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 12372094
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 11781233
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 11453035
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 15
     area {
       color: 11584112
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 16
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 17
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 18
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 19
     area {
       color: 11190117
-      priority: -15892
+      priority: -15889
     }
   }
 }
 cont {
   name: "office"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-company"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-estate_agent"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-government"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-lawyer"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-telecommunication"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -40420,7 +46057,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40430,7 +46067,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40439,8 +46076,8 @@ cont {
     scale: 15
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40449,8 +46086,8 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40459,8 +46096,8 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40469,8 +46106,8 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40479,8 +46116,8 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40493,7 +46130,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40503,7 +46140,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40512,8 +46149,8 @@ cont {
     scale: 15
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40522,8 +46159,8 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40532,8 +46169,8 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40542,8 +46179,8 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40552,8 +46189,8 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40566,7 +46203,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40576,7 +46213,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40585,8 +46222,8 @@ cont {
     scale: 15
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40595,8 +46232,8 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40605,8 +46242,8 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40615,8 +46252,8 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40625,8 +46262,8 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40639,7 +46276,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40649,7 +46286,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40658,8 +46295,8 @@ cont {
     scale: 15
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40668,8 +46305,8 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40678,8 +46315,8 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40688,8 +46325,8 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40698,8 +46335,8 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40712,7 +46349,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40722,7 +46359,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40731,8 +46368,8 @@ cont {
     scale: 15
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40741,8 +46378,8 @@ cont {
     scale: 16
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40751,8 +46388,8 @@ cont {
     scale: 17
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40761,8 +46398,8 @@ cont {
     scale: 18
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40771,8 +46408,8 @@ cont {
     scale: 19
     lines {
       width: 1.6
-      color: 4473924
-      priority: 1945
+      color: 7829367
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40785,7 +46422,7 @@ cont {
     lines {
       width: 0.8
       color: 12876543
-      priority: 1081
+      priority: 1083
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40795,7 +46432,7 @@ cont {
     lines {
       width: 1.1
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40805,7 +46442,7 @@ cont {
     lines {
       width: 1.1
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40815,7 +46452,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40825,7 +46462,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40835,7 +46472,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40848,7 +46485,7 @@ cont {
     lines {
       width: 1.0
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40858,7 +46495,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40868,7 +46505,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40878,7 +46515,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40888,7 +46525,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40898,7 +46535,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40911,7 +46548,7 @@ cont {
     lines {
       width: 1.0
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40921,7 +46558,7 @@ cont {
     lines {
       width: 1.6
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40931,7 +46568,7 @@ cont {
     lines {
       width: 1.6
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40941,7 +46578,7 @@ cont {
     lines {
       width: 1.8
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40951,7 +46588,7 @@ cont {
     lines {
       width: 1.8
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40961,7 +46598,7 @@ cont {
     lines {
       width: 1.8
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40974,7 +46611,7 @@ cont {
     lines {
       width: 1.0
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40984,7 +46621,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40994,7 +46631,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41004,7 +46641,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41014,7 +46651,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41024,7 +46661,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41037,7 +46674,7 @@ cont {
     lines {
       width: 1.0
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41047,7 +46684,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41057,7 +46694,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41067,7 +46704,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41077,7 +46714,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41087,7 +46724,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41100,7 +46737,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41110,7 +46747,7 @@ cont {
     lines {
       width: 1.6
       color: 872349696
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41120,7 +46757,7 @@ cont {
     lines {
       width: 1.6
       color: 872349696
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41130,7 +46767,7 @@ cont {
     lines {
       width: 1.8
       color: 16711680
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41140,7 +46777,7 @@ cont {
     lines {
       width: 1.8
       color: 16711680
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41150,7 +46787,7 @@ cont {
     lines {
       width: 1.8
       color: 16711680
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41163,7 +46800,7 @@ cont {
     lines {
       width: 1.0
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41173,7 +46810,7 @@ cont {
     lines {
       width: 1.6
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41183,7 +46820,7 @@ cont {
     lines {
       width: 1.6
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41193,7 +46830,7 @@ cont {
     lines {
       width: 1.8
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41203,7 +46840,7 @@ cont {
     lines {
       width: 1.8
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41213,7 +46850,7 @@ cont {
     lines {
       width: 1.8
       color: 1170688
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41226,7 +46863,7 @@ cont {
     lines {
       width: 0.8
       color: 12876543
-      priority: 1081
+      priority: 1083
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41236,7 +46873,7 @@ cont {
     lines {
       width: 1.1
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41246,7 +46883,7 @@ cont {
     lines {
       width: 1.1
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41256,7 +46893,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41266,7 +46903,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41276,7 +46913,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41289,7 +46926,7 @@ cont {
     lines {
       width: 0.8
       color: 12876543
-      priority: 1081
+      priority: 1083
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41299,7 +46936,7 @@ cont {
     lines {
       width: 1.1
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41309,7 +46946,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41319,7 +46956,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41329,7 +46966,7 @@ cont {
     lines {
       width: 1.5
       color: 12876543
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41343,16 +46980,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -41362,16 +46999,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -41381,16 +47018,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -41400,16 +47037,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -41419,16 +47056,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -41438,16 +47075,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -41457,16 +47094,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41476,16 +47113,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41493,18 +47130,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41512,18 +47149,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41533,16 +47170,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41551,16 +47189,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41569,16 +47207,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41587,16 +47225,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41605,16 +47243,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41623,16 +47261,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41641,16 +47279,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41659,16 +47297,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41677,16 +47315,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41695,16 +47333,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41713,16 +47351,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -41734,16 +47372,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -41753,16 +47391,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -41772,16 +47410,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -41791,16 +47429,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -41810,16 +47448,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -41829,16 +47467,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -41848,16 +47486,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41867,16 +47505,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41884,18 +47522,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41903,18 +47541,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41924,16 +47562,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41942,16 +47581,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41960,16 +47599,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41978,16 +47617,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41996,16 +47635,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42014,16 +47653,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42032,16 +47671,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42050,16 +47689,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42068,16 +47707,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42086,16 +47725,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42104,16 +47743,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -42125,16 +47764,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -42144,16 +47783,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -42163,16 +47802,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -42182,16 +47821,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -42201,16 +47840,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -42220,16 +47859,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -42239,16 +47878,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42258,16 +47897,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42275,18 +47914,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42294,18 +47933,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42315,16 +47954,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42333,16 +47973,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42351,16 +47991,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42369,16 +48009,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42387,16 +48027,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42405,16 +48045,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42423,16 +48063,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42441,16 +48081,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42459,16 +48099,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42477,16 +48117,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42495,16 +48135,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -42516,16 +48156,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -42535,16 +48175,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -42554,16 +48194,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -42573,16 +48213,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -42592,16 +48232,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -42611,16 +48251,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -42630,16 +48270,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42649,16 +48289,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42666,18 +48306,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42685,18 +48325,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42706,16 +48346,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42724,16 +48365,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42742,16 +48383,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42760,16 +48401,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42778,16 +48419,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42796,16 +48437,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42814,16 +48455,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42832,16 +48473,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42850,16 +48491,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42868,16 +48509,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42886,16 +48527,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -42906,23 +48547,23 @@ cont {
     symbol {
       name: "star-s"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
         offset_y: 3
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
         offset_y: 9
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -42930,23 +48571,23 @@ cont {
     symbol {
       name: "star-m"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 15592411
         offset_y: 3
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
         offset_y: 9
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -42954,23 +48595,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
         offset_y: 4
       }
       secondary {
-        height: 10
+        height: 9
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 4
+        stroke_color: 2163076059
+        offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -42978,23 +48619,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 5
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 11
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43002,23 +48643,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 5
       }
       secondary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 11
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43026,23 +48667,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
         offset_y: 5
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
         offset_y: 11
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43050,23 +48691,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 3
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 9
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43074,23 +48715,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43098,23 +48739,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43122,23 +48763,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43146,23 +48787,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43170,23 +48811,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43194,23 +48835,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43218,23 +48859,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43242,23 +48883,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43266,23 +48907,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 4
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
 }
@@ -43294,16 +48935,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -43313,16 +48954,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -43332,16 +48973,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -43351,16 +48992,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -43370,16 +49011,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -43389,16 +49030,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -43408,16 +49049,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43427,16 +49068,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43444,18 +49085,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43463,18 +49104,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43484,16 +49125,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43502,16 +49144,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43520,16 +49162,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43538,16 +49180,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43556,16 +49198,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43574,16 +49216,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43592,16 +49234,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43610,16 +49252,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43628,16 +49270,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43646,16 +49288,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43664,16 +49306,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -43685,16 +49327,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -43704,16 +49346,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -43723,16 +49365,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -43742,16 +49384,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -43761,16 +49403,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -43780,16 +49422,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -43799,16 +49441,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43818,16 +49460,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43835,18 +49477,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43854,18 +49496,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43875,16 +49517,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43893,16 +49536,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43911,16 +49554,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43929,16 +49572,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43947,16 +49590,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43965,16 +49608,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43983,16 +49626,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44001,16 +49644,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44019,16 +49662,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44037,16 +49680,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44055,16 +49698,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -44076,16 +49719,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44095,16 +49738,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44114,16 +49757,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44133,16 +49776,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44152,16 +49795,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44171,16 +49814,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44190,16 +49833,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44209,16 +49852,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44226,18 +49869,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44245,18 +49888,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44266,16 +49909,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44284,16 +49928,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44302,16 +49946,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44320,16 +49964,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44338,16 +49982,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44356,16 +50000,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44374,16 +50018,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44392,16 +50036,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44410,16 +50054,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44428,16 +50072,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44446,16 +50090,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -44467,16 +50111,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44486,16 +50130,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44505,16 +50149,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44524,16 +50168,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44543,16 +50187,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44562,16 +50206,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44581,16 +50225,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44600,16 +50244,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44617,18 +50261,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44636,18 +50280,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44657,16 +50301,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44675,16 +50320,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44693,16 +50338,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44711,16 +50356,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44729,16 +50374,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44747,16 +50392,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44765,16 +50410,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44783,16 +50428,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44801,16 +50446,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44819,16 +50464,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44837,16 +50482,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -44858,16 +50503,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44877,16 +50522,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44896,16 +50541,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44915,16 +50560,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44934,16 +50579,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44953,16 +50598,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44972,16 +50617,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44991,16 +50636,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45008,18 +50653,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45027,18 +50672,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45048,16 +50693,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45066,16 +50712,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45084,16 +50730,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45102,16 +50748,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45120,16 +50766,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45138,16 +50784,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45156,16 +50802,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45174,16 +50820,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45192,16 +50838,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45210,16 +50856,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45228,16 +50874,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -45249,16 +50895,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -45268,16 +50914,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -45287,16 +50933,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -45306,16 +50952,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -45325,16 +50971,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -45344,16 +50990,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -45363,16 +51009,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45382,16 +51028,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45399,18 +51045,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45418,18 +51064,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45439,16 +51085,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45457,16 +51104,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45475,16 +51122,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45493,16 +51140,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45511,16 +51158,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45529,16 +51176,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45547,16 +51194,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45565,16 +51212,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45583,16 +51230,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45601,16 +51248,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45619,16 +51266,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -45640,16 +51287,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -45659,16 +51306,16 @@ cont {
       primary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
       }
       secondary {
         height: 8
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -45678,16 +51325,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -45697,16 +51344,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -45716,16 +51363,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -45735,16 +51382,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -45754,16 +51401,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45773,16 +51420,16 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45790,18 +51437,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45809,18 +51456,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
+        height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 1726868443
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45830,16 +51477,17 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
+        offset_y: 4
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
-        offset_y: 20
+        stroke_color: 2163076059
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45848,16 +51496,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45866,16 +51514,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45884,16 +51532,16 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45902,16 +51550,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45920,16 +51568,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45938,16 +51586,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45956,16 +51604,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45974,16 +51622,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45992,16 +51640,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -46010,16 +51658,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -46032,17 +51680,17 @@ cont {
         height: 12
         color: 9211020
       }
-      priority: 15648
+      priority: 15652
     }
   }
   element {
     scale: 2
     caption {
       primary {
-        height: 12
+        height: 14
         color: 9211020
       }
-      priority: 15648
+      priority: 15652
     }
   }
 }
@@ -46061,7 +51709,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46077,23 +51725,23 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
     scale: 5
     caption {
       primary {
-        height: 13
+        height: 14
         color: 9211020
       }
       secondary {
-        height: 11
+        height: 12
         color: 9211020
         offset_y: 20
         text: "int_name"
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46109,7 +51757,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46119,7 +51767,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46129,7 +51777,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46139,7 +51787,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46149,7 +51797,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46159,7 +51807,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46169,7 +51817,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46179,7 +51827,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46189,7 +51837,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46199,7 +51847,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46209,7 +51857,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46219,7 +51867,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46229,7 +51877,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46239,7 +51887,7 @@ cont {
         height: 15
         color: 9211020
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
@@ -46348,77 +51996,77 @@ cont {
     scale: 13
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
-        stroke_color: 1728053247
+        stroke_color: 3019898879
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
-        stroke_color: 1728053247
+        stroke_color: 3019898879
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
-        stroke_color: 1728053247
+        stroke_color: 3019898879
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
-        stroke_color: 1728053247
+        stroke_color: 3019898879
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
-        stroke_color: 1728053247
+        stroke_color: 3019898879
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
-        stroke_color: 1728053247
+        stroke_color: 3019898879
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 11
+        height: 12
         color: 4473924
-        stroke_color: 1728053247
+        stroke_color: 3019898879
       }
-      priority: 15689
+      priority: 15694
     }
   }
 }
@@ -46428,7 +52076,7 @@ cont {
     scale: 12
     caption {
       primary {
-        height: 9
+        height: 10
         color: 8355711
       }
       priority: 15000
@@ -46438,7 +52086,7 @@ cont {
     scale: 13
     caption {
       primary {
-        height: 9
+        height: 10
         color: 8355711
       }
       priority: 15000
@@ -46448,7 +52096,7 @@ cont {
     scale: 14
     caption {
       primary {
-        height: 9
+        height: 10
         color: 8355711
       }
       priority: 15000
@@ -46458,7 +52106,7 @@ cont {
     scale: 15
     caption {
       primary {
-        height: 9
+        height: 10
         color: 8355711
       }
       priority: 15000
@@ -46468,7 +52116,7 @@ cont {
     scale: 16
     caption {
       primary {
-        height: 9
+        height: 10
         color: 8355711
       }
       priority: 15000
@@ -46478,7 +52126,7 @@ cont {
     scale: 17
     caption {
       primary {
-        height: 9
+        height: 10
         color: 8355711
       }
       priority: 15000
@@ -46488,7 +52136,7 @@ cont {
     scale: 18
     caption {
       primary {
-        height: 9
+        height: 10
         color: 8355711
       }
       priority: 15000
@@ -46498,7 +52146,7 @@ cont {
     scale: 19
     caption {
       primary {
-        height: 9
+        height: 10
         color: 8355711
       }
       priority: 15000
@@ -46506,79 +52154,6 @@ cont {
   }
 }
 cont {
-  name: "place-islet"
-  element {
-    scale: 10
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 14934482
-      priority: -16700
-    }
-  }
-}
-cont {
   name: "place-isolated_dwelling"
   element {
     scale: 14
@@ -46905,190 +52480,190 @@ cont {
     scale: 1
     caption {
       primary {
-        height: 14
+        height: 15
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 2
     caption {
       primary {
-        height: 14
+        height: 15
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 3
     caption {
       primary {
-        height: 15
+        height: 16
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 4
     caption {
       primary {
-        height: 16
+        height: 17
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 5
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 6
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 7
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 8
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 9
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 10
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 11
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 18
+        height: 19
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
 }
@@ -47121,160 +52696,160 @@ cont {
     scale: 4
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 5
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 6
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 7
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 8
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 9
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 10
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 11
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4495803
       }
-      priority: 15918
+      priority: 15902
     }
   }
 }
@@ -47303,7 +52878,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47319,7 +52894,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47335,7 +52910,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47351,7 +52926,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
 }
@@ -47390,7 +52965,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47406,7 +52981,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47422,7 +52997,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47438,7 +53013,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
 }
@@ -47508,15 +53083,15 @@ cont {
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
       secondary {
         height: 9
-        color: 6710886
+        color: 5855577
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
     apply_if: "population>=40000"
   }
@@ -47525,15 +53100,15 @@ cont {
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
       secondary {
         height: 9
-        color: 6710886
+        color: 5855577
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
     apply_if: "population>=40000"
   }
@@ -47542,15 +53117,15 @@ cont {
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
       secondary {
         height: 9
-        color: 6710886
+        color: 5855577
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
     apply_if: "population>=20000"
   }
@@ -47559,15 +53134,15 @@ cont {
     caption {
       primary {
         height: 10
-        color: 6710886
+        color: 5855577
       }
       secondary {
         height: 9
-        color: 6710886
+        color: 5855577
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
     apply_if: "population>=20000"
   }
@@ -47576,17 +53151,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 1308622847
+        color: 5855577
+        stroke_color: 14934482
       }
       secondary {
         height: 9
-        color: 6710886
-        stroke_color: 1308622847
+        color: 5855577
+        stroke_color: 14934482
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47595,16 +53170,16 @@ cont {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2163076059
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47613,16 +53188,16 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 16777215
+        stroke_color: 2163076059
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47631,16 +53206,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47649,16 +53224,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47667,16 +53242,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47685,16 +53260,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47703,16 +53278,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47721,16 +53296,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47739,16 +53314,16 @@ cont {
       primary {
         height: 14
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
 }
@@ -47759,10 +53334,10 @@ cont {
     caption {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 1308622847
+        color: 5855577
+        stroke_color: 14540236
       }
-      priority: 15729
+      priority: 15736
     }
   }
   element {
@@ -47770,281 +53345,143 @@ cont {
     caption {
       primary {
         height: 11
-        color: 6710886
-        stroke_color: 1308622847
+        color: 5855577
+        stroke_color: 14540236
       }
       secondary {
         height: 9
-        color: 6710886
-        stroke_color: 1308622847
+        color: 5855577
+        stroke_color: 14540236
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 12
+        height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
       }
       secondary {
-        height: 10
+        height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
-    }
-  }
-}
-cont {
-  name: "power-line"
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1810
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "power-line-underground"
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1810
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "power-station"
-  element {
-    scale: 18
-    symbol {
-      name: "power-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "power-tower"
-  element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-}
-cont {
-  name: "public_transport-platform"
-  element {
-    scale: 16
-    area {
-      color: 14934482
-      priority: -15838
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 14934482
-      priority: -15838
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 14934482
-      priority: -15838
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 14934482
-      priority: -15838
+      priority: 15708
     }
   }
 }
@@ -48059,7 +53496,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48073,7 +53510,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48087,7 +53524,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48101,7 +53538,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48118,7 +53555,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48132,7 +53569,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48146,7 +53583,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48160,7 +53597,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48177,7 +53614,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48191,7 +53628,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48205,7 +53642,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48219,7 +53656,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48236,7 +53673,7 @@ cont {
         dd: 1.8
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48250,40 +53687,13 @@ cont {
         dd: 1.8
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "railway-crossing"
-  element {
-    scale: 17
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-}
-cont {
   name: "railway-disused"
   element {
     scale: 18
@@ -48294,7 +53704,7 @@ cont {
         dd: 1.8
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48308,7 +53718,7 @@ cont {
         dd: 1.8
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48321,7 +53731,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48331,7 +53741,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48341,7 +53751,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48351,7 +53761,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48361,7 +53771,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48371,7 +53781,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48381,7 +53791,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48394,7 +53804,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48404,7 +53814,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48414,7 +53824,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48424,7 +53834,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48434,7 +53844,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48444,7 +53854,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48454,7 +53864,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48467,7 +53877,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48477,7 +53887,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48487,7 +53897,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48497,7 +53907,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48507,7 +53917,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48517,7 +53927,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48527,7 +53937,7 @@ cont {
     lines {
       width: 3.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48536,75 +53946,27 @@ cont {
 cont {
   name: "railway-halt"
   element {
-    scale: 12
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 8
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "train-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -48612,47 +53974,47 @@ cont {
     symbol {
       name: "train-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 16
     symbol {
-      name: "train-m"
+      name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -48660,23 +54022,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -48684,23 +54046,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -48708,23 +54070,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -48869,14 +54231,14 @@ cont {
     lines {
       width: 2.4
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48893,14 +54255,14 @@ cont {
     lines {
       width: 2.8
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.4
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48917,14 +54279,14 @@ cont {
     lines {
       width: 3.0
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48952,14 +54314,14 @@ cont {
     lines {
       width: 6.4
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48987,14 +54349,14 @@ cont {
     lines {
       width: 6.4
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49022,14 +54384,14 @@ cont {
     lines {
       width: 6.4
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49236,7 +54598,7 @@ cont {
     lines {
       width: 1.0
       color: 11710882
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49246,7 +54608,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49256,7 +54618,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49266,7 +54628,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49276,7 +54638,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49286,7 +54648,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49299,7 +54661,7 @@ cont {
     lines {
       width: 1.0
       color: 11710882
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49309,7 +54671,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49319,7 +54681,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49329,7 +54691,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49339,7 +54701,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49349,7 +54711,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49362,7 +54724,7 @@ cont {
     lines {
       width: 1.0
       color: 11710882
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49372,7 +54734,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49382,7 +54744,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49392,7 +54754,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49402,7 +54764,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49412,7 +54774,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49425,7 +54787,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49435,7 +54797,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49445,7 +54807,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49455,7 +54817,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49465,7 +54827,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49478,7 +54840,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49488,7 +54850,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49498,7 +54860,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49508,7 +54870,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49518,7 +54880,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49531,7 +54893,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49541,7 +54903,7 @@ cont {
     lines {
       width: 1.2
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49551,7 +54913,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49561,7 +54923,7 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49571,44 +54933,13 @@ cont {
     lines {
       width: 2.0
       color: 9868678
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "railway-platform"
-  element {
-    scale: 16
-    area {
-      color: 14934482
-      priority: -15838
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 14934482
-      priority: -15838
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 14934482
-      priority: -15838
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 14934482
-      priority: -15838
-    }
-  }
-}
-cont {
   name: "railway-preserved"
   element {
     scale: 16
@@ -49619,7 +54950,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49633,7 +54964,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49647,7 +54978,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49661,7 +54992,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49678,7 +55009,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49692,7 +55023,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49706,7 +55037,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49720,7 +55051,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49737,7 +55068,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49751,7 +55082,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49765,7 +55096,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49779,7 +55110,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49966,14 +55297,14 @@ cont {
     lines {
       width: 2.4
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49990,14 +55321,14 @@ cont {
     lines {
       width: 2.8
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.4
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50014,14 +55345,14 @@ cont {
     lines {
       width: 3.0
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50049,14 +55380,14 @@ cont {
     lines {
       width: 6.4
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50084,14 +55415,14 @@ cont {
     lines {
       width: 6.4
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50119,14 +55450,14 @@ cont {
     lines {
       width: 6.4
       color: 14934482
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 8421504
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50486,51 +55817,27 @@ cont {
 cont {
   name: "railway-station"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "train-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50538,47 +55845,47 @@ cont {
     symbol {
       name: "train-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 16
     symbol {
-      name: "train-m"
+      name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50586,23 +55893,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50610,23 +55917,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50634,74 +55941,50 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
 cont {
   name: "railway-station-light_rail"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "train-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50709,47 +55992,47 @@ cont {
     symbol {
       name: "train-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 16
     symbol {
-      name: "train-m"
+      name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50757,23 +56040,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50781,23 +56064,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50805,74 +56088,50 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
 cont {
   name: "railway-station-monorail"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "train-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50880,47 +56139,47 @@ cont {
     symbol {
       name: "train-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 16
     symbol {
-      name: "train-m"
+      name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50928,23 +56187,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50952,23 +56211,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50976,74 +56235,50 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
 cont {
   name: "railway-station-subway"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51051,23 +56286,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51075,23 +56310,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51099,23 +56334,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51123,23 +56358,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51147,74 +56382,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-barcelona"
   element {
-    scale: 13
-    symbol {
-      name: "subway-barcelona-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-barcelona-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51222,170 +56433,146 @@ cont {
     symbol {
       name: "subway-barcelona-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-barcelona-m"
+      name: "subway-barcelona-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-barcelona-m"
+      name: "subway-barcelona-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-barcelona-m"
+      name: "subway-barcelona-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-barcelona-m"
+      name: "subway-barcelona-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-berlin"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-berlin-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51393,170 +56580,146 @@ cont {
     symbol {
       name: "subway-berlin-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-berlin-m"
+      name: "subway-berlin-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-berlin-m"
+      name: "subway-berlin-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-berlin-m"
+      name: "subway-berlin-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-berlin-m"
+      name: "subway-berlin-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-blue"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51564,23 +56727,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51588,23 +56751,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51612,23 +56775,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51636,23 +56799,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51660,74 +56823,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-brown"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51735,23 +56874,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51759,23 +56898,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51783,23 +56922,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51807,23 +56946,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51831,74 +56970,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-darkgreen"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51906,23 +57021,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51930,23 +57045,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51954,23 +57069,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51978,23 +57093,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52002,74 +57117,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-gray"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52077,23 +57168,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52101,23 +57192,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52125,23 +57216,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52149,23 +57240,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52173,74 +57264,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-green"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52248,23 +57315,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52272,23 +57339,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52296,23 +57363,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52320,23 +57387,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52344,74 +57411,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-grey"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52419,23 +57462,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52443,23 +57486,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52467,23 +57510,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52491,23 +57534,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52515,23 +57558,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -52548,16 +57591,9 @@ cont {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
       priority: 15027
     }
   }
@@ -52566,23 +57602,23 @@ cont {
     symbol {
       name: "subway-kiev-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52590,23 +57626,23 @@ cont {
     symbol {
       name: "subway-kiev-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52614,7 +57650,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -52628,7 +57664,7 @@ cont {
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52636,7 +57672,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -52650,7 +57686,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52658,7 +57694,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -52672,7 +57708,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52680,7 +57716,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -52694,58 +57730,34 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-lightblue"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52753,23 +57765,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52777,23 +57789,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52801,23 +57813,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52825,23 +57837,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52849,74 +57861,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-lightgreen"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52924,23 +57912,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52948,23 +57936,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52972,23 +57960,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52996,23 +57984,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53020,74 +58008,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-london"
   element {
-    scale: 13
-    symbol {
-      name: "subway-london-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-london-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53095,170 +58059,146 @@ cont {
     symbol {
       name: "subway-london-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-london-m"
+      name: "subway-london-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-london-m"
+      name: "subway-london-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-london-m"
+      name: "subway-london-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-london-m"
+      name: "subway-london-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-madrid"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-madrid-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53266,119 +58206,119 @@ cont {
     symbol {
       name: "subway-madrid-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-madrid-m"
+      name: "subway-madrid-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-madrid-m"
+      name: "subway-madrid-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-madrid-m"
+      name: "subway-madrid-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-madrid-m"
+      name: "subway-madrid-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -53389,71 +58329,64 @@ cont {
     symbol {
       name: "subway-minsk-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 4
       }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 14
     symbol {
-      name: "subway-minsk-s"
+      name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 5
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 15
     symbol {
-      name: "subway-minsk-m"
+      name: "subway-minsk-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 5
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53461,7 +58394,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53475,7 +58408,7 @@ cont {
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53483,7 +58416,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53497,7 +58430,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53505,7 +58438,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53519,7 +58452,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53527,7 +58460,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53541,7 +58474,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -53552,7 +58485,7 @@ cont {
     symbol {
       name: "subway-moscow-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
   }
   element {
@@ -53560,23 +58493,23 @@ cont {
     symbol {
       name: "subway-moscow-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 5
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53584,47 +58517,47 @@ cont {
     symbol {
       name: "subway-moscow-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 5
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 14
     symbol {
-      name: "subway-moscow-s"
+      name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 3355443
         stroke_color: 16777215
         offset_y: 8
       }
       secondary {
-        height: 9
+        height: 10
         color: 3355443
         stroke_color: 16777215
         offset_y: 24
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53632,7 +58565,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53648,7 +58581,7 @@ cont {
         offset_y: 24
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53656,7 +58589,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53670,7 +58603,7 @@ cont {
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53678,7 +58611,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53692,7 +58625,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53700,7 +58633,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53714,7 +58647,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53722,7 +58655,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53736,58 +58669,34 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-newyork"
   element {
-    scale: 13
-    symbol {
-      name: "subway-newyork-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-newyork-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53795,23 +58704,23 @@ cont {
     symbol {
       name: "subway-newyork-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53819,23 +58728,23 @@ cont {
     symbol {
       name: "subway-newyork-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53843,23 +58752,23 @@ cont {
     symbol {
       name: "subway-newyork-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53867,23 +58776,23 @@ cont {
     symbol {
       name: "subway-newyork-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53891,74 +58800,50 @@ cont {
     symbol {
       name: "subway-newyork-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-orange"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53966,23 +58851,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53990,23 +58875,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54014,23 +58899,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54038,23 +58923,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54062,23 +58947,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -54089,23 +58974,7 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
+      priority: 16000
     }
   }
   element {
@@ -54113,23 +58982,23 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54137,170 +59006,146 @@ cont {
     symbol {
       name: "subway-paris-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-paris-m"
+      name: "subway-paris-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-paris-m"
+      name: "subway-paris-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-paris-m"
+      name: "subway-paris-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-paris-m"
+      name: "subway-paris-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-purple"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54308,23 +59153,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54332,23 +59177,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54356,23 +59201,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54380,23 +59225,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54404,74 +59249,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-red"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54479,23 +59300,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54503,23 +59324,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54527,23 +59348,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54551,23 +59372,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54575,74 +59396,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-roma"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-rome-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54650,23 +59447,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54674,23 +59471,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54698,7 +59495,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54712,7 +59509,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54720,7 +59517,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54734,7 +59531,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54742,7 +59539,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54756,7 +59553,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -54767,7 +59564,7 @@ cont {
     symbol {
       name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
   }
   element {
@@ -54775,23 +59572,23 @@ cont {
     symbol {
       name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2164260863
         offset_y: 5
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54799,23 +59596,23 @@ cont {
     symbol {
       name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 1728053247
+        stroke_color: 2164260863
         offset_y: 5
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54823,47 +59620,47 @@ cont {
     symbol {
       name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 1308622847
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 15
     symbol {
-      name: "subway-spb-m"
+      name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
-        offset_y: 7
+        stroke_color: 2164260863
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54871,7 +59668,7 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54885,7 +59682,7 @@ cont {
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54893,7 +59690,7 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54907,7 +59704,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54915,7 +59712,7 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54929,7 +59726,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54937,7 +59734,7 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54951,58 +59748,34 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-violet"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55010,23 +59783,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55034,23 +59807,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55058,23 +59831,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55082,23 +59855,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55106,74 +59879,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-yellow"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 9
         color: 3355443
-        stroke_color: 1308622847
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55181,23 +59930,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55205,23 +59954,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55229,23 +59978,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55253,23 +60002,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55277,23 +60026,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -55302,73 +60051,73 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "subway-entrance-m"
+      name: "subway-entrance-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-entrance-m"
+      name: "subway-entrance-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-entrance-m"
+      name: "subway-entrance-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55379,23 +60128,23 @@ cont {
     symbol {
       name: "subway-barcelona-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55403,23 +60152,23 @@ cont {
     symbol {
       name: "subway-barcelona-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55427,23 +60176,23 @@ cont {
     symbol {
       name: "subway-barcelona-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55454,23 +60203,23 @@ cont {
     symbol {
       name: "subway-berlin-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55478,23 +60227,23 @@ cont {
     symbol {
       name: "subway-berlin-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55502,23 +60251,23 @@ cont {
     symbol {
       name: "subway-berlin-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55535,7 +60284,7 @@ cont {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 6
       }
       priority: 15027
@@ -55552,13 +60301,13 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
@@ -55576,13 +60325,13 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
@@ -55600,13 +60349,13 @@ cont {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
@@ -55621,23 +60370,23 @@ cont {
     symbol {
       name: "subway-london-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55645,23 +60394,23 @@ cont {
     symbol {
       name: "subway-london-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55669,23 +60418,23 @@ cont {
     symbol {
       name: "subway-london-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55696,23 +60445,23 @@ cont {
     symbol {
       name: "subway-madrid-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55720,23 +60469,23 @@ cont {
     symbol {
       name: "subway-madrid-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55744,23 +60493,23 @@ cont {
     symbol {
       name: "subway-madrid-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55771,16 +60520,16 @@ cont {
     symbol {
       name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 6
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55788,23 +60537,23 @@ cont {
     symbol {
       name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55812,23 +60561,23 @@ cont {
     symbol {
       name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55836,23 +60585,23 @@ cont {
     symbol {
       name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 6
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55863,7 +60612,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
@@ -55879,7 +60628,7 @@ cont {
         offset_y: 25
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55887,7 +60636,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
@@ -55903,7 +60652,7 @@ cont {
         offset_y: 25
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55911,7 +60660,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
@@ -55927,7 +60676,7 @@ cont {
         offset_y: 25
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55935,7 +60684,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
@@ -55951,7 +60700,7 @@ cont {
         offset_y: 25
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55962,23 +60711,23 @@ cont {
     symbol {
       name: "subway-newyork-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55986,23 +60735,23 @@ cont {
     symbol {
       name: "subway-newyork-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56010,23 +60759,23 @@ cont {
     symbol {
       name: "subway-newyork-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -56037,23 +60786,23 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56061,23 +60810,23 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56085,23 +60834,23 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -56112,23 +60861,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56136,23 +60885,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56160,23 +60909,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -56187,95 +60936,95 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 20
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-spb-l"
+      name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 11
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-spb-l"
+      name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-spb-l"
+      name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 12
         color: 3355443
-        stroke_color: 872415231
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -56286,7 +61035,7 @@ cont {
     lines {
       width: 0.7
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56296,7 +61045,7 @@ cont {
     lines {
       width: 0.8
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56306,7 +61055,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56316,7 +61065,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56326,7 +61075,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56339,7 +61088,7 @@ cont {
     lines {
       width: 0.7
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56349,7 +61098,7 @@ cont {
     lines {
       width: 0.8
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56359,7 +61108,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56369,7 +61118,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56379,7 +61128,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56392,7 +61141,7 @@ cont {
     lines {
       width: 0.7
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56402,7 +61151,7 @@ cont {
     lines {
       width: 0.8
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56412,7 +61161,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56422,7 +61171,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56432,7 +61181,7 @@ cont {
     lines {
       width: 1.0
       color: 5592405
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56444,644 +61193,83 @@ cont {
     scale: 15
     symbol {
       name: "tram-m"
-      priority: 16891
+      priority: 16875
     }
   }
   element {
     scale: 16
     symbol {
       name: "tram-m"
-      priority: 16891
+      priority: 16875
     }
   }
   element {
     scale: 17
     symbol {
       name: "tram-l"
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 18
     symbol {
       name: "tram-l"
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 19
     symbol {
       name: "tram-l"
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
       }
       secondary {
         height: 10
         color: 3355443
-        stroke_color: 452984831
+        stroke_color: 2164260863
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
-    }
-  }
-}
-cont {
-  name: "railway-yard"
-  element {
-    scale: 11
-    lines {
-      width: 0.6
-      color: 11710882
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.6
-      color: 11710882
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.8
-      color: 11710882
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 1.3
-      color: 15658734
-      dashdot {
-        dd: 4.5
-        dd: 4.5
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "railway-yard-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.6
-      color: 11710882
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.6
-      color: 11710882
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.8
-      color: 11710882
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.4
-      color: 14934482
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.0
-      color: 8421504
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.8
-      color: 14934482
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.4
-      color: 8421504
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 3.0
-      color: 14934482
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.6
-      color: 8421504
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.3
-      color: 15658734
-      dashdot {
-        dd: 4.5
-        dd: 4.5
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 6.4
-      color: 14934482
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 8421504
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 6.4
-      color: 14934482
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 8421504
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 6.4
-      color: 14934482
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 8421504
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "railway-yard-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.6
-      color: 11710882
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.6
-      color: 11710882
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.8
-      color: 11710882
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 5592405
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.2
-      color: 5592405
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.2
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 4.6
-      color: 5592405
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.6
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 1.3
-      color: 15658734
-      dashdot {
-        dd: 4.5
-        dd: 4.5
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 5.0
-      color: 5592405
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 5.0
-      color: 5592405
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 5.0
-      color: 5592405
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.0
-      color: 9868678
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 15658734
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15875
     }
   }
 }
@@ -57096,7 +61284,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57105,7 +61293,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57117,7 +61305,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57126,7 +61314,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57138,7 +61326,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57147,7 +61335,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57159,7 +61347,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57168,7 +61356,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57180,7 +61368,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57189,7 +61377,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57201,7 +61389,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57210,7 +61398,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57222,7 +61410,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57231,7 +61419,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57243,7 +61431,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57252,7 +61440,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57264,7 +61452,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57273,7 +61461,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57285,7 +61473,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57294,7 +61482,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
 }
@@ -57309,7 +61497,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57318,7 +61506,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57330,7 +61518,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57339,7 +61527,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57351,7 +61539,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57360,7 +61548,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57372,7 +61560,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57381,7 +61569,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57393,7 +61581,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57402,7 +61590,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57414,7 +61602,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57423,7 +61611,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57435,7 +61623,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57444,7 +61632,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57456,7 +61644,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57465,7 +61653,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57477,7 +61665,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57486,7 +61674,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57498,7 +61686,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57507,7 +61695,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
 }
@@ -57522,7 +61710,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57531,7 +61719,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57543,7 +61731,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57552,7 +61740,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57564,7 +61752,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57573,7 +61761,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57585,7 +61773,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57594,7 +61782,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57606,7 +61794,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57615,7 +61803,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57627,7 +61815,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57636,7 +61824,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57648,7 +61836,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57657,7 +61845,7 @@ cont {
         height: 9
         color: 4495803
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57669,7 +61857,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57678,7 +61866,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57690,7 +61878,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57699,7 +61887,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57711,7 +61899,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57720,7 +61908,7 @@ cont {
         height: 10
         color: 4495803
       }
-      priority: 16270
+      priority: 16263
     }
   }
 }
@@ -57730,290 +61918,1091 @@ cont {
     scale: 19
     symbol {
       name: "shop-m"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "shop-alcohol"
   element {
+    scale: 12
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "alcohol-l"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "alcohol-l"
-      priority: 16837
+      name: "shop-m"
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15833
     }
   }
 }
 cont {
   name: "shop-bakery"
   element {
+    scale: 12
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bakery-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "bakery-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-beauty"
   element {
+    scale: 12
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "beauty-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "beauty-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-beverages"
   element {
+    scale: 12
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "alcohol-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "alcohol-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-bicycle"
   element {
+    scale: 12
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "shop-bicycle-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "shop-bicycle-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-books"
   element {
+    scale: 12
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "book-shop-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "book-shop-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-butcher"
   element {
+    scale: 12
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "butcher-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "butcher-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-car"
   element {
+    scale: 12
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-car_repair"
   element {
+    scale: 12
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "car-repair-l"
-      priority: 16851
+      priority: 16819
     }
     caption {
       primary {
@@ -58021,613 +63010,2142 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "car-repair-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "car-repair-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-chemist"
   element {
+    scale: 12
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "chemist-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "chemist-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-clothes"
   element {
+    scale: 12
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "clothes-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "clothes-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-computer"
   element {
+    scale: 12
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "computer-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "computer-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-confectionery"
   element {
+    scale: 12
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "sweets-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "sweets-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-convenience"
   element {
+    scale: 12
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "convenience-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "convenience-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-department_store"
   element {
+    scale: 12
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "department_store-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "department_store-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-doityourself"
   element {
+    scale: 12
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "doityourself-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "doityourself-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-electronics"
   element {
+    scale: 12
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "electronics-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "electronics-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-florist"
   element {
+    scale: 12
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "florist-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "florist-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-furniture"
   element {
+    scale: 12
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "furniture-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "furniture-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-garden_centre"
   element {
+    scale: 12
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "garden_center-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "garden_center-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-gift"
   element {
+    scale: 12
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "gift-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "gift-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-greengrocer"
   element {
+    scale: 12
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "greengrocer-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "greengrocer-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-hairdresser"
   element {
+    scale: 12
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "hairdresser-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "hairdresser-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-hardware"
   element {
+    scale: 12
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "hardware-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "hardware-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-jewelry"
   element {
+    scale: 12
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "jewelry-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "jewelry-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-kiosk"
   element {
+    scale: 12
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "kiosk-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "kiosk-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-laundry"
   element {
-    scale: 17
+    scale: 12
     symbol {
       name: "laundry-l"
-      apply_for_type: 1
       priority: 16972
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -58635,14 +65153,14 @@ cont {
     }
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
       name: "laundry-l"
       priority: 16972
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -58650,29 +65168,168 @@ cont {
     }
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
       name: "laundry-l"
       priority: 16972
     }
     caption {
       primary {
-        height: 11
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15972
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "laundry-l"
+      priority: 16972
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15972
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "laundry-l"
+      priority: 16972
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15972
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "laundry-l"
+      priority: 16972
+    }
+    caption {
+      primary {
+        height: 10
         color: 4473924
         offset_y: 10
       }
       priority: 15972
     }
   }
+  element {
+    scale: 18
+    symbol {
+      name: "laundry-l"
+      priority: 16972
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15972
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
 }
 cont {
   name: "shop-mall"
   element {
+    scale: 12
+    symbol {
+      name: "shop-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "shop-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shop-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shop-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shop-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -58680,7 +65337,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -58688,7 +65345,7 @@ cont {
     symbol {
       name: "shop-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -58696,7 +65353,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -58704,7 +65361,7 @@ cont {
     symbol {
       name: "shop-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -58712,14 +65369,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
-      name: "shop-l"
-      priority: 16864
+      name: "shop-m"
+      priority: 16833
     }
     caption {
       primary {
@@ -58727,150 +65384,590 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
   }
 }
 cont {
   name: "shop-mobile_phone"
   element {
+    scale: 12
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "mobile_phone-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "mobile_phone-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-optician"
   element {
+    scale: 12
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "optician-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "optician-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-shoes"
   element {
+    scale: 12
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "shoes-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "shoes-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-sports"
   element {
+    scale: 12
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "sports-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "sports-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-supermarket"
   element {
+    scale: 12
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "grocery-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -58878,7 +65975,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -58886,7 +65983,7 @@ cont {
     symbol {
       name: "grocery-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -58894,14 +65991,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
-      name: "grocery-l"
-      priority: 16851
+      name: "shop-m"
+      priority: 16833
     }
     caption {
       primary {
@@ -58909,59 +66006,245 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "shop-toys"
   element {
+    scale: 12
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "toys-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "toys-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-american_football"
   element {
+    scale: 12
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "america-football-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -58969,67 +66252,253 @@ cont {
     symbol {
       name: "america-football-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-archery"
   element {
+    scale: 12
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "archery-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "archery-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-athletics"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59037,67 +66506,253 @@ cont {
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-australian_football"
   element {
+    scale: 12
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "australian-football-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "australian-football-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-baseball"
   element {
+    scale: 12
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "baseball-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59105,34 +66760,130 @@ cont {
     symbol {
       name: "baseball-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-basketball"
   element {
+    scale: 12
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "basketball-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59140,190 +66891,469 @@ cont {
     symbol {
       name: "basketball-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-bowls"
   element {
+    scale: 12
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bowls-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "bowls-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-cricket"
   element {
+    scale: 12
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "cricket-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "cricket-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-curling"
   element {
+    scale: 12
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "curling-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "curling-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-diving"
   element {
-    scale: 18
+    scale: 12
     symbol {
       name: "diving-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 13
     symbol {
       name: "diving-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
-}
-cont {
-  name: "sport-equestrian"
   element {
-    scale: 18
+    scale: 14
     symbol {
-      name: "equestrian-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 15
     symbol {
-      name: "equestrian-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "sport-football"
   element {
     scale: 17
     symbol {
-      name: "soccer-l"
-      priority: 16067
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -59331,14 +67361,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
-      name: "soccer-l"
-      priority: 16067
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -59346,14 +67376,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "soccer-l"
-      priority: 16067
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -59361,26 +67391,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-golf"
   element {
+    scale: 12
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "golf-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59388,65 +67514,74 @@ cont {
     symbol {
       name: "golf-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-gymnastics"
   element {
-    scale: 18
+    scale: 12
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
-    scale: 19
+    scale: 13
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
-}
-cont {
-  name: "sport-multi"
   element {
-    scale: 17
-    area {
-      color: 13749671
-      priority: -15933
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
+  }
+  element {
+    scale: 15
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59454,19 +67589,31 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
-    scale: 18
-    area {
-      color: 13749671
-      priority: -15933
+    scale: 16
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
+  }
+  element {
+    scale: 17
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59474,19 +67621,31 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
-    scale: 19
-    area {
-      color: 13749671
-      priority: -15933
+    scale: 18
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
+  }
+  element {
+    scale: 19
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59494,88 +67653,209 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-scuba_diving"
   element {
-    scale: 18
+    scale: 12
     symbol {
       name: "diving-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 13
     symbol {
       name: "diving-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "sport-shooting"
   element {
     scale: 18
     symbol {
-      name: "archery-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "archery-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-soccer"
   element {
+    scale: 12
+    symbol {
+      name: "soccer-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "soccer-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "soccer-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "soccer-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 16
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
-      name: "soccer-m"
+      name: "soccer-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59583,18 +67863,18 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "soccer-l"
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59602,18 +67882,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "soccer-l"
-      priority: 16067
+      apply_for_type: 1
+      priority: 16833
     }
     caption {
       primary {
@@ -59621,18 +67902,19 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 13749671
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "soccer-l"
-      priority: 16067
+      apply_for_type: 1
+      priority: 16833
     }
     caption {
       primary {
@@ -59640,26 +67922,122 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-swimming"
   element {
+    scale: 12
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "swimming-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59667,26 +68045,106 @@ cont {
     symbol {
       name: "swimming-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-tennis"
   element {
+    scale: 12
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -59694,7 +68152,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59702,7 +68160,7 @@ cont {
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -59710,7 +68168,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59718,7 +68176,7 @@ cont {
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -59726,51 +68184,269 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-alpine_hut"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "alpine_hut-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "alpine_hut-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-artwork"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59778,7 +68454,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -59786,7 +68462,8 @@ cont {
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59794,7 +68471,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -59802,7 +68479,8 @@ cont {
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59810,18 +68488,87 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-attraction"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 15
     symbol {
-      name: "tourism-m"
+      name: "tourism-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59829,14 +68576,16 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15847
     }
   }
   element {
     scale: 16
     symbol {
-      name: "tourism-m"
-      priority: 16864
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59844,14 +68593,16 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "tourism-l"
-      priority: 16864
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59859,14 +68610,16 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "tourism-l"
-      priority: 16864
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59874,14 +68627,16 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "tourism-l"
-      priority: 16864
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59889,39 +68644,115 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-camp_site"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 15
     symbol {
-      name: "campsite-m"
-      priority: 16878
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
     }
   }
   element {
     scale: 16
     symbol {
-      name: "campsite-m"
-      priority: 16878
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "campsite-l"
-      priority: 16878
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59929,114 +68760,449 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "campsite-l"
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "campsite-l"
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-caravan_site"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "caravan_site-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "caravan_site-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-guest_house"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "motel-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "motel-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-hostel"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60044,7 +69210,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -60052,7 +69218,8 @@ cont {
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60060,7 +69227,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -60068,7 +69235,8 @@ cont {
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60076,18 +69244,121 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-hotel"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60095,7 +69366,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -60103,7 +69374,8 @@ cont {
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60111,7 +69383,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -60119,7 +69391,8 @@ cont {
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60127,18 +69400,121 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-information"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60146,7 +69522,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60154,7 +69530,8 @@ cont {
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60162,7 +69539,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60170,7 +69547,8 @@ cont {
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60178,18 +69556,121 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-information-guidepost"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60197,7 +69678,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60205,7 +69686,8 @@ cont {
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60213,7 +69695,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60221,7 +69703,8 @@ cont {
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60229,18 +69712,99 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-information-office"
   element {
-    scale: 17
+    scale: 11
     symbol {
-      name: "information-l"
+      name: "museum-m"
       apply_for_type: 1
-      priority: 16851
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60248,80 +69812,246 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-motel"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "motel-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "motel-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-museum"
   element {
-    scale: 15
+    scale: 11
     symbol {
       name: "museum-m"
-      priority: 16878
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "museum-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "museum-l"
+      priority: 16861
       min_distance: 1
     }
     caption {
@@ -60330,29 +70060,63 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "museum-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "museum-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "museum-m"
-      priority: 16878
+      name: "museum-l"
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60360,47 +70124,147 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "tourism-picnic_site"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "picnic-l"
-      priority: 16851
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
@@ -60408,48 +70272,153 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "picnic-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "picnic-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-viewpoint"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60457,7 +70426,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60465,7 +70434,8 @@ cont {
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60473,7 +70443,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60481,7 +70451,8 @@ cont {
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60489,17 +70460,83 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-zoo"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 15
     symbol {
-      name: "zoo-m"
-      priority: 16878
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60507,29 +70544,31 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "zoo-m"
-      priority: 16878
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
         height: 10
         color: 4473924
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "zoo-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60537,14 +70576,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "zoo-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60552,14 +70592,15 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "zoo-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60567,7 +70608,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -60576,52 +70617,52 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60629,16 +70670,16 @@ cont {
     lines {
       width: 1.5
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60646,7 +70687,7 @@ cont {
     lines {
       width: 1.5
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60655,7 +70696,7 @@ cont {
         height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60663,7 +70704,7 @@ cont {
     lines {
       width: 1.5
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60672,7 +70713,7 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60680,7 +70721,7 @@ cont {
     lines {
       width: 1.5
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60689,7 +70730,7 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -60698,52 +70739,52 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60751,16 +70792,16 @@ cont {
     lines {
       width: 1.5
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60768,7 +70809,7 @@ cont {
     lines {
       width: 1.5
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60777,7 +70818,7 @@ cont {
         height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60785,7 +70826,7 @@ cont {
     lines {
       width: 1.5
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60794,7 +70835,7 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60802,7 +70843,7 @@ cont {
     lines {
       width: 1.5
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60811,7 +70852,7 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -60822,7 +70863,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60831,7 +70872,7 @@ cont {
         height: 10
         color: 4473924
       }
-      priority: 16662
+      priority: 16666
     }
   }
   element {
@@ -60839,7 +70880,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60848,7 +70889,7 @@ cont {
         height: 10
         color: 4473924
       }
-      priority: 16662
+      priority: 16666
     }
   }
   element {
@@ -60856,7 +70897,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60865,7 +70906,7 @@ cont {
         height: 10
         color: 4473924
       }
-      priority: 16662
+      priority: 16666
     }
   }
   element {
@@ -60873,7 +70914,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60882,7 +70923,7 @@ cont {
         height: 10
         color: 4473924
       }
-      priority: 16662
+      priority: 16666
     }
   }
   element {
@@ -60890,7 +70931,7 @@ cont {
     lines {
       width: 1.0
       color: 8421504
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60899,7 +70940,7 @@ cont {
         height: 10
         color: 4473924
       }
-      priority: 16662
+      priority: 16666
     }
   }
 }
@@ -60914,7 +70955,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60928,7 +70969,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60942,7 +70983,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60959,7 +71000,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60973,7 +71014,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60987,7 +71028,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60999,308 +71040,140 @@ cont {
     scale: 0
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 11
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 12
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 13
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 14
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 15
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 16
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 17
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 18
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 19
     area {
       color: 9163744
-      priority: -15771
-    }
-  }
-}
-cont {
-  name: "waterway-drain"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "waterway-drain-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 3584191
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "waterway-lock"
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 3584191
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "waterway-lock_gate"
-  element {
-    scale: 16
-    symbol {
-      name: "dot-m"
-      apply_for_type: 1
-      priority: 16243
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      apply_for_type: 1
-      priority: 16243
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dot-m"
-      apply_for_type: 1
-      priority: 16243
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dot-m"
-      apply_for_type: 1
-      priority: 16243
+      priority: -15778
     }
   }
 }
@@ -61309,204 +71182,204 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.6
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15784
+      priority: -15792
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.2
+      width: 0.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.2
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 1.2
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 15
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 16
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
 }
@@ -61515,204 +71388,204 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.6
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15784
+      priority: -15792
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.2
+      width: 0.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.2
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 1.2
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 15
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 16
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
 }
@@ -61722,273 +71595,273 @@ cont {
     scale: 0
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 9163744
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.6
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15784
+      priority: -15792
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.2
+      width: 0.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.2
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 1.2
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 15
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 16
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.2
+      width: 1.8
       color: 3584191
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 9163744
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16208
     }
   }
 }
@@ -61997,77 +71870,77 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62076,15 +71949,15 @@ cont {
         height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62093,15 +71966,15 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62110,7 +71983,7 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -62119,77 +71992,77 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62198,15 +72071,15 @@ cont {
         height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62215,15 +72088,15 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62232,7 +72105,7 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -62241,94 +72114,94 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 3584191
       dashdot {
         dd: 2.7
         dd: 2.7
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 3584191
       dashdot {
         dd: 2.7
         dd: 2.7
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.0
       color: 3584191
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.4
+      width: 1.0
       color: 3584191
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.4
+      width: 1.0
       color: 3584191
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62337,18 +72210,18 @@ cont {
         height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 3584191
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62357,18 +72230,18 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 3584191
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62377,7 +72250,7 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -62386,77 +72259,77 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62465,15 +72338,15 @@ cont {
         height: 11
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62482,15 +72355,15 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.6
+      width: 1.0
       color: 3584191
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62499,183 +72372,7 @@ cont {
         height: 12
         color: 4495803
       }
-      priority: 16959
-    }
-  }
-}
-cont {
-  name: "waterway-waterfall"
-  element {
-    scale: 12
-    symbol {
-      name: "waterfall-s"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "waterfall-s"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "waterfall-s"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "waterfall-m"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "waterfall-m"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "waterfall-l"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "waterfall-l"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "waterfall-l"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-}
-cont {
-  name: "waterway-weir"
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 8421504
-      priority: 1243
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 8421504
-      priority: 1243
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 8421504
-      priority: 1243
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 8421504
-      priority: 1243
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 8421504
-      priority: 1243
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 16944
     }
   }
 }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index c19fffad58..d44dc6c74f 100644
--- a/data/drules_proto_dark.bin
+++ b/data/drules_proto_dark.bin
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index b34497a863..620a138841 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -5,7 +5,7 @@ cont {
     lines {
       width: 0.5
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16,14 +16,14 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
@@ -31,7 +31,7 @@ cont {
     lines {
       width: 0.5
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -42,23 +42,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -66,7 +66,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -77,23 +77,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -101,7 +101,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -112,23 +112,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -136,7 +136,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -147,23 +147,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -171,7 +171,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1729
+      priority: 1736
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -182,7 +182,7 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -195,7 +195,7 @@ cont {
     lines {
       width: 0.5
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -206,14 +206,14 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
@@ -221,7 +221,7 @@ cont {
     lines {
       width: 0.5
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -232,23 +232,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -256,7 +256,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -267,23 +267,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -291,7 +291,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -302,23 +302,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -326,7 +326,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -337,152 +337,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 5131837
-      priority: 1729
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.5
-      color: 5131837
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "aerialway-drag_lift"
-  element {
-    scale: 14
-    lines {
-      width: 0.5
-      color: 5131837
-      priority: 1729
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.5
-      color: 1716407869
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 0.5
-      color: 5131837
-      priority: 1729
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.5
-      color: 5131837
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 5131837
-      priority: 1729
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.5
-      color: 5131837
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 5131837
-      priority: 1729
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.5
-      color: 5131837
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 5131837
-      priority: 1729
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.5
-      color: 5131837
-      dashdot {
-        dd: 1.0
-        dd: 18.0
-      }
-      priority: 1716
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15847
     }
   }
   element {
@@ -490,7 +361,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1729
+      priority: 1736
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -501,7 +372,7 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -514,7 +385,7 @@ cont {
     lines {
       width: 0.5
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -525,14 +396,14 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
@@ -540,7 +411,7 @@ cont {
     lines {
       width: 0.5
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -551,23 +422,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -575,7 +446,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -586,23 +457,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -610,7 +481,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -621,23 +492,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -645,7 +516,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -656,23 +527,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -680,7 +551,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1729
+      priority: 1736
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -691,7 +562,7 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -704,7 +575,7 @@ cont {
     lines {
       width: 0.5
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -715,14 +586,14 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
@@ -730,7 +601,7 @@ cont {
     lines {
       width: 0.5
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -741,23 +612,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -765,7 +636,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -776,23 +647,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -800,7 +671,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -811,23 +682,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -835,7 +706,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1864
+      priority: 1847
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -846,23 +717,23 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -870,7 +741,7 @@ cont {
     lines {
       width: 1.0
       color: 5131837
-      priority: 1729
+      priority: 1736
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -881,7 +752,7 @@ cont {
         dd: 1.0
         dd: 18.0
       }
-      priority: 1716
+      priority: 1722
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -894,24 +765,24 @@ cont {
     symbol {
       name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
   }
   element {
     scale: 15
     symbol {
-      name: "cable-car-m"
+      name: "cable-car-s"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -919,16 +790,16 @@ cont {
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -936,16 +807,16 @@ cont {
     symbol {
       name: "cable-car-m"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -953,16 +824,16 @@ cont {
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -970,249 +841,215 @@ cont {
     symbol {
       name: "cable-car-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "aeroway-aerodrome"
   element {
-    scale: 10
-    area {
-      color: 2757700
-      priority: -15987
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 2757700
-      priority: -15987
-    }
-  }
-  element {
     scale: 12
     area {
       color: 2757700
-      priority: -15068
-    }
-    symbol {
-      name: "airport-m"
-      priority: 16932
-    }
-    caption {
-      primary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
-      }
-      secondary {
-        height: 10
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
-        text: "int_name"
-      }
-      priority: 15932
+      priority: -15987
     }
   }
   element {
     scale: 13
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 10
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 14
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 10
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 15
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 16
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 17
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 18
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 19
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
 }
@@ -1222,273 +1059,348 @@ cont {
     scale: 10
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-s"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 11
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-m"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 12
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-m"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 13
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 10
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 14
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 10
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 15
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 16
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
-      name: "airport-m"
-      priority: 16932
+      name: "airport-l"
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 17
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 18
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
   element {
     scale: 19
     area {
       color: 2757700
-      priority: -15068
+      priority: -15084
     }
     symbol {
       name: "airport-l"
-      priority: 16932
+      priority: 16916
     }
     caption {
       primary {
-        height: 12
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        height: 14
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
       }
       secondary {
-        height: 11
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 20
+        height: 12
+        color: 3355443
+        stroke_color: 1118464
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15932
+      priority: 15916
     }
   }
 }
 cont {
   name: "aeroway-gate"
   element {
+    scale: 12
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
@@ -1496,47 +1408,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "aeroway-helipad"
   element {
+    scale: 12
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "heliport-m"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
-      name: "heliport-l"
-      priority: 16864
+      name: "heliport-m"
+      priority: 16847
     }
     caption {
       primary {
@@ -1544,14 +1531,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
-      name: "heliport-l"
-      priority: 16864
+      name: "heliport-m"
+      priority: 16847
     }
     caption {
       primary {
@@ -1559,14 +1546,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
-      name: "heliport-l"
-      priority: 16864
+      name: "heliport-m"
+      priority: 16847
     }
     caption {
       primary {
@@ -1574,7 +1561,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
@@ -1585,7 +1572,7 @@ cont {
     lines {
       width: 1.0
       color: 2149720610
-      priority: 1216
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -1595,7 +1582,7 @@ cont {
     lines {
       width: 1.5
       color: 857874978
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1605,7 +1592,7 @@ cont {
     lines {
       width: 2.4
       color: 2236962
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1615,7 +1602,7 @@ cont {
     lines {
       width: 2.4
       color: 2236962
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1625,7 +1612,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1635,7 +1622,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1645,7 +1632,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1655,7 +1642,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1668,7 +1655,7 @@ cont {
     lines {
       width: 0.6
       color: 1713512994
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1678,7 +1665,7 @@ cont {
     lines {
       width: 1.2
       color: 1713512994
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -1688,7 +1675,7 @@ cont {
     lines {
       width: 1.2
       color: 1713512994
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1698,7 +1685,7 @@ cont {
     lines {
       width: 1.2
       color: 1713512994
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1708,7 +1695,7 @@ cont {
     lines {
       width: 1.2
       color: 1713512994
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1718,7 +1705,7 @@ cont {
     lines {
       width: 1.2
       color: 1713512994
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -1730,77 +1717,77 @@ cont {
     scale: 14
     area {
       color: 857874978
-      priority: -15690
+      priority: -15695
     }
   }
   element {
     scale: 15
     area {
       color: 857874978
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
         color: 5592405
       }
-      priority: 15310
+      priority: 15305
     }
   }
   element {
     scale: 16
     area {
       color: 2236962
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
         color: 5592405
       }
-      priority: 15310
+      priority: 15305
     }
   }
   element {
     scale: 17
     area {
       color: 3355443
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
         color: 5592405
       }
-      priority: 15310
+      priority: 15305
     }
   }
   element {
     scale: 18
     area {
       color: 3355443
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
         color: 5592405
       }
-      priority: 15310
+      priority: 15305
     }
   }
   element {
     scale: 19
     area {
       color: 3355443
-      priority: -15690
+      priority: -15695
     }
     caption {
       primary {
         height: 9
         color: 5592405
       }
-      priority: 15310
+      priority: 15305
     }
   }
 }
@@ -1814,7 +1801,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -1825,43 +1812,208 @@ cont {
 cont {
   name: "amenity-atm"
   element {
+    scale: 12
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "atm-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "atm-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "atm-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-bank"
   element {
+    scale: 12
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bank-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "bank-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -1869,139 +2021,442 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "bank-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "bank-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-bar"
   element {
+    scale: 12
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "beer-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "beer-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-bbq"
   element {
+    scale: 12
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bbq-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bbq-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "bbq-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-bench"
   element {
+    scale: 12
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bench"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bench"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 19
     symbol {
       name: "bench"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-bicycle_rental"
   element {
+    scale: 12
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bicycle-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "bicycle-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -2009,37 +2464,37 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "bicycle-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "bicycle-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -2053,7 +2508,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -2064,34 +2519,130 @@ cont {
 cont {
   name: "amenity-bureau_de_change"
   element {
+    scale: 12
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "banknote-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "banknote-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "banknote-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -2100,7 +2651,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "bus-m"
+      name: "bus-l"
       apply_for_type: 1
       priority: 16000
     }
@@ -2108,103 +2659,167 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "bus-m"
-      priority: 16878
+      name: "bus-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "bus-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "bus-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "none"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 10
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "amenity-cafe"
   element {
+    scale: 12
+    symbol {
+      name: "cafe-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "cafe-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "cafe-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "cafe-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "cafe-m"
-      priority: 16864
+      name: "cafe-l"
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -2213,14 +2828,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "cafe-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -2228,136 +2843,406 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "cafe-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "cafe-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-car_rental"
   element {
+    scale: 12
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-car_sharing"
   element {
+    scale: 12
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-casino"
   element {
+    scale: 12
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "casino-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "casino-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "casino-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -2371,7 +3256,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -2382,10 +3267,70 @@ cont {
 cont {
   name: "amenity-clinic"
   element {
+    scale: 12
+    symbol {
+      name: "hospital-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hospital-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hospital-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hospital-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "hospital-m"
-      priority: 16837
+      name: "hospital-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -2393,14 +3338,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 17
     symbol {
       name: "hospital-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
@@ -2408,47 +3353,107 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "hospital-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "hospital-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-college"
   element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "college-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "college-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "college-m"
-      priority: 16864
+      name: "college-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -2456,14 +3461,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "college-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -2471,37 +3476,37 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "college-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "college-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
@@ -2515,7 +3520,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -2533,7 +3538,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -2544,42 +3549,152 @@ cont {
 cont {
   name: "amenity-drinking_water"
   element {
+    scale: 12
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "drinking-water-l"
+      priority: 16819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "drinking-water-l"
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 18
     symbol {
       name: "drinking-water-l"
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 19
     symbol {
       name: "drinking-water-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-embassy"
   element {
+    scale: 12
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "embassy-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "embassy-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -2587,70 +3702,160 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "embassy-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "embassy-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-fast_food"
   element {
+    scale: 12
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "fastfood-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "fastfood-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "fastfood-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -2661,15 +3866,15 @@ cont {
     symbol {
       name: "ship-s"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
   }
   element {
     scale: 15
     symbol {
-      name: "ship-m"
+      name: "ship-s"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
   }
   element {
@@ -2677,16 +3882,16 @@ cont {
     symbol {
       name: "ship-m"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -2694,16 +3899,16 @@ cont {
     symbol {
       name: "ship-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -2711,86 +3916,248 @@ cont {
     symbol {
       name: "ship-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "none"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "amenity-fire_station"
   element {
+    scale: 12
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "fire_station-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "fire_station-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "none"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-fountain"
   element {
+    scale: 12
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 16
     area {
       color: 8738
-      priority: -15771
+      priority: -15167
+    }
+    symbol {
+      name: "fountain-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 8738
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "fountain-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -2798,55 +4165,130 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 8738
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "fountain-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 8738
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "fountain-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-fuel"
   element {
+    scale: 12
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "fuel-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "fuel-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -2854,37 +4296,37 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "fuel-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "fuel-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
@@ -2894,32 +4336,32 @@ cont {
     scale: 14
     area {
       color: 656090368
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -2927,18 +4369,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -2946,26 +4388,26 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "none"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
 }
@@ -2975,32 +4417,32 @@ cont {
     scale: 14
     area {
       color: 656090368
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -3008,18 +4450,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -3027,54 +4469,108 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "none"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
 }
 cont {
   name: "amenity-hospital"
   element {
+    scale: 12
+    symbol {
+      name: "hospital-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hospital-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 14
     area {
       color: 3878179
-      priority: -15973
+      priority: -15139
+    }
+    symbol {
+      name: "hospital-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 15
     area {
       color: 3878179
-      priority: -15973
+      priority: -15139
+    }
+    symbol {
+      name: "hospital-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 16
     area {
       color: 3878179
-      priority: -15122
+      priority: -15139
     }
     symbol {
-      name: "hospital-m"
-      priority: 16878
+      name: "hospital-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -3082,18 +4578,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     area {
       color: 3878179
-      priority: -15122
+      priority: -15139
     }
     symbol {
       name: "hospital-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -3101,56 +4597,100 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     area {
       color: 3878179
-      priority: -15122
+      priority: -15139
     }
     symbol {
       name: "hospital-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     area {
       color: 3878179
-      priority: -15122
+      priority: -15139
     }
     symbol {
       name: "hospital-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "amenity-hunting_stand"
   element {
+    scale: 12
+    symbol {
+      name: "hunting-tower-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hunting-tower-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hunting-tower-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 15
     symbol {
-      name: "hunting-tower-m"
-      apply_for_type: 1
-      priority: 16851
+      name: "hunting-tower-l"
+      priority: 16833
     }
     caption {
       primary {
@@ -3158,15 +4698,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 16
     symbol {
-      name: "hunting-tower-m"
-      apply_for_type: 1
-      priority: 16851
+      name: "hunting-tower-l"
+      priority: 16833
     }
     caption {
       primary {
@@ -3174,15 +4713,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 17
     symbol {
-      name: "hunting-tower-m"
-      apply_for_type: 1
-      priority: 16851
+      name: "hunting-tower-l"
+      priority: 16833
     }
     caption {
       primary {
@@ -3190,47 +4728,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "hunting-tower-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "hunting-tower-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-kindergarten"
   element {
+    scale: 12
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "kindergarten-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "kindergarten-l"
-      priority: 16824
+      priority: 16819
     }
     caption {
       primary {
@@ -3238,844 +4851,2315 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15824
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "kindergarten-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "kindergarten-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-library"
   element {
+    scale: 12
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "library-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "library-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "library-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-marketplace"
   element {
+    scale: 12
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "marketplace-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "marketplace-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "marketplace-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-nightclub"
   element {
+    scale: 12
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bar-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bar-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "bar-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-parking"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-fee"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-multi-storey"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-multi-storey-fee"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-no-access"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-park_and_ride"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-permissive"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "zero-icon"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-permissive-fee"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "zero-icon"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-private"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "zero-icon"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-underground"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-parking-underground-fee"
   element {
+    scale: 12
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 13
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 14
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
+    scale: 15
+    area {
+      color: 4369
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
+    }
+  }
+  element {
     scale: 16
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
+    }
+    symbol {
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 17
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
-      name: "parking-s"
-      apply_for_type: 1
-      priority: 16067
+      name: "parking-m"
+      priority: 16069
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15069
     }
   }
   element {
     scale: 18
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
   element {
     scale: 19
     area {
       color: 4369
-      priority: -15933
+      priority: -15931
     }
     symbol {
       name: "parking-m"
-      priority: 16067
+      priority: 16069
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15069
     }
   }
 }
 cont {
   name: "amenity-pharmacy"
   element {
+    scale: 12
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "pharmacy-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "pharmacy-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "pharmacy-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-place_of_worship"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4083,18 +7167,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4102,59 +7186,119 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-buddhist"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4162,18 +7306,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4181,59 +7325,119 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-christian"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4241,18 +7445,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4260,59 +7464,119 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-hindu"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4320,18 +7584,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4339,59 +7603,119 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-jewish"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4399,18 +7723,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4418,59 +7742,119 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-muslim"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4478,18 +7862,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4497,59 +7881,119 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-shinto"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4557,18 +8001,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4576,59 +8020,119 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-place_of_worship-taoist"
   element {
+    scale: 12
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "place-of-worship-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
-      name: "place-of-worship-m"
-      priority: 16864
+      name: "place-of-worship-l"
+      priority: 16847
     }
     caption {
       primary {
@@ -4636,18 +8140,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4655,55 +8159,130 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     area {
       color: 3355426
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "place-of-worship-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-police"
   element {
+    scale: 12
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "police-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "police-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4711,81 +8290,251 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "police-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "police-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-post_box"
   element {
+    scale: 12
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "postbox-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "postbox-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "postbox-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-post_office"
   element {
+    scale: 12
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mail-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
-      name: "mail-l"
+      name: "mail-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
@@ -4793,7 +8542,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
@@ -4801,63 +8550,153 @@ cont {
     symbol {
       name: "mail-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "mail-m"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-pub"
   element {
+    scale: 12
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "beer-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "beer-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "beer-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
@@ -4867,25 +8706,89 @@ cont {
     scale: 19
     symbol {
       name: "recycling-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-restaurant"
   element {
+    scale: 12
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "restaurant-m"
-      priority: 16864
+      name: "restaurant-l"
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -4894,14 +8797,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4909,47 +8812,111 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-restaurant-vegan"
   element {
+    scale: 12
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "restaurant-m"
-      priority: 16864
+      name: "restaurant-l"
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -4958,14 +8925,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -4973,47 +8940,111 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-restaurant-vegetarian"
   element {
+    scale: 12
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "restaurant-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "restaurant-m"
-      priority: 16864
+      name: "restaurant-l"
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -5022,14 +9053,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -5037,47 +9068,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "restaurant-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-school"
   element {
+    scale: 12
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "school-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "school-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -5085,47 +9191,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "school-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "school-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-shelter"
   element {
+    scale: 12
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "picnic-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -5133,37 +9314,37 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "picnic-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "none"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -5177,7 +9358,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -5188,33 +9369,123 @@ cont {
 cont {
   name: "amenity-taxi"
   element {
+    scale: 12
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "taxi-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "taxi-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "taxi-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -5224,25 +9495,89 @@ cont {
     scale: 19
     symbol {
       name: "phone-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "amenity-theatre"
   element {
+    scale: 12
+    symbol {
+      name: "theatre-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "theatre-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "theatre-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "theatre-l"
+      priority: 16847
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
       name: "theatre-l"
-      priority: 16864
+      priority: 16847
       min_distance: 10
     }
     caption {
@@ -5251,14 +9586,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "theatre-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -5266,70 +9601,160 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "theatre-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "theatre-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "amenity-toilets"
   element {
+    scale: 12
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "toilets-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "toilets-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "toilets-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -5343,7 +9768,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -5354,11 +9779,516 @@ cont {
 cont {
   name: "amenity-university"
   element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 12
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
     scale: 14
     area {
       color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 2894359
       priority: -15987
     }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
   }
   element {
     scale: 15
@@ -5367,10 +10297,9 @@ cont {
       priority: -15987
     }
     symbol {
-      name: "college-m"
-      apply_for_type: 1
+      name: "college-l"
       priority: 16013
-      min_distance: 12
+      min_distance: 11
     }
     caption {
       primary {
@@ -5378,7 +10307,118 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 15
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5386,7 +10426,7 @@ cont {
     scale: 15
     area {
       color: 2894359
-      priority: -15122
+      priority: -15167
     }
     caption {
       primary {
@@ -5394,7 +10434,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15833
     }
     apply_if: "!name"
   }
@@ -5405,7 +10445,7 @@ cont {
       priority: -15987
     }
     symbol {
-      name: "college-m"
+      name: "college-l"
       priority: 16013
       min_distance: 11
     }
@@ -5415,7 +10455,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5423,8 +10463,29 @@ cont {
     scale: 16
     area {
       color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 16
+    area {
+      color: 2894359
       priority: -15987
     }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
     caption {
       primary {
         height: 10
@@ -5433,6 +10494,22 @@ cont {
       }
       priority: 15013
     }
+    apply_if: "name"
+  }
+  element {
+    scale: 16
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
     apply_if: "!name"
   }
   element {
@@ -5442,7 +10519,7 @@ cont {
       priority: -15987
     }
     symbol {
-      name: "college-m"
+      name: "college-l"
       priority: 16013
       min_distance: 11
     }
@@ -5452,7 +10529,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5460,8 +10537,29 @@ cont {
     scale: 16
     area {
       color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 16
+    area {
+      color: 2894359
       priority: -15987
     }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 11
+    }
     caption {
       primary {
         height: 10
@@ -5470,6 +10568,22 @@ cont {
       }
       priority: 15013
     }
+    apply_if: "name"
+  }
+  element {
+    scale: 16
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
     apply_if: "!name"
   }
   element {
@@ -5489,7 +10603,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5497,7 +10611,7 @@ cont {
     scale: 17
     area {
       color: 2894359
-      priority: -15136
+      priority: -15167
     }
     caption {
       primary {
@@ -5505,7 +10619,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
@@ -5526,7 +10640,81 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
+    }
+    apply_if: "name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 2894359
+      priority: -15167
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 17
+    area {
+      color: 2894359
+      priority: -15987
+    }
+    symbol {
+      name: "college-l"
+      priority: 16013
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5534,7 +10722,7 @@ cont {
     scale: 17
     area {
       color: 2894359
-      priority: -15136
+      priority: -15167
     }
     caption {
       primary {
@@ -5542,7 +10730,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
@@ -5558,11 +10746,11 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5570,15 +10758,15 @@ cont {
     scale: 18
     area {
       color: 2894359
-      priority: -15136
+      priority: -15167
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
@@ -5594,11 +10782,11 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5606,15 +10794,15 @@ cont {
     scale: 18
     area {
       color: 2894359
-      priority: -15136
+      priority: -15167
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
@@ -5630,11 +10818,11 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5642,19 +10830,19 @@ cont {
     scale: 19
     area {
       color: 2894359
-      priority: -15136
+      priority: -15167
     }
     symbol {
       name: "none"
-      priority: 16864
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
@@ -5670,11 +10858,11 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 16000
+      priority: 15013
     }
     apply_if: "name"
   }
@@ -5682,19 +10870,19 @@ cont {
     scale: 19
     area {
       color: 2894359
-      priority: -15136
+      priority: -15167
     }
     symbol {
       name: "none"
-      priority: 16864
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
     apply_if: "!name"
   }
@@ -5702,99 +10890,369 @@ cont {
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
+    scale: 12
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "vending-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-vending_machine-public_transport_tickets"
   element {
+    scale: 12
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "vending-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "vending-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "vending-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "amenity-waste_disposal"
   element {
+    scale: 12
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "recycling-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "recycling-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "recycling-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -5804,77 +11262,77 @@ cont {
     scale: 14
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 15
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 16
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 17
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 18
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 19
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
 }
@@ -5884,42 +11342,42 @@ cont {
     scale: 14
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 15
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 16
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 17
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 18
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 19
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
 }
@@ -5929,184 +11387,136 @@ cont {
     scale: 14
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
   element {
     scale: 15
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 16
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 17
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 18
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
     scale: 19
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
       }
-      priority: 15162
-    }
-  }
-}
-cont {
-  name: "barrier-block"
-  element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
+      priority: 15166
     }
   }
 }
 cont {
-  name: "barrier-bollard"
+  name: "barrier-border_control"
   element {
-    scale: 17
+    scale: 12
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "bcontrol-l"
+      apply_for_type: 1
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15861
     }
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "bcontrol-l"
+      apply_for_type: 1
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15861
     }
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "bcontrol-l"
+      apply_for_type: 1
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15861
     }
   }
-}
-cont {
-  name: "barrier-border_control"
   element {
     scale: 15
     symbol {
-      name: "bcontrol-m"
+      name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6114,15 +11524,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "bcontrol-m"
+      name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6130,7 +11540,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -6138,7 +11548,7 @@ cont {
     symbol {
       name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6146,7 +11556,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -6154,7 +11564,7 @@ cont {
     symbol {
       name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6162,7 +11572,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -6170,7 +11580,7 @@ cont {
     symbol {
       name: "bcontrol-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -6178,7 +11588,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -6187,13 +11597,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6201,13 +11611,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6215,13 +11625,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6229,78 +11639,89 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "barrier-entrance"
+  name: "barrier-fence"
   element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      priority: 16851
+    scale: 16
+    lines {
+      width: 0.5
+      color: 4473924
+      dashdot {
+        dd: 1.0
+        dd: 1.0
+      }
+      priority: 1638
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
+  }
+  element {
+    scale: 17
+    lines {
+      width: 1.0
+      color: 4473924
+      dashdot {
+        dd: 1.0
+        dd: 1.0
       }
-      priority: 15851
+      priority: 1638
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
   }
   element {
     scale: 18
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
+    lines {
+      width: 1.0
+      color: 4473924
+      dashdot {
+        dd: 1.0
+        dd: 1.0
       }
-      priority: 15851
+      priority: 1638
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
+    lines {
+      width: 1.0
+      color: 4473924
+      dashdot {
+        dd: 1.0
+        dd: 1.0
       }
-      priority: 15851
+      priority: 1638
+      join: ROUNDJOIN
+      cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "barrier-fence"
+  name: "barrier-hedge"
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6308,13 +11729,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6322,13 +11743,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6336,155 +11757,138 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "barrier-gate"
+  name: "barrier-lift_gate"
   element {
-    scale: 17
+    scale: 12
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "lift_gate-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "lift_gate-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "lift_gate-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
-}
-cont {
-  name: "barrier-hedge"
   element {
-    scale: 16
-    lines {
-      width: 0.7
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1635
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    scale: 15
+    symbol {
+      name: "lift_gate-l"
+      priority: 16819
     }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.2
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 1.0
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
       }
-      priority: 1635
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15819
     }
   }
   element {
-    scale: 18
-    lines {
-      width: 1.4
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 1.0
+    scale: 16
+    symbol {
+      name: "lift_gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
       }
-      priority: 1635
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15819
     }
   }
   element {
-    scale: 19
-    lines {
-      width: 1.4
-      color: 4473924
-      dashdot {
-        dd: 1.0
-        dd: 1.0
+    scale: 17
+    symbol {
+      name: "lift_gate-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
       }
-      priority: 1635
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15819
     }
   }
-}
-cont {
-  name: "barrier-lift_gate"
   element {
     scale: 18
     symbol {
       name: "lift_gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "lift_gate-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -6493,13 +11897,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6507,13 +11911,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6521,13 +11925,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6535,73 +11939,70 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "barrier-stile"
+  name: "barrier-toll_booth"
   element {
-    scale: 17
+    scale: 12
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
-      name: "dot-m"
-      priority: 16851
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
-}
-cont {
-  name: "barrier-toll_booth"
   element {
     scale: 15
     symbol {
-      name: "toll_booth-m"
-      priority: 16878
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -6609,14 +12010,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15819
     }
   }
   element {
     scale: 16
     symbol {
-      name: "toll_booth-m"
-      priority: 16878
+      name: "toll_booth-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -6624,14 +12025,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15819
     }
   }
   element {
     scale: 17
     symbol {
       name: "toll_booth-l"
-      priority: 16878
+      priority: 16819
     }
     caption {
       primary {
@@ -6639,37 +12040,37 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "toll_booth-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "toll_booth-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -6678,13 +12079,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6692,13 +12093,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6706,13 +12107,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6720,13 +12121,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -6739,7 +12140,7 @@ cont {
     lines {
       width: 0.5
       color: 1297438020
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6749,7 +12150,7 @@ cont {
     lines {
       width: 0.5
       color: 861230404
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6759,7 +12160,7 @@ cont {
     lines {
       width: 0.6
       color: 5592388
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6769,7 +12170,7 @@ cont {
     lines {
       width: 0.8
       color: 5592388
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6779,7 +12180,7 @@ cont {
     lines {
       width: 0.85
       color: 5592388
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6789,7 +12190,7 @@ cont {
     lines {
       width: 1.0
       color: 5592388
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6799,121 +12200,11 @@ cont {
     lines {
       width: 1.1
       color: 5592388
-      priority: 1283
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 9
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
   }
-  element {
-    scale: 10
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 11
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.4
-      color: 5592388
-      priority: 1283
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
 }
 cont {
   name: "boundary-administrative-3"
@@ -6926,7 +12217,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6943,7 +12234,7 @@ cont {
         dd: 1.35
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6957,7 +12248,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6971,7 +12262,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6985,7 +12276,7 @@ cont {
         dd: 1.44
         dd: 1.44
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -6999,7 +12290,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7013,7 +12304,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7027,7 +12318,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7041,7 +12332,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7055,7 +12346,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7069,7 +12360,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7083,7 +12374,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7097,7 +12388,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7111,7 +12402,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7125,7 +12416,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7139,7 +12430,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7156,7 +12447,7 @@ cont {
         dd: 1.35
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7170,7 +12461,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7184,7 +12475,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7198,7 +12489,7 @@ cont {
         dd: 1.44
         dd: 1.44
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7212,7 +12503,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7226,7 +12517,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7240,7 +12531,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7254,7 +12545,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -7268,7 +12559,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7282,7 +12573,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7296,7 +12587,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7310,7 +12601,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7324,7 +12615,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7338,7 +12629,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7352,7 +12643,7 @@ cont {
         dd: 1.8
         dd: 1.0
       }
-      priority: 1283
+      priority: 1277
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -7364,36 +12655,36 @@ cont {
     scale: 14
     area {
       color: 2149720610
-      priority: 1298
+      priority: 1292
     }
   }
   element {
     scale: 15
     area {
       color: 1713512994
-      priority: 1298
+      priority: 1292
     }
   }
   element {
     scale: 16
     area {
       color: 857874978
-      priority: 1352
+      priority: 1348
     }
     caption {
       primary {
-        height: 9
+        height: 8
         color: 5592405
         text: "addr:housename"
       }
-      priority: 15351
+      priority: 15347
     }
   }
   element {
     scale: 17
     area {
       color: 3355443
-      priority: 1352
+      priority: 1348
     }
     caption {
       primary {
@@ -7406,35 +12697,35 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15351
+      priority: 15347
     }
   }
   element {
     scale: 18
     area {
       color: 3355443
-      priority: 1352
+      priority: 1348
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
       }
-      priority: 15351
+      priority: 15347
     }
   }
   element {
     scale: 19
     area {
       color: 3355443
-      priority: 1352
+      priority: 1348
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
       }
-      priority: 15351
+      priority: 15347
     }
   }
 }
@@ -7444,11 +12735,11 @@ cont {
     scale: 16
     caption {
       primary {
-        height: 9
+        height: 8
         color: 5592405
         text: "addr:housename"
       }
-      priority: 15351
+      priority: 15347
     }
   }
   element {
@@ -7464,390 +12755,27 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15351
-    }
-  }
-  element {
-    scale: 18
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-      }
-      priority: 15351
-    }
-  }
-  element {
-    scale: 19
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-      }
-      priority: 15351
-    }
-  }
-}
-cont {
-  name: "craft-brewery"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-carpenter"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-electrician"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-gardener"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-hvac"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-metal_construction"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-painter"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-photographer"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-plumber"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "craft-shoemaker"
-  element {
-    scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
+      priority: 15347
     }
   }
-}
-cont {
-  name: "craft-tailor"
   element {
     scale: 18
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
-        offset_y: 10
       }
-      priority: 15837
+      priority: 15347
     }
   }
   element {
     scale: 19
-    symbol {
-      name: "hand-l"
-      priority: 16837
-    }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
-        offset_y: 10
       }
-      priority: 15837
+      priority: 15347
     }
   }
 }
@@ -7858,7 +12786,7 @@ cont {
     symbol {
       name: "entrance-s"
       apply_for_type: 1
-      priority: 16081
+      priority: 16083
     }
     caption {
       primary {
@@ -7867,7 +12795,7 @@ cont {
         offset_x: 9
         text: "ref"
       }
-      priority: 15081
+      priority: 15083
     }
   }
   element {
@@ -7875,7 +12803,7 @@ cont {
     symbol {
       name: "entrance-s"
       apply_for_type: 1
-      priority: 16081
+      priority: 16083
     }
     caption {
       primary {
@@ -7890,7 +12818,7 @@ cont {
         offset_y: 10
         text: "addr:flats"
       }
-      priority: 15081
+      priority: 15083
     }
   }
 }
@@ -7905,7 +12833,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1418
+      priority: 1416
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -7919,17 +12847,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -7941,17 +12869,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -7963,17 +12891,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -7985,17 +12913,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8007,17 +12935,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
 }
@@ -8032,7 +12960,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1418
+      priority: 1416
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8046,17 +12974,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8068,17 +12996,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8090,17 +13018,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8112,17 +13040,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8134,17 +13062,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
 }
@@ -8159,7 +13087,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1418
+      priority: 1416
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8173,17 +13101,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8195,17 +13123,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8217,17 +13145,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8239,17 +13167,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8261,17 +13189,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
 }
@@ -8286,7 +13214,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1418
+      priority: 1416
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8300,17 +13228,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8322,17 +13250,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8344,17 +13272,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8366,17 +13294,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
   element {
@@ -8388,89 +13316,73 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1432
+      priority: 1430
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16432
+      priority: 16430
     }
   }
 }
 cont {
   name: "highway-bus_stop"
   element {
-    scale: 16
-    symbol {
-      name: "bus-m"
-      priority: 16878
-    }
-  }
-  element {
     scale: 17
     symbol {
-      name: "bus-l"
-      priority: 16878
-    }
-    caption {
-      primary {
-        height: 11
-        color: 11711154
-        stroke_color: 437326080
-        offset_y: 10
-      }
-      priority: 15878
+      name: "bus-m"
+      priority: 16861
     }
   }
   element {
     scale: 18
     symbol {
       name: "bus-l"
-      priority: 16878
+      priority: 16861
     }
-    caption {
+    path_text {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15878
+      priority: 16861
     }
   }
   element {
     scale: 19
     symbol {
       name: "bus-l"
-      priority: 16878
+      priority: 16861
     }
-    caption {
+    path_text {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15878
+      priority: 16861
     }
   }
 }
@@ -8485,7 +13397,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8499,7 +13411,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8513,7 +13425,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8527,7 +13439,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8541,7 +13453,7 @@ cont {
         dd: 10.8
         dd: 4.5
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8555,7 +13467,7 @@ cont {
         dd: 13.5
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8569,7 +13481,7 @@ cont {
         dd: 18.0
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -8582,7 +13494,7 @@ cont {
     lines {
       width: 1.0
       color: 862011455
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8592,7 +13504,7 @@ cont {
     lines {
       width: 1.2
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8602,90 +13514,50 @@ cont {
     lines {
       width: 1.4
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 16
     lines {
       width: 1.6
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 17
     lines {
       width: 1.8
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 18
     lines {
       width: 2.0
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 19
     lines {
       width: 2.2
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
 }
 cont {
@@ -8695,7 +13567,7 @@ cont {
     lines {
       width: 1.0
       color: 862011455
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8705,7 +13577,7 @@ cont {
     lines {
       width: 1.2
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8715,90 +13587,50 @@ cont {
     lines {
       width: 1.4
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 16
     lines {
       width: 1.6
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 17
     lines {
       width: 1.8
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 18
     lines {
       width: 2.0
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 19
     lines {
       width: 2.2
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
 }
 cont {
@@ -8808,7 +13640,7 @@ cont {
     lines {
       width: 1.0
       color: 862011455
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8818,7 +13650,7 @@ cont {
     lines {
       width: 1.2
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8828,90 +13660,50 @@ cont {
     lines {
       width: 1.4
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 16
     lines {
       width: 1.6
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 17
     lines {
       width: 1.8
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 18
     lines {
       width: 2.0
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 19
     lines {
       width: 2.2
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
 }
 cont {
@@ -8921,7 +13713,7 @@ cont {
     lines {
       width: 1.0
       color: 862011455
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8931,7 +13723,7 @@ cont {
     lines {
       width: 1.2
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -8941,90 +13733,50 @@ cont {
     lines {
       width: 1.4
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 8
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 16
     lines {
       width: 1.6
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 17
     lines {
       width: 1.8
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 9
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 18
     lines {
       width: 2.0
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
   element {
     scale: 19
     lines {
       width: 2.2
       color: 6373439
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16662
-    }
   }
 }
 cont {
@@ -9038,7 +13790,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9052,17 +13804,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9074,7 +13826,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9082,9 +13834,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9096,7 +13848,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9104,9 +13856,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9118,17 +13870,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9140,17 +13892,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9165,7 +13917,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9179,17 +13931,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9201,7 +13953,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9209,9 +13961,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9223,7 +13975,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9231,9 +13983,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9245,17 +13997,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9267,17 +14019,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9292,13 +14044,13 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
   }
   element {
@@ -9310,21 +14062,21 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -9336,21 +14088,21 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -9362,21 +14114,21 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -9388,21 +14140,21 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -9414,21 +14166,21 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
 }
@@ -9443,21 +14195,21 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9471,31 +14223,31 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9507,21 +14259,21 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9529,9 +14281,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9543,21 +14295,21 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 5.2
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9565,9 +14317,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9579,31 +14331,31 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 7.2
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9615,31 +14367,31 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9654,7 +14406,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9668,17 +14420,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9690,7 +14442,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9698,9 +14450,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9712,7 +14464,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9720,9 +14472,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9734,17 +14486,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9756,17 +14508,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9781,7 +14533,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9795,17 +14547,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9817,7 +14569,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9825,9 +14577,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9839,7 +14591,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9847,9 +14599,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9861,17 +14613,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9883,17 +14635,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -9908,7 +14660,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -9922,17 +14674,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9944,7 +14696,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9952,9 +14704,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9966,7 +14718,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -9974,9 +14726,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -9988,17 +14740,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10010,17 +14762,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10035,7 +14787,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10049,17 +14801,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10071,7 +14823,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10079,9 +14831,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10093,7 +14845,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10101,9 +14853,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10115,17 +14867,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10137,17 +14889,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10162,7 +14914,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10176,17 +14928,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10198,7 +14950,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10206,9 +14958,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10220,7 +14972,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10228,9 +14980,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10242,17 +14994,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10264,17 +15016,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10289,7 +15041,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10303,17 +15055,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10325,7 +15077,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10333,9 +15085,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10347,7 +15099,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10355,9 +15107,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10369,17 +15121,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10391,17 +15143,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10416,7 +15168,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10430,17 +15182,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10452,7 +15204,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10460,9 +15212,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10474,7 +15226,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10482,9 +15234,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10496,17 +15248,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10518,17 +15270,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -10543,7 +15295,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10557,17 +15309,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10579,7 +15331,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10587,9 +15339,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10597,7 +15349,7 @@ cont {
     lines {
       width: 5.8
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10608,7 +15360,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10619,7 +15371,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -10627,9 +15379,9 @@ cont {
       primary {
         height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10637,7 +15389,7 @@ cont {
     lines {
       width: 7.8
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10648,7 +15400,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10659,17 +15411,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -10677,7 +15429,7 @@ cont {
     lines {
       width: 9.0
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10688,7 +15440,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -10699,118 +15451,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
-    }
-  }
-}
-cont {
-  name: "highway-ford"
-  element {
-    scale: 13
-    lines {
-      width: 1.0
-      color: 3355426
-      dashdot {
-        dd: 2.0
-        dd: 1.0
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.6
-      color: 3355426
-      dashdot {
-        dd: 3.6
-        dd: 1.6
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 3355426
-      dashdot {
-        dd: 5.0
-        dd: 2.2
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.4
-      color: 3355426
-      dashdot {
-        dd: 5.4
-        dd: 2.7
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 3355426
-      dashdot {
-        dd: 5.0
-        dd: 2.0
-      }
-      priority: 1000
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 3355426
-      dashdot {
-        dd: 7.0
-        dd: 3.0
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 5.0
-      color: 3355426
-      dashdot {
-        dd: 16.2
-        dd: 8.1
-      }
-      priority: 1472
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 16444
     }
   }
 }
@@ -10819,9 +15470,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -10849,7 +15500,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -10867,7 +15518,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -10885,7 +15536,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -10903,7 +15554,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -10921,7 +15572,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -10939,7 +15590,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -10950,9 +15601,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -10980,7 +15631,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -10998,7 +15649,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11016,7 +15667,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11034,7 +15685,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11052,7 +15703,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11070,7 +15721,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11081,9 +15732,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11111,7 +15762,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11129,7 +15780,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11158,7 +15809,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11187,7 +15838,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11216,7 +15867,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11245,7 +15896,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -11256,9 +15907,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
+      width: 0.6
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11266,9 +15917,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
+      width: 0.7
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11276,9 +15927,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
+      width: 1.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11286,75 +15937,75 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
+      width: 1.3
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
+      width: 1.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.9
+      width: 2.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11363,23 +16014,23 @@ cont {
     lines {
       width: 2.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11388,23 +16039,23 @@ cont {
     lines {
       width: 3.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11413,23 +16064,23 @@ cont {
     lines {
       width: 4.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -11438,23 +16089,23 @@ cont {
     lines {
       width: 6.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -11463,23 +16114,23 @@ cont {
     lines {
       width: 9.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -11488,23 +16139,23 @@ cont {
     lines {
       width: 12.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -11513,23 +16164,23 @@ cont {
     lines {
       width: 15.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -11539,9 +16190,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
+      width: 0.6
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11549,9 +16200,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
+      width: 0.7
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11559,9 +16210,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
+      width: 1.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11569,75 +16220,75 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
+      width: 1.3
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
+      width: 1.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.9
+      width: 2.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11646,37 +16297,37 @@ cont {
     lines {
       width: 2.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11685,37 +16336,37 @@ cont {
     lines {
       width: 3.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -11724,37 +16375,37 @@ cont {
     lines {
       width: 4.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -11763,37 +16414,37 @@ cont {
     lines {
       width: 6.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -11802,37 +16453,37 @@ cont {
     lines {
       width: 9.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 19.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 21.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -11841,37 +16492,37 @@ cont {
     lines {
       width: 12.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 26.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -11880,37 +16531,37 @@ cont {
     lines {
       width: 15.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 32.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 34.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -11920,9 +16571,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
+      width: 0.6
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11930,9 +16581,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
+      width: 0.7
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11940,9 +16591,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
+      width: 1.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -11950,86 +16601,86 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
+      width: 1.3
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
+      width: 1.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 2.9
+      width: 3.0
       color: 0
       dashdot {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.0
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -12042,30 +16693,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -12078,30 +16729,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -12114,30 +16765,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -12150,30 +16801,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -12186,30 +16837,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -12222,30 +16873,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -12258,30 +16909,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -12295,7 +16946,7 @@ cont {
         height: 9
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -12305,7 +16956,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -12315,7 +16966,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -12325,7 +16976,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -12335,7 +16986,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
@@ -12346,8 +16997,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -12357,8 +17008,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -12368,8 +17019,8 @@ cont {
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -12379,23 +17030,23 @@ cont {
     lines {
       width: 2.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12404,7 +17055,7 @@ cont {
     lines {
       width: 3.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12412,15 +17063,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12429,7 +17080,7 @@ cont {
     lines {
       width: 2.4
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12437,15 +17088,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -12454,7 +17105,7 @@ cont {
     lines {
       width: 3.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12462,9 +17113,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12472,7 +17123,7 @@ cont {
     lines {
       width: 4.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12480,9 +17131,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12490,7 +17141,7 @@ cont {
     lines {
       width: 6.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12498,9 +17149,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12508,7 +17159,7 @@ cont {
     lines {
       width: 7.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12516,9 +17167,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -12529,8 +17180,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -12540,8 +17191,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -12551,8 +17202,8 @@ cont {
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -12562,23 +17213,23 @@ cont {
     lines {
       width: 2.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12587,21 +17238,21 @@ cont {
     lines {
       width: 3.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12609,15 +17260,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12626,21 +17277,21 @@ cont {
     lines {
       width: 2.4
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12648,15 +17299,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -12665,21 +17316,21 @@ cont {
     lines {
       width: 3.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12687,9 +17338,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12697,21 +17348,21 @@ cont {
     lines {
       width: 4.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12719,9 +17370,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12729,21 +17380,21 @@ cont {
     lines {
       width: 6.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12751,9 +17402,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12761,21 +17412,21 @@ cont {
     lines {
       width: 7.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 19.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12783,9 +17434,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -12796,8 +17447,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -12807,8 +17458,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -12818,8 +17469,8 @@ cont {
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -12833,30 +17484,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12869,14 +17520,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 16557154
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12884,15 +17535,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -12905,14 +17556,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -12920,15 +17571,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -12941,14 +17592,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12956,9 +17607,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12970,14 +17621,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -12985,9 +17636,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -12999,14 +17650,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13014,9 +17665,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -13028,14 +17679,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -13043,9 +17694,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -13060,7 +17711,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13074,17 +17725,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13096,17 +17747,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13118,17 +17769,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13140,17 +17791,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13162,17 +17813,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13187,7 +17838,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13201,17 +17852,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13223,17 +17874,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13245,17 +17896,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13267,17 +17918,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13289,17 +17940,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13314,7 +17965,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13328,17 +17979,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13350,17 +18001,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13372,17 +18023,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13394,17 +18045,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13416,17 +18067,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13441,7 +18092,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13455,17 +18106,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13477,17 +18128,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13499,17 +18150,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13521,17 +18172,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13543,17 +18194,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13568,7 +18219,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13582,17 +18233,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13604,17 +18255,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13626,17 +18277,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13648,17 +18299,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13666,7 +18317,7 @@ cont {
     lines {
       width: 9.0
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13677,7 +18328,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13688,17 +18339,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13713,7 +18364,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13727,17 +18378,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13749,17 +18400,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13771,17 +18422,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13793,17 +18444,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13815,17 +18466,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13840,7 +18491,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13854,17 +18505,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13876,17 +18527,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13898,17 +18549,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13920,17 +18571,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -13942,17 +18593,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -13967,7 +18618,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -13981,17 +18632,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14003,17 +18654,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14025,17 +18676,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14047,17 +18698,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14069,17 +18720,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14094,7 +18745,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14108,17 +18759,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14130,17 +18781,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14152,17 +18803,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14174,17 +18825,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14196,17 +18847,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14221,7 +18872,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14235,17 +18886,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14257,17 +18908,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14279,17 +18930,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14301,17 +18952,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14323,17 +18974,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14348,7 +18999,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14362,17 +19013,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14384,17 +19035,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14406,17 +19057,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14428,17 +19079,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14450,17 +19101,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14475,7 +19126,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14489,17 +19140,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14511,17 +19162,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14533,17 +19184,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14555,17 +19206,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14577,17 +19228,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14602,7 +19253,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14616,17 +19267,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14638,17 +19289,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14660,17 +19311,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14682,17 +19333,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14704,17 +19355,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14729,7 +19380,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14743,17 +19394,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14765,17 +19416,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14787,17 +19438,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14809,17 +19460,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14831,17 +19482,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -14856,7 +19507,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14870,17 +19521,17 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 8
+        height: 9
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14892,17 +19543,17 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14914,17 +19565,17 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 9
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14936,17 +19587,17 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
   element {
@@ -14954,7 +19605,7 @@ cont {
     lines {
       width: 9.0
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14965,7 +19616,7 @@ cont {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -14976,17 +19627,17 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16445
+      priority: 16444
     }
   }
 }
@@ -15023,7 +19674,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15045,7 +19696,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15065,9 +19716,9 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15087,9 +19738,9 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -15111,7 +19762,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15133,7 +19784,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15164,21 +19815,21 @@ cont {
         dd: 3.6
         dd: 1.6
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     path_text {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16162
+      priority: 16166
     }
   }
   element {
@@ -15190,21 +19841,21 @@ cont {
         dd: 5.0
         dd: 2.2
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -15216,21 +19867,21 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -15242,21 +19893,21 @@ cont {
         dd: 5.0
         dd: 2.0
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -15268,21 +19919,21 @@ cont {
         dd: 7.0
         dd: 3.0
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
   element {
@@ -15294,21 +19945,21 @@ cont {
         dd: 16.2
         dd: 8.1
       }
-      priority: 1162
+      priority: 1166
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 3026460
-      priority: -15838
+      priority: -15834
     }
     caption {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 15162
+      priority: 15166
     }
   }
 }
@@ -15330,7 +19981,7 @@ cont {
     lines {
       width: 1.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15351,14 +20002,14 @@ cont {
     lines {
       width: 3.2
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15366,7 +20017,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15387,14 +20038,14 @@ cont {
     lines {
       width: 4.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15402,7 +20053,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15423,22 +20074,22 @@ cont {
     lines {
       width: 5.2
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15459,22 +20110,22 @@ cont {
     lines {
       width: 6.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -15495,14 +20146,14 @@ cont {
     lines {
       width: 8.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15510,7 +20161,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15531,14 +20182,14 @@ cont {
     lines {
       width: 10.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 11.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -15546,7 +20197,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15585,7 +20236,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15607,7 +20258,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15638,9 +20289,9 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15671,9 +20322,9 @@ cont {
     }
     path_text {
       primary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -15706,7 +20357,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15739,7 +20390,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16472
     }
@@ -15750,9 +20401,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 0.9
+      width: 0.5
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15760,9 +20411,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 0.8
+      width: 0.7
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15770,9 +20421,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.2
+      width: 1.0
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15780,24 +20431,24 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.5
+      width: 1.4
       color: 16553815
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -15805,40 +20456,40 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.7
-      color: 16553815
-      priority: 1594
+      width: 1.6
+      color: 16746062
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
@@ -15846,49 +20497,49 @@ cont {
     scale: 13
     lines {
       width: 2.4
-      color: 16553815
-      priority: 1594
+      color: 16557154
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
   element {
     scale: 14
     lines {
-      width: 3.2
+      width: 2.9
       color: 16553815
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 25
     }
   }
@@ -15897,23 +20548,23 @@ cont {
     lines {
       width: 4.2
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 24
     }
   }
@@ -15922,17 +20573,17 @@ cont {
     lines {
       width: 4.8
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -15940,17 +20591,17 @@ cont {
     lines {
       width: 7.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -15958,17 +20609,17 @@ cont {
     lines {
       width: 10.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -15976,17 +20627,17 @@ cont {
     lines {
       width: 13.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
 }
@@ -15995,9 +20646,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 0.9
+      width: 0.5
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16005,9 +20656,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 0.8
+      width: 0.7
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16015,9 +20666,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.2
+      width: 1.0
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16025,24 +20676,24 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.5
+      width: 1.4
       color: 16553815
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16050,40 +20701,40 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.7
-      color: 16553815
-      priority: 1594
+      width: 1.6
+      color: 16746062
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
@@ -16091,63 +20742,63 @@ cont {
     scale: 13
     lines {
       width: 2.4
-      color: 16553815
-      priority: 1594
+      color: 16557154
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
   element {
     scale: 14
     lines {
-      width: 3.2
+      width: 2.9
       color: 16553815
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.4
+      width: 5.8
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 6.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 25
     }
   }
@@ -16156,37 +20807,37 @@ cont {
     lines {
       width: 4.2
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 24
     }
   }
@@ -16195,31 +20846,31 @@ cont {
     lines {
       width: 4.8
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16227,31 +20878,31 @@ cont {
     lines {
       width: 7.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16259,31 +20910,31 @@ cont {
     lines {
       width: 10.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 24.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16291,31 +20942,31 @@ cont {
     lines {
       width: 13.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 28.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 30.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
 }
@@ -16324,9 +20975,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 0.9
+      width: 0.5
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16334,9 +20985,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 0.8
+      width: 0.7
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16344,9 +20995,9 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.2
+      width: 1.0
       color: 16746062
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16354,24 +21005,24 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.5
+      width: 1.4
       color: 16553815
-      priority: 1594
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -16379,40 +21030,40 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.7
-      color: 16553815
-      priority: 1594
+      width: 1.6
+      color: 16746062
+      priority: 1597
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
@@ -16420,60 +21071,60 @@ cont {
     scale: 13
     lines {
       width: 2.4
-      color: 16553815
-      priority: 1594
+      color: 16557154
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 20
     }
   }
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.9
       color: 0
       dashdot {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
+      width: 2.9
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 25
     }
   }
@@ -16486,30 +21137,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.2
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16594
+      priority: 16597
       min_distance: 24
     }
   }
@@ -16522,24 +21173,24 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16551,24 +21202,24 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16580,24 +21231,24 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
   element {
@@ -16609,24 +21260,24 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1593
+      priority: 1596
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 13.0
       color: 16557154
-      priority: 1594
+      priority: 1597
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16594
+      priority: 16597
     }
   }
 }
@@ -16638,7 +21289,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -16649,7 +21300,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -16659,8 +21310,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -16670,8 +21321,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -16679,9 +21330,9 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.2
+      width: 2.9
       color: 16553815
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16689,15 +21340,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16581
+      priority: 16583
       min_distance: 20
     }
   }
@@ -16706,7 +21357,7 @@ cont {
     lines {
       width: 2.1
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16714,15 +21365,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16581
+      priority: 16583
       min_distance: 24
     }
   }
@@ -16731,7 +21382,7 @@ cont {
     lines {
       width: 2.4
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16739,9 +21390,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16749,7 +21400,7 @@ cont {
     lines {
       width: 3.5
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16757,9 +21408,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16767,7 +21418,7 @@ cont {
     lines {
       width: 5.0
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16775,9 +21426,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16785,7 +21436,7 @@ cont {
     lines {
       width: 7.0
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -16793,9 +21444,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
 }
@@ -16807,7 +21458,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -16818,7 +21469,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -16828,8 +21479,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -16839,8 +21490,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -16848,23 +21499,23 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.2
+      width: 2.9
       color: 16553815
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 6.4
+      width: 5.8
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 7.2
+      width: 6.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16872,15 +21523,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16581
+      priority: 16583
       min_distance: 20
     }
   }
@@ -16889,21 +21540,21 @@ cont {
     lines {
       width: 2.1
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.2
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16911,15 +21562,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16581
+      priority: 16583
       min_distance: 24
     }
   }
@@ -16928,21 +21579,21 @@ cont {
     lines {
       width: 2.4
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.8
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16950,9 +21601,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16960,21 +21611,21 @@ cont {
     lines {
       width: 3.5
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -16982,9 +21633,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -16992,21 +21643,21 @@ cont {
     lines {
       width: 5.0
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17014,9 +21665,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -17024,21 +21675,21 @@ cont {
     lines {
       width: 7.0
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 18.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17046,9 +21697,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
 }
@@ -17060,7 +21711,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -17071,7 +21722,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -17081,8 +21732,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -17092,8 +21743,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -17101,20 +21752,20 @@ cont {
   element {
     scale: 14
     lines {
-      width: 5.2
+      width: 4.9
       color: 0
       dashdot {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 3.2
+      width: 2.9
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17122,15 +21773,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16581
+      priority: 16583
       min_distance: 20
     }
   }
@@ -17143,14 +21794,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.1
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17158,15 +21809,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16581
+      priority: 16583
       min_distance: 24
     }
   }
@@ -17179,14 +21830,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17194,9 +21845,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -17208,14 +21859,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.5
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17223,9 +21874,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -17237,14 +21888,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17252,9 +21903,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16581
+      priority: 16583
     }
   }
   element {
@@ -17266,14 +21917,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1580
+      priority: 1582
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 16557154
-      priority: 1581
+      priority: 1583
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17281,173 +21932,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16581
-    }
-  }
-}
-cont {
-  name: "highway-proposed"
-  element {
-    scale: 13
-    lines {
-      width: 1.2
-      color: 2236962
-      dashdot {
-        dd: 3.6
-        dd: 1.8
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.4
-      color: 2236962
-      dashdot {
-        dd: 4.5
-        dd: 1.8
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 2.0
-      color: 2236962
-      dashdot {
-        dd: 7.2
-        dd: 2.7
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 2236962
-      dashdot {
-        dd: 9.0
-        dd: 3.6
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 2236962
-      dashdot {
-        dd: 10.8
-        dd: 4.5
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 2236962
-      dashdot {
-        dd: 13.5
-        dd: 5.4
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 6.0
-      color: 2236962
-      dashdot {
-        dd: 18.0
-        dd: 6.3
-      }
-      priority: 1391
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "highway-raceway"
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.8
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 16583
     }
   }
 }
@@ -17456,9 +21943,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17466,26 +21953,18 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17493,24 +21972,16 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17518,7 +21989,7 @@ cont {
     lines {
       width: 1.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17526,16 +21997,9 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -17543,7 +22007,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17551,16 +22015,9 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -17568,7 +22025,7 @@ cont {
     lines {
       width: 4.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17576,9 +22033,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17586,7 +22043,7 @@ cont {
     lines {
       width: 6.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17594,9 +22051,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17604,7 +22061,7 @@ cont {
     lines {
       width: 9.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17612,9 +22069,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17622,7 +22079,7 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17630,9 +22087,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -17641,9 +22098,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17651,26 +22108,18 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17678,24 +22127,16 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17703,7 +22144,7 @@ cont {
     lines {
       width: 1.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17711,16 +22152,9 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -17728,7 +22162,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17736,16 +22170,9 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -17753,7 +22180,7 @@ cont {
     lines {
       width: 4.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17761,9 +22188,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17771,7 +22198,7 @@ cont {
     lines {
       width: 6.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17779,9 +22206,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17789,7 +22216,7 @@ cont {
     lines {
       width: 9.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17797,9 +22224,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17807,7 +22234,7 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -17815,9 +22242,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -17826,9 +22253,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -17836,26 +22263,18 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17863,24 +22282,16 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -17888,21 +22299,21 @@ cont {
     lines {
       width: 1.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17910,16 +22321,9 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -17927,21 +22331,21 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17949,16 +22353,9 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -17966,21 +22363,21 @@ cont {
     lines {
       width: 4.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.8
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -17988,9 +22385,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -17998,21 +22395,21 @@ cont {
     lines {
       width: 6.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18020,9 +22417,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18030,21 +22427,21 @@ cont {
     lines {
       width: 9.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 22.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18052,9 +22449,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18062,21 +22459,21 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 26.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18084,9 +22481,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -18095,9 +22492,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18105,26 +22502,18 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -18132,24 +22521,16 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -18157,7 +22538,7 @@ cont {
     lines {
       width: 1.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18165,16 +22546,9 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -18182,7 +22556,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18190,16 +22564,9 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -18211,14 +22578,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 3026460
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18226,9 +22593,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18240,14 +22607,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 3026460
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18255,9 +22622,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18269,14 +22636,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 3026460
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18284,9 +22651,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -18298,14 +22665,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 3026460
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -18313,9 +22680,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -18324,9 +22691,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18407,9 +22774,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18456,14 +22823,14 @@ cont {
     lines {
       width: 8.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18480,14 +22847,14 @@ cont {
     lines {
       width: 12.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18504,14 +22871,14 @@ cont {
     lines {
       width: 18.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 18.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18528,14 +22895,14 @@ cont {
     lines {
       width: 24.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 24.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18546,9 +22913,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -18629,37 +22996,37 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.8
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 856756480
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.3
+      width: 1.1
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 856756480
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18667,23 +23034,23 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
+        stroke_color: 3003121664
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -18692,23 +23059,23 @@ cont {
     lines {
       width: 2.2
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
+        stroke_color: 3003121664
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -18717,7 +23084,7 @@ cont {
     lines {
       width: 3.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18725,15 +23092,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 25
     }
   }
@@ -18742,7 +23109,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18750,15 +23117,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 24
     }
   }
@@ -18767,17 +23134,17 @@ cont {
     lines {
       width: 4.8
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18785,17 +23152,17 @@ cont {
     lines {
       width: 7.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18803,17 +23170,17 @@ cont {
     lines {
       width: 10.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18821,17 +23188,17 @@ cont {
     lines {
       width: 13.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
 }
@@ -18840,37 +23207,37 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.8
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 856756480
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.3
+      width: 1.1
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 856756480
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -18878,23 +23245,23 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
+        stroke_color: 3003121664
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -18903,23 +23270,23 @@ cont {
     lines {
       width: 2.2
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
+        stroke_color: 3003121664
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -18928,21 +23295,21 @@ cont {
     lines {
       width: 3.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18950,15 +23317,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 25
     }
   }
@@ -18967,21 +23334,21 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -18989,15 +23356,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 24
     }
   }
@@ -19006,31 +23373,31 @@ cont {
     lines {
       width: 4.8
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 9.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19038,31 +23405,31 @@ cont {
     lines {
       width: 7.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 15.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 17.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19070,31 +23437,31 @@ cont {
     lines {
       width: 10.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 24.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19102,31 +23469,31 @@ cont {
     lines {
       width: 13.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 28.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 30.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
 }
@@ -19135,37 +23502,37 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.8
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 856756480
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.3
+      width: 1.1
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 856756480
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19173,23 +23540,23 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
+        stroke_color: 3003121664
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -19198,23 +23565,23 @@ cont {
     lines {
       width: 2.2
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
+        stroke_color: 3003121664
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 20
     }
   }
@@ -19223,7 +23590,7 @@ cont {
     lines {
       width: 3.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19231,15 +23598,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 25
     }
   }
@@ -19248,7 +23615,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19256,15 +23623,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16567
+      priority: 16569
       min_distance: 24
     }
   }
@@ -19277,24 +23644,24 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1566
+      priority: 1568
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19306,24 +23673,24 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1566
+      priority: 1568
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 2236962
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19335,24 +23702,24 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1566
+      priority: 1568
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.0
       color: 3026460
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
   element {
@@ -19364,24 +23731,24 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1566
+      priority: 1568
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 13.0
       color: 3026460
-      priority: 1567
+      priority: 1569
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16567
+      priority: 16569
     }
   }
 }
@@ -19392,7 +23759,7 @@ cont {
     lines {
       width: 1.5
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19402,7 +23769,7 @@ cont {
     lines {
       width: 2.0
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19412,7 +23779,7 @@ cont {
     lines {
       width: 2.4
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19422,7 +23789,7 @@ cont {
     lines {
       width: 3.5
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19432,7 +23799,7 @@ cont {
     lines {
       width: 5.0
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19442,7 +23809,7 @@ cont {
     lines {
       width: 7.0
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19455,21 +23822,21 @@ cont {
     lines {
       width: 1.5
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19479,21 +23846,21 @@ cont {
     lines {
       width: 2.0
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19503,21 +23870,21 @@ cont {
     lines {
       width: 2.4
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.8
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19527,21 +23894,21 @@ cont {
     lines {
       width: 3.5
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19551,21 +23918,21 @@ cont {
     lines {
       width: 5.0
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19575,21 +23942,21 @@ cont {
     lines {
       width: 7.0
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 16.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 18.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19602,7 +23969,7 @@ cont {
     lines {
       width: 1.5
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19612,7 +23979,7 @@ cont {
     lines {
       width: 2.0
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19626,14 +23993,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1553
+      priority: 1554
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19647,14 +24014,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1553
+      priority: 1554
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.5
       color: 2236962
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19668,14 +24035,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1553
+      priority: 1554
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.0
       color: 3026460
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19689,14 +24056,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1553
+      priority: 1554
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.0
       color: 3026460
-      priority: 1554
+      priority: 1555
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19709,7 +24076,7 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19719,7 +24086,7 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19729,43 +24096,27 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19773,9 +24124,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -19783,7 +24134,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19791,9 +24142,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -19804,7 +24155,7 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19814,7 +24165,7 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19824,43 +24175,27 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19868,9 +24203,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -19878,7 +24213,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -19886,9 +24221,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -19899,7 +24234,7 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19909,7 +24244,7 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -19919,85 +24254,69 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 3.2
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20005,9 +24324,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20015,21 +24334,21 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20037,9 +24356,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20050,46 +24369,27 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
   element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
-  }
-  element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20097,9 +24397,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20107,7 +24407,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20115,9 +24415,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20128,46 +24428,27 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
   element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
-  }
-  element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20175,9 +24456,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20185,7 +24466,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20193,9 +24474,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20206,81 +24487,55 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
   element {
-    scale: 16
-    lines {
-      width: 0.4
-      color: 4473924
-      priority: 1363
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
-  }
-  element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 4.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20288,9 +24543,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20298,21 +24553,21 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20320,9 +24575,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20333,46 +24588,27 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
   }
   element {
-    scale: 16
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
-  }
-  element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20380,9 +24616,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20390,7 +24626,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20398,9 +24634,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20411,7 +24647,7 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20421,7 +24657,7 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20431,43 +24667,27 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20475,9 +24695,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20485,7 +24705,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20493,9 +24713,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
@@ -20506,7 +24726,7 @@ cont {
     lines {
       width: 0.7
       color: 4280427042
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20516,7 +24736,7 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20526,43 +24746,27 @@ cont {
     lines {
       width: 1.6
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 17
     lines {
       width: 2.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 7829367
-        stroke_color: 856756480
-      }
-      priority: 16459
-    }
   }
   element {
     scale: 18
     lines {
       width: 3.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20570,9 +24774,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
   element {
@@ -20580,7 +24784,7 @@ cont {
     lines {
       width: 4.0
       color: 2236962
-      priority: 1459
+      priority: 1458
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20588,44 +24792,76 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16459
+      priority: 16458
     }
   }
 }
 cont {
   name: "highway-speed_camera"
   element {
+    scale: 12
+    symbol {
+      name: "speedcam-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "speedcam-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "speedcam-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "speedcam-m"
+      apply_for_type: 1
+      priority: 16819
+    }
+  }
+  element {
     scale: 16
     symbol {
       name: "speedcam-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 17
     symbol {
-      name: "speedcam-l"
+      name: "speedcam-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 18
     symbol {
-      name: "speedcam-l"
+      name: "speedcam-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "speedcam-l"
+      name: "speedcam-m"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
   }
 }
@@ -20640,7 +24876,7 @@ cont {
         dd: 1.5
         dd: 1.5
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20654,7 +24890,7 @@ cont {
         dd: 2.3
         dd: 2.3
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20668,7 +24904,7 @@ cont {
         dd: 3.2
         dd: 3.2
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20682,7 +24918,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20699,21 +24935,21 @@ cont {
         dd: 1.5
         dd: 1.5
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20727,21 +24963,21 @@ cont {
         dd: 2.3
         dd: 2.3
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 14.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20755,21 +24991,21 @@ cont {
         dd: 3.2
         dd: 3.2
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 18.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 18.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20783,21 +25019,21 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 22.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 22.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20814,7 +25050,7 @@ cont {
         dd: 1.5
         dd: 1.5
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20828,7 +25064,7 @@ cont {
         dd: 2.3
         dd: 2.3
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20842,7 +25078,7 @@ cont {
         dd: 3.2
         dd: 3.2
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20856,7 +25092,7 @@ cont {
         dd: 4.0
         dd: 4.0
       }
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20867,9 +25103,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -20877,26 +25113,18 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -20904,24 +25132,16 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -20929,7 +25149,7 @@ cont {
     lines {
       width: 1.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20937,16 +25157,9 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -20954,7 +25167,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -20962,16 +25175,9 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -20979,7 +25185,7 @@ cont {
     lines {
       width: 4.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -20987,9 +25193,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -20997,7 +25203,7 @@ cont {
     lines {
       width: 6.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21005,9 +25211,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21015,7 +25221,7 @@ cont {
     lines {
       width: 9.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21023,9 +25229,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21033,7 +25239,7 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21041,9 +25247,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -21052,9 +25258,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -21062,26 +25268,18 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -21089,24 +25287,16 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -21114,21 +25304,21 @@ cont {
     lines {
       width: 1.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21136,16 +25326,9 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -21153,21 +25336,21 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21175,16 +25358,9 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -21192,21 +25368,21 @@ cont {
     lines {
       width: 4.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 8.8
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21214,9 +25390,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21224,21 +25400,21 @@ cont {
     lines {
       width: 6.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 13.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21246,9 +25422,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21256,21 +25432,21 @@ cont {
     lines {
       width: 9.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 20.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 22.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21278,9 +25454,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21288,21 +25464,21 @@ cont {
     lines {
       width: 12.0
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 26.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21310,9 +25486,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -21321,9 +25497,9 @@ cont {
   element {
     scale: 11
     lines {
-      width: 0.8
+      width: 0.4
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -21331,26 +25507,18 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -21358,24 +25526,16 @@ cont {
     lines {
       width: 1.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 6710886
-        stroke_color: 436207616
+        color: 4473924
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 25
+      priority: 16541
     }
   }
   element {
@@ -21383,7 +25543,7 @@ cont {
     lines {
       width: 1.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21391,16 +25551,9 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 20
+      priority: 16541
     }
   }
   element {
@@ -21408,7 +25561,7 @@ cont {
     lines {
       width: 3.2
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21416,16 +25569,9 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
-    }
-    shield {
-      height: 9
-      color: 16777215
-      stroke_color: 0
-      priority: 16540
-      min_distance: 24
+      priority: 16541
     }
   }
   element {
@@ -21437,14 +25583,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 3026460
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21452,9 +25598,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21466,14 +25612,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 3026460
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21481,9 +25627,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21495,14 +25641,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 3026460
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21510,9 +25656,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
   element {
@@ -21524,14 +25670,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1539
+      priority: 1540
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 3026460
-      priority: 1540
+      priority: 1541
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21539,9 +25685,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16540
+      priority: 16541
     }
   }
 }
@@ -21612,14 +25758,14 @@ cont {
     lines {
       width: 3.2
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21636,14 +25782,14 @@ cont {
     lines {
       width: 4.4
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21660,14 +25806,14 @@ cont {
     lines {
       width: 7.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21684,14 +25830,14 @@ cont {
     lines {
       width: 11.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 13.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21708,14 +25854,14 @@ cont {
     lines {
       width: 14.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21829,7 +25975,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21843,7 +25989,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21857,7 +26003,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21871,7 +26017,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21885,7 +26031,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21899,7 +26045,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21916,7 +26062,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21930,7 +26076,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -21944,7 +26090,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21958,7 +26104,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21972,7 +26118,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -21986,7 +26132,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22003,7 +26149,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22017,7 +26163,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22031,7 +26177,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22045,7 +26191,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22059,7 +26205,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22073,7 +26219,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22090,7 +26236,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22104,7 +26250,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22118,7 +26264,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22132,7 +26278,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22146,7 +26292,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22160,7 +26306,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22177,7 +26323,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22191,7 +26337,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22205,7 +26351,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22219,7 +26365,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22233,7 +26379,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22247,7 +26393,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22264,7 +26410,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22278,7 +26424,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22292,7 +26438,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22306,7 +26452,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22320,7 +26466,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22334,7 +26480,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22351,7 +26497,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22365,7 +26511,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22379,7 +26525,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22393,7 +26539,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22407,7 +26553,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22421,7 +26567,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22438,7 +26584,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22452,7 +26598,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22466,7 +26612,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22480,7 +26626,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22494,7 +26640,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22508,7 +26654,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22525,7 +26671,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22539,7 +26685,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22553,7 +26699,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22567,7 +26713,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22581,7 +26727,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22595,7 +26741,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22612,7 +26758,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22626,7 +26772,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22640,7 +26786,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22654,7 +26800,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22668,7 +26814,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22682,7 +26828,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22699,7 +26845,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22713,7 +26859,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22727,7 +26873,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22741,7 +26887,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22755,7 +26901,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22769,7 +26915,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22786,7 +26932,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22800,7 +26946,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22814,7 +26960,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22828,7 +26974,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22842,7 +26988,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22856,7 +27002,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22873,7 +27019,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22887,7 +27033,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22901,7 +27047,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22915,7 +27061,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22929,7 +27075,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22943,7 +27089,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -22960,7 +27106,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22974,7 +27120,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -22988,7 +27134,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23002,7 +27148,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23016,7 +27162,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23030,7 +27176,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23047,7 +27193,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23061,7 +27207,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23075,7 +27221,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23089,7 +27235,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23103,7 +27249,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23117,7 +27263,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23134,7 +27280,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23148,7 +27294,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23162,7 +27308,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23176,7 +27322,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23190,7 +27336,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23204,7 +27350,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23221,7 +27367,7 @@ cont {
         dd: 2.52
         dd: 1.35
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23235,7 +27381,7 @@ cont {
         dd: 2.7
         dd: 1.26
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -23249,7 +27395,7 @@ cont {
         dd: 3.6
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23263,7 +27409,7 @@ cont {
         dd: 4.5
         dd: 1.8
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23277,7 +27423,7 @@ cont {
         dd: 7.2
         dd: 2.7
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23291,7 +27437,7 @@ cont {
         dd: 9.0
         dd: 3.6
       }
-      priority: 1445
+      priority: 1444
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -23302,9 +27448,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
+      width: 0.6
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23312,9 +27458,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
+      width: 0.7
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23322,9 +27468,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
+      width: 1.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23332,75 +27478,75 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
+      width: 1.3
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
+      width: 1.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.9
+      width: 2.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23409,23 +27555,23 @@ cont {
     lines {
       width: 2.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23434,23 +27580,23 @@ cont {
     lines {
       width: 3.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23459,23 +27605,23 @@ cont {
     lines {
       width: 4.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -23484,23 +27630,23 @@ cont {
     lines {
       width: 6.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -23509,23 +27655,23 @@ cont {
     lines {
       width: 9.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -23534,23 +27680,23 @@ cont {
     lines {
       width: 12.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -23559,23 +27705,23 @@ cont {
     lines {
       width: 15.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -23585,9 +27731,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
+      width: 0.6
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23595,9 +27741,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
+      width: 0.7
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23605,9 +27751,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
+      width: 1.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23615,75 +27761,75 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
+      width: 1.3
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
+      width: 1.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.9
+      width: 2.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23692,37 +27838,37 @@ cont {
     lines {
       width: 2.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23731,37 +27877,37 @@ cont {
     lines {
       width: 3.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -23770,37 +27916,37 @@ cont {
     lines {
       width: 4.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 10.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -23809,37 +27955,37 @@ cont {
     lines {
       width: 6.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 12.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -23848,37 +27994,37 @@ cont {
     lines {
       width: 9.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 19.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 21.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -23887,37 +28033,37 @@ cont {
     lines {
       width: 12.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 26.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -23926,37 +28072,37 @@ cont {
     lines {
       width: 15.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 32.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 34.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -23966,9 +28112,9 @@ cont {
   element {
     scale: 7
     lines {
-      width: 0.9
+      width: 0.6
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23976,9 +28122,9 @@ cont {
   element {
     scale: 8
     lines {
-      width: 1.1
+      width: 0.7
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23986,9 +28132,9 @@ cont {
   element {
     scale: 9
     lines {
-      width: 1.2
+      width: 1.0
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -23996,86 +28142,86 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.5
+      width: 1.3
       color: 16280377
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.7
+      width: 1.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 18
     }
   }
   element {
     scale: 12
     lines {
-      width: 2.9
+      width: 3.0
       color: 0
       dashdot {
         dd: 2.0
         dd: 2.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
-      width: 1.9
+      width: 2.0
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: BEVELJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -24088,30 +28234,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -24124,30 +28270,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 16557154
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 20
     }
   }
@@ -24160,30 +28306,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 24
     }
   }
@@ -24196,30 +28342,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -24232,30 +28378,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 9.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 25
     }
   }
@@ -24268,30 +28414,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -24304,30 +28450,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1620
+      priority: 1624
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.0
       color: 16284746
-      priority: 1621
+      priority: 1625
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
         height: 14
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16621
+      priority: 16625
     }
     shield {
       height: 10
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16621
+      priority: 16625
       min_distance: 26
     }
   }
@@ -24339,8 +28485,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -24350,8 +28496,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -24361,8 +28507,8 @@ cont {
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -24372,23 +28518,23 @@ cont {
     lines {
       width: 2.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24397,7 +28543,7 @@ cont {
     lines {
       width: 3.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24405,15 +28551,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24422,7 +28568,7 @@ cont {
     lines {
       width: 2.4
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24430,15 +28576,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -24447,7 +28593,7 @@ cont {
     lines {
       width: 3.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24455,9 +28601,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24465,7 +28611,7 @@ cont {
     lines {
       width: 4.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24473,9 +28619,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24483,7 +28629,7 @@ cont {
     lines {
       width: 6.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24491,9 +28637,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24501,7 +28647,7 @@ cont {
     lines {
       width: 7.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24509,9 +28655,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -24522,8 +28668,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -24533,8 +28679,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -24544,8 +28690,8 @@ cont {
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -24555,23 +28701,23 @@ cont {
     lines {
       width: 2.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24580,21 +28726,21 @@ cont {
     lines {
       width: 3.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24602,15 +28748,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24619,21 +28765,21 @@ cont {
     lines {
       width: 2.4
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.8
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 5.6
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24641,15 +28787,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -24658,21 +28804,21 @@ cont {
     lines {
       width: 3.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 6.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24680,9 +28826,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24690,21 +28836,21 @@ cont {
     lines {
       width: 4.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 10.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 12.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24712,9 +28858,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24722,21 +28868,21 @@ cont {
     lines {
       width: 6.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 14.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 16.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24744,9 +28890,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24754,21 +28900,21 @@ cont {
     lines {
       width: 7.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     lines {
       width: 17.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 19.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24776,9 +28922,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -24789,8 +28935,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -24800,8 +28946,8 @@ cont {
     path_text {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 3004240128
       }
       priority: 16000
     }
@@ -24811,8 +28957,8 @@ cont {
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
       priority: 16000
     }
@@ -24826,30 +28972,30 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.8
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
         height: 12
-        color: 7829367
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24862,14 +29008,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.8
       color: 16557154
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24877,15 +29023,15 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 20
     }
   }
@@ -24898,14 +29044,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 2.4
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -24913,15 +29059,15 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
     shield {
       height: 9
-      color: 16777215
+      color: 9474192
       stroke_color: 0
-      priority: 16608
+      priority: 16611
       min_distance: 24
     }
   }
@@ -24934,14 +29080,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24949,9 +29095,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24963,14 +29109,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -24978,9 +29124,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -24992,14 +29138,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.0
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25007,9 +29153,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
   element {
@@ -25021,14 +29167,14 @@ cont {
         dd: 5.0
         dd: 5.0
       }
-      priority: 1607
+      priority: 1610
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 7.5
       color: 16284746
-      priority: 1608
+      priority: 1611
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25036,9 +29182,9 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
-      priority: 16608
+      priority: 16611
     }
   }
 }
@@ -25047,9 +29193,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -25077,7 +29223,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25095,7 +29241,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25113,7 +29259,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25131,7 +29277,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25149,7 +29295,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25167,7 +29313,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25178,9 +29324,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -25208,7 +29354,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25226,7 +29372,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25244,7 +29390,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25262,7 +29408,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25280,7 +29426,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25298,7 +29444,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25309,9 +29455,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -25338,14 +29484,14 @@ cont {
     lines {
       width: 3.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 4.4
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25353,7 +29499,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25370,14 +29516,14 @@ cont {
     lines {
       width: 6.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 6.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25385,7 +29531,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25402,14 +29548,14 @@ cont {
     lines {
       width: 8.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.8
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25417,7 +29563,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25434,14 +29580,14 @@ cont {
     lines {
       width: 13.6
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 15.2
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25449,7 +29595,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25466,14 +29612,14 @@ cont {
     lines {
       width: 20.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 22.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25481,7 +29627,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25498,14 +29644,14 @@ cont {
     lines {
       width: 26.0
       color: 2236945
-      priority: 1377
+      priority: 1374
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 28.0
       color: 4473924
-      priority: 1363
+      priority: 1360
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -25513,7 +29659,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25524,9 +29670,9 @@ cont {
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 2236962
-      priority: 1540
+      priority: 1541
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -25554,7 +29700,7 @@ cont {
       primary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25572,7 +29718,7 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25601,7 +29747,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25630,7 +29776,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25659,7 +29805,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25688,7 +29834,7 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       priority: 16513
     }
@@ -25697,10 +29843,85 @@ cont {
 cont {
   name: "historic-archaeological_site"
   element {
+    scale: 12
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25708,14 +29929,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25723,14 +29944,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25738,65 +29959,215 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "historic-boundary_stone"
   element {
+    scale: 12
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "boundary_stone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "boundary_stone-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "boundary_stone-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "historic-castle"
   element {
+    scale: 12
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "remains-m"
-      priority: 16878
+      name: "remains-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25804,14 +30175,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25819,14 +30190,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -25834,7 +30205,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -25843,13 +30214,13 @@ cont {
   element {
     scale: 16
     lines {
-      width: 0.7
+      width: 0.5
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25857,13 +30228,13 @@ cont {
   element {
     scale: 17
     lines {
-      width: 1.2
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25871,13 +30242,13 @@ cont {
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25885,13 +30256,13 @@ cont {
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 4473924
       dashdot {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -25900,10 +30271,85 @@ cont {
 cont {
   name: "historic-memorial"
   element {
+    scale: 12
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -25911,62 +30357,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "historic-monument"
   element {
+    scale: 12
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "monument-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "monument-m"
-      priority: 16878
+      name: "monument-l"
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -25974,62 +30480,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "monument-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "historic-museum"
   element {
+    scale: 12
+    symbol {
+      name: "museum-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "museum-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "museum-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "museum-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "museum-m"
-      priority: 16878
+      name: "museum-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -26037,47 +30603,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "historic-ruins"
   element {
+    scale: 12
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "remains-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -26085,14 +30726,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -26100,14 +30741,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "remains-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -26115,139 +30756,499 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "historic-ship"
   element {
+    scale: 12
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ship-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
-      name: "historic-ship-l"
-      priority: 16837
+      name: "ship-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "historic-ship-l"
-      priority: 16837
+      name: "ship-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "historic-tomb"
   element {
+    scale: 12
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tomb-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "tomb-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "tomb-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "historic-wayside_cross"
   element {
+    scale: 12
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "wayside_cross-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "wayside_cross-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "wayside_cross-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "historic-wayside_shrine"
   element {
+    scale: 12
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "wayside_shrine-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "wayside_shrine-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "wayside_shrine-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -26258,7 +31259,7 @@ cont {
     lines {
       width: 0
       color: 0
-      priority: 1405
+      priority: 1402
       pathsym {
         name: "arrow-s"
         step: 144.0
@@ -26271,7 +31272,7 @@ cont {
     lines {
       width: 0
       color: 0
-      priority: 1662
+      priority: 1666
       pathsym {
         name: "arrow-s"
         step: 184.0
@@ -26284,7 +31285,7 @@ cont {
     lines {
       width: 0
       color: 0
-      priority: 1662
+      priority: 1666
       pathsym {
         name: "arrow-m"
         step: 184.0
@@ -26297,7 +31298,7 @@ cont {
     lines {
       width: 0
       color: 0
-      priority: 1662
+      priority: 1666
       pathsym {
         name: "arrow-m"
         step: 184.0
@@ -26309,94 +31310,87 @@ cont {
 cont {
   name: "landuse-allotments"
   element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
 }
@@ -26406,56 +31400,56 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 13
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 14
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 15
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 16
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 17
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 18
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 19
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
 }
@@ -26465,18 +31459,18 @@ cont {
     scale: 14
     area {
       color: 656090368
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15852
+      priority: -15848
     }
     symbol {
       name: "cemetery-m"
-      priority: 16148
+      priority: 16152
     }
     caption {
       primary {
@@ -26484,18 +31478,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15148
+      priority: 15152
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15852
+      priority: -15848
     }
     symbol {
       name: "cemetery-m"
-      priority: 16148
+      priority: 16152
     }
     caption {
       primary {
@@ -26503,18 +31497,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15148
+      priority: 15152
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26522,18 +31516,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26541,18 +31535,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26560,7 +31554,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
 }
@@ -26570,18 +31564,18 @@ cont {
     scale: 14
     area {
       color: 656090368
-      priority: -15852
+      priority: -15848
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15852
+      priority: -15848
     }
     symbol {
       name: "cemetery-m"
-      priority: 16148
+      priority: 16152
     }
     caption {
       primary {
@@ -26589,18 +31583,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15148
+      priority: 15152
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15852
+      priority: -15848
     }
     symbol {
       name: "cemetery-m"
-      priority: 16148
+      priority: 16152
     }
     caption {
       primary {
@@ -26608,18 +31602,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15148
+      priority: 15152
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26627,18 +31621,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26646,18 +31640,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15433
+      priority: -15431
     }
     symbol {
       name: "cemetery-l"
-      priority: 16567
+      priority: 16569
     }
     caption {
       primary {
@@ -26665,7 +31659,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15567
+      priority: 15569
     }
   }
 }
@@ -26708,223 +31702,157 @@ cont {
     scale: 15
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 16
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 17
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 18
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 19
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
 }
 cont {
   name: "landuse-farmland"
   element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
-    }
-  }
-}
-cont {
-  name: "landuse-field"
-  element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 1778944
-      priority: -15865
+      priority: 15138
     }
   }
 }
@@ -26934,39 +31862,39 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -26982,7 +31910,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -26990,7 +31918,7 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -26998,11 +31926,11 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27018,7 +31946,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27026,11 +31954,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27046,7 +31974,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27054,7 +31982,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27062,11 +31990,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27082,7 +32010,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27090,11 +32018,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27110,7 +32038,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27118,11 +32046,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27138,7 +32066,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27146,7 +32074,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27154,15 +32082,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -27174,7 +32102,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27182,7 +32110,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27190,15 +32118,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -27210,7 +32138,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27218,15 +32146,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -27238,7 +32166,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27246,15 +32174,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -27266,7 +32194,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27274,15 +32202,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -27294,7 +32222,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27302,7 +32230,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27310,15 +32238,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -27330,7 +32258,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27338,7 +32266,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27346,11 +32274,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27366,7 +32294,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27374,7 +32302,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27382,11 +32310,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27402,7 +32330,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27410,11 +32338,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27430,7 +32358,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27438,11 +32366,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27458,7 +32386,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27466,11 +32394,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27486,7 +32414,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27494,7 +32422,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27502,11 +32430,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27522,7 +32450,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27530,11 +32458,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27543,7 +32471,7 @@ cont {
         stroke_color: 855638016
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -27551,11 +32479,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27571,7 +32499,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27579,11 +32507,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27599,7 +32527,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27607,11 +32535,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27627,7 +32555,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27635,11 +32563,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27655,7 +32583,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27663,11 +32591,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27676,7 +32604,7 @@ cont {
         stroke_color: 855638016
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -27684,11 +32612,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27704,7 +32632,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27712,11 +32640,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27732,7 +32660,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27740,11 +32668,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27760,7 +32688,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27771,39 +32699,39 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27819,7 +32747,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27827,7 +32755,7 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27835,11 +32763,11 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27855,7 +32783,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27863,11 +32791,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27883,7 +32811,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27891,7 +32819,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27899,11 +32827,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27919,7 +32847,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27927,11 +32855,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27947,7 +32875,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27955,11 +32883,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -27975,7 +32903,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -27983,7 +32911,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -27991,15 +32919,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28011,7 +32939,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28019,7 +32947,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28027,15 +32955,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28047,7 +32975,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28055,15 +32983,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28075,7 +33003,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28083,15 +33011,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28103,7 +33031,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28111,15 +33039,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28131,7 +33059,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28139,7 +33067,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28147,15 +33075,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28167,7 +33095,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28175,7 +33103,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28183,11 +33111,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28203,7 +33131,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28211,7 +33139,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28219,11 +33147,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28239,7 +33167,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28247,11 +33175,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28267,7 +33195,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28275,11 +33203,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28295,7 +33223,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28303,11 +33231,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28323,7 +33251,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28331,7 +33259,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28339,11 +33267,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28359,7 +33287,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28367,11 +33295,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28380,7 +33308,7 @@ cont {
         stroke_color: 855638016
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -28388,11 +33316,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28408,7 +33336,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28416,11 +33344,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28436,7 +33364,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28444,11 +33372,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28464,7 +33392,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28472,11 +33400,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28492,7 +33420,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28500,11 +33428,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28513,7 +33441,7 @@ cont {
         stroke_color: 855638016
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -28521,11 +33449,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28541,7 +33469,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28549,11 +33477,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28569,7 +33497,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28577,11 +33505,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28597,7 +33525,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28608,39 +33536,39 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28656,7 +33584,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28664,7 +33592,7 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28672,11 +33600,11 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28692,7 +33620,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28700,11 +33628,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28720,7 +33648,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28728,7 +33656,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28736,11 +33664,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28756,7 +33684,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28764,11 +33692,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28784,7 +33712,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28792,11 +33720,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -28812,7 +33740,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28820,7 +33748,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28828,15 +33756,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28848,7 +33776,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28856,7 +33784,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28864,15 +33792,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28884,7 +33812,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28892,15 +33820,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28912,7 +33840,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28920,15 +33848,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28940,7 +33868,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28948,15 +33876,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -28968,7 +33896,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -28976,7 +33904,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -28984,15 +33912,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -29004,7 +33932,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29012,7 +33940,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29020,11 +33948,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29040,7 +33968,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29048,7 +33976,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29056,11 +33984,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29076,7 +34004,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29084,11 +34012,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29104,7 +34032,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29112,11 +34040,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29132,7 +34060,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29140,11 +34068,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29160,7 +34088,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29168,7 +34096,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29176,11 +34104,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29196,7 +34124,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29204,11 +34132,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29217,7 +34145,7 @@ cont {
         stroke_color: 855638016
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -29225,11 +34153,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29245,7 +34173,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29253,11 +34181,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29273,7 +34201,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29281,11 +34209,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29301,7 +34229,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29309,11 +34237,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29329,7 +34257,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29337,11 +34265,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29350,7 +34278,7 @@ cont {
         stroke_color: 855638016
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -29358,11 +34286,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29378,7 +34306,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29386,11 +34314,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29406,7 +34334,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29414,11 +34342,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29434,7 +34362,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29445,39 +34373,39 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29493,7 +34421,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29501,7 +34429,7 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29509,11 +34437,11 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-s"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29529,7 +34457,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29537,11 +34465,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29557,7 +34485,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29565,7 +34493,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29573,11 +34501,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29593,7 +34521,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29601,11 +34529,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29621,7 +34549,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29629,11 +34557,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29649,7 +34577,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29657,7 +34585,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29665,15 +34593,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -29685,7 +34613,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29693,7 +34621,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29701,15 +34629,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -29721,7 +34649,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29729,15 +34657,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -29749,7 +34677,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29757,15 +34685,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -29777,7 +34705,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29785,15 +34713,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -29805,7 +34733,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29813,7 +34741,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29821,15 +34749,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-m"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -29841,7 +34769,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29849,7 +34777,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29857,11 +34785,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29877,7 +34805,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29885,7 +34813,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -29893,11 +34821,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29913,7 +34841,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29921,11 +34849,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29941,7 +34869,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29949,11 +34877,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29969,7 +34897,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -29977,11 +34905,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -29997,7 +34925,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30005,7 +34933,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     apply_if: "!name"
   }
@@ -30013,11 +34941,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30033,7 +34961,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30041,11 +34969,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30054,7 +34982,7 @@ cont {
         stroke_color: 855638016
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -30062,11 +34990,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30082,7 +35010,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30090,11 +35018,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30110,7 +35038,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30118,11 +35046,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30138,7 +35066,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30146,11 +35074,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30166,7 +35094,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30174,11 +35102,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30187,7 +35115,7 @@ cont {
         stroke_color: 855638016
         offset_y: 10
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "!name"
   }
@@ -30195,11 +35123,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30215,7 +35143,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30223,11 +35151,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30243,7 +35171,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
@@ -30251,11 +35179,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
     symbol {
       name: "park-l"
-      priority: 16108
+      priority: 16111
     }
     caption {
       primary {
@@ -30271,112 +35199,60 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15108
+      priority: 15111
     }
     apply_if: "name"
   }
 }
 cont {
-  name: "landuse-garages"
-  element {
-    scale: 14
-    area {
-      color: 2149720610
-      priority: 1298
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 1713512994
-      priority: 1298
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 857874978
-      priority: 1298
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 3355443
-      priority: 1298
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 3355443
-      priority: 1298
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3355443
-      priority: 1298
-    }
-  }
-}
-cont {
   name: "landuse-grass"
   element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
     scale: 13
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
 }
@@ -30386,242 +35262,122 @@ cont {
     scale: 15
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 16
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 17
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 18
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
+      priority: 15041
     }
   }
   element {
     scale: 19
     area {
       color: 1315840
-      priority: -15960
+      priority: -15959
     }
     caption {
       primary {
         height: 10
         color: 10066329
       }
-      priority: 15040
-    }
-  }
-}
-cont {
-  name: "landuse-landfill"
-  element {
-    scale: 14
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 1315840
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1315840
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 1315840
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 1315840
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 1315840
-      priority: -15149
-    }
-    symbol {
-      name: "recycling-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
+      priority: 15041
     }
   }
 }
 cont {
   name: "landuse-meadow"
   element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
 }
@@ -30631,7 +35387,7 @@ cont {
     scale: 17
     symbol {
       name: "military-l"
-      priority: 16662
+      priority: 16666
     }
     caption {
       primary {
@@ -30639,14 +35395,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
     scale: 18
     symbol {
       name: "military-l"
-      priority: 16662
+      priority: 16666
     }
     caption {
       primary {
@@ -30654,14 +35410,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
     scale: 19
     symbol {
       name: "military-l"
-      priority: 16662
+      priority: 16666
     }
     caption {
       primary {
@@ -30669,341 +35425,181 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
 cont {
   name: "landuse-orchard"
   element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
-    }
-  }
-}
-cont {
-  name: "landuse-quarry"
-  element {
-    scale: 15
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-}
-cont {
-  name: "landuse-railway"
-  element {
-    scale: 15
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 1315840
-      priority: -15960
-    }
-    caption {
-      primary {
-        height: 10
-        color: 10066329
-      }
-      priority: 15040
+      priority: 15138
     }
   }
 }
 cont {
   name: "landuse-recreation_ground"
   element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15135
+      priority: 15138
     }
   }
 }
@@ -31016,7 +35612,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31027,7 +35623,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31035,14 +35631,14 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31050,7 +35646,7 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31058,7 +35654,7 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31066,14 +35662,14 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31081,7 +35677,7 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31089,7 +35685,7 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31097,14 +35693,14 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31112,7 +35708,7 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31120,7 +35716,7 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31128,14 +35724,14 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31143,7 +35739,7 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31151,7 +35747,7 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31159,14 +35755,14 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31174,7 +35770,7 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31182,7 +35778,7 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31190,14 +35786,14 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31205,7 +35801,7 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31213,7 +35809,7 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31221,14 +35817,14 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31236,7 +35832,7 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31244,7 +35840,7 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -31252,14 +35848,14 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -31267,7 +35863,7 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -31275,348 +35871,355 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
 }
 cont {
-  name: "landuse-salt_pond"
-  element {
-    scale: 0
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 1
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 2
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 3
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 4
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 5
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 6
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 10
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
+  name: "landuse-village_green"
   element {
     scale: 13
     area {
-      color: 8738
-      priority: -15771
+      color: 1778944
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
-      color: 8738
-      priority: -15771
+      color: 1778944
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
-      color: 8738
-      priority: -15771
+      color: 1778944
+      priority: -15862
     }
   }
   element {
     scale: 16
     area {
-      color: 8738
-      priority: -15771
+      color: 1778944
+      priority: -15862
     }
   }
   element {
     scale: 17
     area {
-      color: 8738
-      priority: -15771
+      color: 1778944
+      priority: -15862
     }
   }
   element {
     scale: 18
     area {
-      color: 8738
-      priority: -15771
+      color: 1778944
+      priority: -15862
     }
   }
   element {
     scale: 19
     area {
-      color: 8738
-      priority: -15771
+      color: 1778944
+      priority: -15862
     }
   }
 }
 cont {
-  name: "landuse-village_green"
-  element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
+  name: "landuse-vineyard"
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15138
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15138
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15138
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15138
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+      }
+      priority: 15138
     }
   }
 }
 cont {
-  name: "landuse-vineyard"
+  name: "leisure-dog_park"
   element {
     scale: 12
-    area {
-      color: 1778944
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
     scale: 13
-    area {
-      color: 1778944
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
     scale: 14
-    area {
-      color: 1778944
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
     scale: 15
-    area {
-      color: 1778944
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 5592405
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
   element {
     scale: 16
-    area {
-      color: 1778944
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 5592405
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
   element {
     scale: 17
-    area {
-      color: 1778944
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 5592405
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
   element {
     scale: 18
-    area {
-      color: 1778944
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 5592405
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
   element {
     scale: 19
-    area {
-      color: 1778944
-      priority: -15865
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
         height: 10
         color: 5592405
+        offset_y: 10
       }
-      priority: 15135
+      priority: 15819
     }
   }
 }
 cont {
-  name: "leisure-dog_park"
+  name: "leisure-dog_park-tennis"
   element {
-    scale: 18
+    scale: 12
     symbol {
       name: "dog_park-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 13
     symbol {
       name: "dog_park-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "dog_park-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "leisure-dog_park-tennis"
   element {
     scale: 17
     symbol {
-      name: "tennis-l"
-      apply_for_type: 1
-      priority: 16851
+      name: "dog_park-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -31624,37 +36227,37 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "dog_park-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "dog_park-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -31664,44 +36267,44 @@ cont {
     scale: 12
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-m"
-      priority: 16121
+      priority: 16125
       min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -31713,7 +36316,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -31721,7 +36324,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -31729,16 +36332,16 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-m"
-      priority: 16121
+      priority: 16125
       min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -31750,7 +36353,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -31758,7 +36361,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -31766,16 +36369,16 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-l"
-      priority: 16121
+      priority: 16125
       min_distance: 10
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -31787,7 +36390,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -31795,7 +36398,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -31803,16 +36406,16 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-l"
-      priority: 16121
+      priority: 16125
       min_distance: 10
     }
     caption {
       primary {
-        height: 12
+        height: 11
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -31824,7 +36427,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -31832,7 +36435,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -31840,11 +36443,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -31860,18 +36463,18 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "garden-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -31887,7 +36490,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
   }
 }
@@ -31895,71 +36498,86 @@ cont {
   name: "leisure-golf_course"
   element {
     scale: 12
-    area {
-      color: 1778944
-      priority: -15825
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15825
+      priority: -15792
+    }
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15825
+      priority: -15792
+    }
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15825
+      priority: -15792
+    }
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15825
+      priority: -15792
+    }
+    symbol {
+      name: "golf-l"
+      priority: 16208
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15784
+      priority: -15792
     }
     symbol {
       name: "golf-l"
-      apply_for_type: 1
-      priority: 16216
+      priority: 16208
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15784
+      priority: -15792
     }
     symbol {
       name: "golf-l"
-      priority: 16216
+      priority: 16208
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15784
+      priority: -15792
     }
     symbol {
       name: "golf-l"
-      priority: 16216
+      priority: 16208
     }
   }
 }
@@ -31969,174 +36587,174 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-s"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 1786635
         stroke_color: 856756480
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-s"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 12
         color: 1786635
         stroke_color: 856756480
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-s"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 856756480
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-m"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 1786635
-        stroke_color: 437326080
+        stroke_color: 856756480
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-m"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 1786635
-        stroke_color: 437326080
+        stroke_color: 856756480
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-l"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 1786635
-        stroke_color: 437326080
+        stroke_color: 856756480
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-l"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 1786635
-        stroke_color: 437326080
+        stroke_color: 856756480
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15139
     }
     symbol {
-      name: "nparkf-l"
-      priority: 16108
+      name: "npark-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 12
         color: 1786635
-        stroke_color: 437326080
+        stroke_color: 856756480
         offset_y: 10
       }
-      priority: 15108
+      priority: 15861
     }
   }
 }
@@ -32146,39 +36764,39 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32194,7 +36812,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32202,7 +36820,7 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32210,11 +36828,11 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32230,7 +36848,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32238,11 +36856,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32258,7 +36876,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32266,7 +36884,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32274,11 +36892,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32294,7 +36912,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32302,11 +36920,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32322,7 +36940,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32330,11 +36948,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32350,7 +36968,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32358,7 +36976,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32366,15 +36984,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -32386,7 +37004,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32394,7 +37012,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32402,15 +37020,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -32422,7 +37040,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32430,15 +37048,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -32450,7 +37068,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32458,15 +37076,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -32478,7 +37096,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32486,15 +37104,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -32506,7 +37124,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32514,7 +37132,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32522,15 +37140,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -32542,7 +37160,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32550,7 +37168,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32558,11 +37176,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32578,7 +37196,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32586,7 +37204,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32594,11 +37212,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32614,7 +37232,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32622,11 +37240,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32642,7 +37260,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32650,11 +37268,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32670,7 +37288,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32678,11 +37296,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32698,7 +37316,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32706,7 +37324,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32714,11 +37332,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32734,7 +37352,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32742,7 +37360,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -32750,11 +37368,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32770,7 +37388,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32778,11 +37396,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32798,7 +37416,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -32806,11 +37424,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32826,7 +37444,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32834,11 +37452,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32854,7 +37472,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32862,11 +37480,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32882,7 +37500,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32890,11 +37508,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32910,7 +37528,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32918,11 +37536,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32938,7 +37556,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -32946,11 +37564,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32966,7 +37584,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -32974,11 +37592,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -32994,7 +37612,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33002,11 +37620,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33022,7 +37640,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33033,39 +37651,39 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33081,7 +37699,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33089,7 +37707,7 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33097,11 +37715,11 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33117,7 +37735,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33125,11 +37743,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33145,7 +37763,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33153,7 +37771,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33161,11 +37779,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33181,7 +37799,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33189,11 +37807,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33209,7 +37827,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33217,11 +37835,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33237,7 +37855,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33245,7 +37863,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33253,15 +37871,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -33273,7 +37891,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33281,7 +37899,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33289,15 +37907,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -33309,7 +37927,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33317,15 +37935,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -33337,7 +37955,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33345,15 +37963,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -33365,7 +37983,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33373,15 +37991,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -33393,7 +38011,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33401,7 +38019,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33409,15 +38027,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -33429,7 +38047,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33437,7 +38055,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33445,11 +38063,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33465,7 +38083,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33473,7 +38091,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33481,11 +38099,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33501,7 +38119,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33509,11 +38127,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33529,7 +38147,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33537,11 +38155,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33557,7 +38175,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33565,11 +38183,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33585,7 +38203,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33593,7 +38211,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33601,11 +38219,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33621,7 +38239,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33629,7 +38247,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33637,11 +38255,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33657,7 +38275,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33665,11 +38283,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33685,7 +38303,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -33693,11 +38311,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33713,7 +38331,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33721,11 +38339,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33741,7 +38359,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33749,11 +38367,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33769,7 +38387,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33777,11 +38395,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33797,7 +38415,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33805,11 +38423,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33825,7 +38443,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -33833,11 +38451,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33853,7 +38471,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33861,11 +38479,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33881,7 +38499,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33889,11 +38507,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33909,7 +38527,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33920,39 +38538,39 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -33968,7 +38586,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -33976,7 +38594,7 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -33984,11 +38602,11 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34004,7 +38622,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34012,11 +38630,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34032,7 +38650,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34040,7 +38658,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34048,11 +38666,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34068,7 +38686,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34076,11 +38694,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34096,7 +38714,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34104,11 +38722,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34124,7 +38742,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34132,7 +38750,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34140,15 +38758,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -34160,7 +38778,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34168,7 +38786,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34176,15 +38794,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -34196,7 +38814,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34204,15 +38822,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -34224,7 +38842,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34232,15 +38850,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -34252,7 +38870,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34260,15 +38878,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -34280,7 +38898,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34288,7 +38906,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34296,15 +38914,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -34316,7 +38934,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34324,7 +38942,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34332,11 +38950,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34352,7 +38970,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34360,7 +38978,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34368,11 +38986,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34388,7 +39006,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34396,11 +39014,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34416,7 +39034,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34424,11 +39042,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34444,7 +39062,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34452,11 +39070,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34472,7 +39090,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34480,7 +39098,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34488,11 +39106,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34508,7 +39126,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34516,7 +39134,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34524,11 +39142,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34544,7 +39162,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34552,11 +39170,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34572,7 +39190,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -34580,11 +39198,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34600,7 +39218,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34608,11 +39226,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34628,7 +39246,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34636,11 +39254,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34656,7 +39274,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34664,11 +39282,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34684,7 +39302,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34692,11 +39310,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34712,7 +39330,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -34720,11 +39338,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34740,7 +39358,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34748,11 +39366,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34768,7 +39386,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34776,11 +39394,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34796,7 +39414,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34807,39 +39425,39 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34855,7 +39473,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34863,7 +39481,7 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34871,11 +39489,11 @@ cont {
     scale: 14
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-s"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34891,7 +39509,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34899,11 +39517,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34919,7 +39537,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34927,7 +39545,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -34935,11 +39553,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34955,7 +39573,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34963,11 +39581,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -34983,7 +39601,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -34991,11 +39609,11 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35011,7 +39629,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35019,7 +39637,7 @@ cont {
     scale: 15
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35027,15 +39645,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -35047,7 +39665,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35055,7 +39673,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35063,15 +39681,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -35083,7 +39701,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35091,15 +39709,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -35111,7 +39729,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35119,15 +39737,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -35139,7 +39757,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35147,15 +39765,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -35167,7 +39785,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35175,7 +39793,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35183,15 +39801,15 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-m"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
-        height: 11
+        height: 12
         color: 1786635
         stroke_color: 855638016
         offset_y: 10
@@ -35203,7 +39821,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35211,7 +39829,7 @@ cont {
     scale: 16
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35219,11 +39837,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35239,7 +39857,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35247,7 +39865,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35255,11 +39873,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35275,7 +39893,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35283,11 +39901,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35303,7 +39921,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35311,11 +39929,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35331,7 +39949,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35339,11 +39957,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35359,7 +39977,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35367,7 +39985,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35375,11 +39993,11 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35395,7 +40013,7 @@ cont {
         offset_y: 10
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35403,7 +40021,7 @@ cont {
     scale: 17
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     apply_if: "!name"
   }
@@ -35411,11 +40029,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35431,7 +40049,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35439,11 +40057,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35459,7 +40077,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -35467,11 +40085,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35487,7 +40105,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35495,11 +40113,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35515,7 +40133,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35523,11 +40141,11 @@ cont {
     scale: 18
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35543,7 +40161,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35551,11 +40169,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35571,7 +40189,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35579,11 +40197,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35599,7 +40217,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "!name"
   }
@@ -35607,11 +40225,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35627,7 +40245,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35635,11 +40253,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35655,7 +40273,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35663,11 +40281,11 @@ cont {
     scale: 19
     area {
       color: 1778944
-      priority: -15879
+      priority: -15875
     }
     symbol {
       name: "park-l"
-      priority: 16121
+      priority: 16125
     }
     caption {
       primary {
@@ -35683,7 +40301,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15121
+      priority: 15125
     }
     apply_if: "name"
   }
@@ -35691,29 +40309,99 @@ cont {
 cont {
   name: "leisure-pitch"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 15
-    area {
-      color: 1118464
-      priority: -15946
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 16
     area {
       color: 1118464
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -35721,19 +40409,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -35741,19 +40429,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -35761,36 +40449,106 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-pitch-tennis"
   element {
+    scale: 12
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 15
-    area {
-      color: 1118464
-      priority: -15946
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 16
     area {
       color: 1118464
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 1118464
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35798,19 +40556,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 1118464
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35818,19 +40576,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 1118464
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35838,72 +40596,181 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-playground"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+  element {
     scale: 17
     area {
       color: 1118464
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
     }
   }
   element {
     scale: 18
     area {
       color: 1118464
-      priority: -15163
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16837
+      priority: 16833
+    }
+  }
+  element {
+    scale: 19
+    area {
+      color: 1118464
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+  }
+}
+cont {
+  name: "leisure-playground-tennis"
+  element {
+    scale: 12
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15833
     }
   }
   element {
-    scale: 19
-    area {
-      color: 1118464
-      priority: -15163
+    scale: 13
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
     symbol {
-      name: "pitch-l"
+      name: "tennis-l"
       apply_for_type: 1
-      priority: 16837
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
-}
-cont {
-  name: "leisure-playground-tennis"
   element {
     scale: 17
     area {
       color: 1118464
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35911,19 +40778,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 1118464
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35931,19 +40798,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 1118464
-      priority: -15149
+      priority: -15167
     }
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35951,18 +40818,98 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-playing_fields-tennis"
   element {
+    scale: 12
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35970,7 +40917,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -35978,7 +40925,7 @@ cont {
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -35986,7 +40933,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -35994,7 +40941,7 @@ cont {
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -36002,18 +40949,98 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-sports_centre"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16847
     }
     caption {
       primary {
@@ -36021,7 +41048,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15847
     }
   }
   element {
@@ -36029,7 +41056,7 @@ cont {
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16847
     }
     caption {
       primary {
@@ -36037,7 +41064,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15847
     }
   }
   element {
@@ -36045,7 +41072,7 @@ cont {
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16847
     }
     caption {
       primary {
@@ -36053,36 +41080,110 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15847
     }
   }
 }
 cont {
   name: "leisure-stadium"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 15
     area {
       color: 1118464
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 16
     area {
       color: 1118464
-      priority: -15946
+      priority: -15167
+    }
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -36090,19 +41191,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -36110,19 +41211,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -36130,87 +41231,104 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
 }
 cont {
   name: "leisure-swimming_pool"
   element {
+    scale: 12
+    symbol {
+      name: "swimming-l"
+      priority: 16847
+    }
+  }
+  element {
     scale: 13
     area {
       color: 8738
-      priority: -15771
+      priority: -15153
+    }
+    symbol {
+      name: "swimming-l"
+      priority: 16847
     }
   }
   element {
     scale: 14
     area {
       color: 8738
-      priority: -15771
+      priority: -15153
+    }
+    symbol {
+      name: "swimming-l"
+      priority: 16847
     }
   }
   element {
     scale: 15
     area {
       color: 8738
-      priority: -15771
+      priority: -15153
+    }
+    symbol {
+      name: "swimming-l"
+      priority: 16847
     }
   }
   element {
     scale: 16
     area {
       color: 8738
-      priority: -15771
+      priority: -15153
+    }
+    symbol {
+      name: "swimming-l"
+      priority: 16847
     }
   }
   element {
     scale: 17
     area {
       color: 8738
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "swimming-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
+      priority: 16847
     }
   }
   element {
     scale: 18
     area {
       color: 8738
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "swimming-l"
-      priority: 16864
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15864
+      priority: 16847
     }
   }
   element {
     scale: 19
     area {
       color: 8738
-      priority: -15136
+      priority: -15153
     }
     symbol {
       name: "swimming-l"
-      priority: 16864
+      priority: 16847
+    }
+  }
+}
+cont {
+  name: "leisure-water_park"
+  element {
+    scale: 12
+    symbol {
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -36218,80 +41336,59 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15819
     }
   }
-}
-cont {
-  name: "leisure-track"
   element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    scale: 13
+    symbol {
+      name: "diving-l"
+      priority: 16819
     }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.5
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
-    scale: 16
-    lines {
-      width: 1.8
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    scale: 14
+    symbol {
+      name: "diving-l"
+      priority: 16819
     }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
   element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    scale: 15
+    symbol {
+      name: "diving-l"
+      priority: 16819
     }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 2236962
-      priority: 1445
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "leisure-water_park"
   element {
     scale: 16
     symbol {
-      name: "swimming-m"
-      priority: 16864
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -36299,14 +41396,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15819
     }
   }
   element {
     scale: 17
     symbol {
-      name: "swimming-l"
-      priority: 16864
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -36314,37 +41411,37 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
-      name: "swimming-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "swimming-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -36354,14 +41451,14 @@ cont {
     scale: 12
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
     scale: 13
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36369,13 +41466,13 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36383,13 +41480,13 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36397,13 +41494,13 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36411,20 +41508,20 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -36432,20 +41529,20 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -36453,117 +41550,75 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
 cont {
-  name: "man_made-cutline"
-  element {
-    scale: 14
-    lines {
-      width: 4.0
-      color: 0
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    area {
-      color: 0
-      priority: -15730
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 4.0
-      color: 0
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    area {
-      color: 0
-      priority: -15730
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 4.0
-      color: 0
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    area {
-      color: 0
-      priority: -15730
-    }
-  }
+  name: "man_made-lighthouse"
   element {
-    scale: 17
-    lines {
-      width: 4.0
-      color: 0
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    scale: 12
+    symbol {
+      name: "lighthouse-l"
+      priority: 16861
     }
-    area {
-      color: 0
-      priority: -15730
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
-    scale: 18
-    lines {
-      width: 4.0
-      color: 0
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    scale: 13
+    symbol {
+      name: "lighthouse-l"
+      priority: 16861
     }
-    area {
-      color: 0
-      priority: -15730
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
-    scale: 19
-    lines {
-      width: 4.0
-      color: 0
-      priority: 1269
-      join: ROUNDJOIN
-      cap: BUTTCAP
+    scale: 14
+    symbol {
+      name: "lighthouse-l"
+      priority: 16861
     }
-    area {
-      color: 0
-      priority: -15730
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
-}
-cont {
-  name: "man_made-lighthouse"
   element {
     scale: 15
     symbol {
-      name: "lighthouse-m"
-      priority: 16878
+      name: "lighthouse-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -36571,14 +41626,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "lighthouse-m"
-      priority: 16878
+      name: "lighthouse-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -36586,14 +41641,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "lighthouse-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -36601,14 +41656,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "lighthouse-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -36616,14 +41671,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "lighthouse-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -36631,7 +41686,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -36641,14 +41696,14 @@ cont {
     scale: 12
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
     scale: 13
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36656,13 +41711,13 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36670,13 +41725,13 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36684,13 +41739,13 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1269
+      priority: 1262
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15730
+      priority: -15737
     }
   }
   element {
@@ -36698,20 +41753,20 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -36719,20 +41774,20 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -36740,142 +41795,317 @@ cont {
     lines {
       width: 4.0
       color: 0
-      priority: 1661
+      priority: 1665
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 0
-      priority: -15338
+      priority: -15334
     }
     caption {
       primary {
         height: 10
         color: 5592405
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
 cont {
-  name: "man_made-survey_point"
+  name: "man_made-windmill"
   element {
-    scale: 19
+    scale: 12
     symbol {
-      name: "survey_point-l"
-      apply_for_type: 1
-      priority: 16837
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "windmill-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "man_made-windmill"
   element {
     scale: 18
     symbol {
       name: "windmill-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "windmill-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "natural-bare_rock"
   element {
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
+  }
+  element {
     scale: 15
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -36885,112 +42115,112 @@ cont {
     scale: 10
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 11
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 12
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 13
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 14
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 17510
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 15
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 17510
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 16
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 17
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 18
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15229
+      priority: 15222
     }
   }
   element {
     scale: 19
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15229
+      priority: 15222
     }
   }
 }
@@ -37000,46 +42230,46 @@ cont {
     scale: 10
     area {
       color: 2631706
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 11
     area {
       color: 2631706
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 12
     area {
       color: 2631706
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 13
     area {
       color: 2631706
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 14
     area {
       color: 2631706
-      priority: -15811
+      priority: -15987
     }
   }
   element {
     scale: 15
     area {
       color: 2631706
-      priority: -15163
+      priority: -15181
     }
     symbol {
-      name: "beach-m"
-      priority: 16837
+      name: "beach-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -37047,18 +42277,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 16
     area {
       color: 2631706
-      priority: -15163
+      priority: -15181
     }
     symbol {
-      name: "beach-m"
-      priority: 16837
+      name: "beach-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -37066,64 +42296,64 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 17
     area {
       color: 2631706
-      priority: -15163
+      priority: -15181
     }
     symbol {
       name: "beach-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 18
     area {
       color: 2631706
-      priority: -15163
+      priority: -15181
     }
     symbol {
       name: "beach-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     area {
       color: 2631706
-      priority: -15163
+      priority: -15181
     }
     symbol {
       name: "beach-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
@@ -37195,9 +42425,9 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "cave-s"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37205,15 +42435,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 13
     symbol {
-      name: "cave-s"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37221,15 +42451,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 14
     symbol {
-      name: "cave-s"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37237,15 +42467,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 15
     symbol {
-      name: "cave-m"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37253,15 +42483,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "cave-m"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37269,15 +42499,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
-      name: "cave-m"
+      name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -37285,7 +42515,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -37293,15 +42523,15 @@ cont {
     symbol {
       name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
@@ -37309,15 +42539,15 @@ cont {
     symbol {
       name: "cave-l"
       apply_for_type: 1
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -37610,118 +42840,52 @@ cont {
 cont {
   name: "natural-grassland"
   element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-}
-cont {
-  name: "natural-heath"
-  element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15825
-    }
-  }
-  element {
     scale: 13
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15825
+      priority: -15820
     }
   }
 }
@@ -37731,84 +42895,84 @@ cont {
     scale: 0
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37816,7 +42980,7 @@ cont {
     scale: 10
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37824,14 +42988,14 @@ cont {
     scale: 11
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37839,7 +43003,7 @@ cont {
     scale: 11
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37847,14 +43011,14 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37862,7 +43026,7 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37870,7 +43034,7 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -37878,14 +43042,14 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37893,7 +43057,7 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37901,7 +43065,7 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -37909,14 +43073,14 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37924,7 +43088,7 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37932,7 +43096,7 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -37940,14 +43104,14 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37955,7 +43119,7 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37963,7 +43127,7 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -37971,14 +43135,14 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -37986,7 +43150,7 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -37994,7 +43158,7 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -38002,14 +43166,14 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -38017,7 +43181,7 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -38025,7 +43189,7 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -38033,14 +43197,14 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -38048,7 +43212,7 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -38056,7 +43220,7 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -38064,14 +43228,14 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -38079,7 +43243,7 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -38087,7 +43251,7 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -38236,254 +43400,272 @@ cont {
   }
 }
 cont {
-  name: "natural-marsh"
-  element {
-    scale: 11
-    area {
-      color: 6425
-      priority: -15798
-    }
-  }
+  name: "natural-peak"
   element {
     scale: 12
-    area {
-      color: 6425
-      priority: -15798
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
-  }
-  element {
-    scale: 13
-    area {
-      color: 6425
-      priority: -15798
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
+    apply_if: "name"
   }
   element {
-    scale: 14
-    area {
-      color: 6425
-      priority: -15798
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
-  }
-  element {
-    scale: 15
-    area {
-      color: 6425
-      priority: -15798
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 16
-    area {
-      color: 6425
-      priority: -15798
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 17510
+        color: 5592405
+        offset_y: 10
       }
-      priority: 15202
+      priority: 15861
     }
+    apply_if: "name"
   }
   element {
-    scale: 17
-    area {
-      color: 6425
-      priority: -15798
+    scale: 12
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 17510
+        color: 5592405
+        offset_y: 10
       }
-      priority: 15202
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 18
-    area {
-      color: 6425
-      priority: -15798
+    scale: 13
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 17510
+        color: 5592405
+        offset_y: 10
       }
-      priority: 15202
+      priority: 15861
     }
+    apply_if: "name"
   }
   element {
-    scale: 19
-    area {
-      color: 6425
-      priority: -15798
+    scale: 13
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
         height: 11
-        color: 17510
+        color: 5592405
+        offset_y: 10
       }
-      priority: 15202
+      priority: 15861
     }
+    apply_if: "!name"
   }
-}
-cont {
-  name: "natural-peak"
   element {
-    scale: 12
+    scale: 13
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
     apply_if: "name"
   }
   element {
-    scale: 12
+    scale: 13
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
-    apply_if: "name"
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
   }
   element {
-    scale: 13
+    scale: 14
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 9
+        height: 11
         color: 5592405
-        offset_y: 6
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
     apply_if: "name"
   }
   element {
-    scale: 13
+    scale: 14
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 9
+        height: 11
         color: 5592405
-        offset_y: 6
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
-    apply_if: "name"
+    apply_if: "!name"
   }
   element {
     scale: 14
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
-        offset_y: 6
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
     apply_if: "name"
   }
   element {
     scale: 14
     symbol {
-      name: "peakt-s"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
-        offset_y: 6
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
-    apply_if: "name"
+    apply_if: "!name"
   }
   element {
     scale: 15
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -38493,518 +43675,489 @@ cont {
     scale: 0
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 11
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 12
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 13
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 14
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 15
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 16
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 17
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 18
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 19
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
 }
 cont {
   name: "natural-rock"
   element {
-    scale: 15
+    scale: 12
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 16
+    scale: 12
     symbol {
-      name: "peakt-m"
-      priority: 16878
+      name: "peakt-l"
+      priority: 16861
     }
     caption {
       primary {
-        height: 1
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 17
+    scale: 13
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
       name: "peakt-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
-    }
-  }
-}
-cont {
-  name: "natural-salt_pond"
-  element {
-    scale: 0
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 1
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 2
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 3
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 4
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 5
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 6
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 7
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 8
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 9
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 10
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 8738
-      priority: -15771
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 8738
-      priority: -15771
+      priority: 15861
     }
+    apply_if: "!name"
   }
   element {
     scale: 14
-    area {
-      color: 8738
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
     }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+    apply_if: "!name"
   }
   element {
     scale: 15
-    area {
-      color: 8738
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 16
-    area {
-      color: 8738
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 17
-    area {
-      color: 8738
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 18
-    area {
-      color: 8738
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 19
-    area {
-      color: 8738
-      priority: -15771
+    symbol {
+      name: "peakt-l"
+      priority: 16861
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
 }
 cont {
   name: "natural-scrub"
   element {
-    scale: 12
-    area {
-      color: 1778944
-      priority: -15865
-    }
-  }
-  element {
     scale: 13
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15865
+      priority: -15862
     }
   }
 }
 cont {
   name: "natural-spring"
   element {
-    scale: 15
+    scale: 12
     symbol {
-      name: "drinking-water-m"
-      apply_for_type: 1
-      priority: 16878
+      name: "drinking-water-l"
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
-    scale: 16
+    scale: 13
     symbol {
-      name: "drinking-water-m"
-      priority: 16878
+      name: "drinking-water-l"
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
-    scale: 17
+    scale: 14
     symbol {
       name: "drinking-water-l"
-      priority: 16878
+      priority: 16847
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 8
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
-    scale: 18
+    scale: 15
     symbol {
       name: "drinking-water-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
-    scale: 19
+    scale: 16
     symbol {
       name: "drinking-water-l"
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "drinking-water-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
     }
   }
-}
-cont {
-  name: "natural-tree"
   element {
     scale: 18
     symbol {
-      name: "tree-m"
-      apply_for_type: 1
-      priority: 16837
+      name: "drinking-water-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
-      name: "tree-m"
-      apply_for_type: 1
-      priority: 16837
+      name: "drinking-water-l"
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
     }
   }
 }
@@ -39014,7 +44167,7 @@ cont {
     scale: 10
     symbol {
       name: "volcano-s"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39022,14 +44175,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 11
     symbol {
       name: "volcano-s"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39037,14 +44190,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 12
     symbol {
-      name: "volcano-s"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39052,14 +44205,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 13
     symbol {
-      name: "volcano-s"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39067,14 +44220,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 14
     symbol {
-      name: "volcano-s"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39082,14 +44235,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 15
     symbol {
-      name: "volcano-m"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39097,14 +44250,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "volcano-m"
-      priority: 16878
+      name: "volcano-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39112,14 +44265,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "volcano-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39127,14 +44280,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "volcano-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39142,14 +44295,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "volcano-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
@@ -39157,7 +44310,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -39167,84 +44320,84 @@ cont {
     scale: 0
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39252,7 +44405,7 @@ cont {
     scale: 10
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39260,14 +44413,14 @@ cont {
     scale: 11
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39275,7 +44428,7 @@ cont {
     scale: 11
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39283,14 +44436,14 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39298,7 +44451,7 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39306,7 +44459,7 @@ cont {
     scale: 12
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39314,14 +44467,14 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 9
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39329,7 +44482,7 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39337,7 +44490,7 @@ cont {
     scale: 13
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39345,14 +44498,14 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39360,14 +44513,14 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 17510
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39375,14 +44528,14 @@ cont {
     scale: 14
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39390,14 +44543,14 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39405,14 +44558,14 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 17510
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39420,14 +44573,14 @@ cont {
     scale: 15
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
-        height: 10
+        height: 8
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39435,14 +44588,14 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39450,14 +44603,14 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39465,14 +44618,14 @@ cont {
     scale: 16
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39480,14 +44633,14 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39495,14 +44648,14 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39510,14 +44663,14 @@ cont {
     scale: 17
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39525,14 +44678,14 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39540,14 +44693,14 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39555,14 +44708,14 @@ cont {
     scale: 18
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39570,14 +44723,14 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area>=4000000"
   }
@@ -39585,14 +44738,14 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15649
+      priority: -15653
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15351
+      priority: 15347
     }
     apply_if: "bbox_area<4000000"
   }
@@ -39600,14 +44753,14 @@ cont {
     scale: 19
     area {
       color: 8738
-      priority: -15041
+      priority: -15056
     }
     caption {
       primary {
         height: 11
         color: 17510
       }
-      priority: 15959
+      priority: 15944
     }
     apply_if: "bbox_area<10000000"
   }
@@ -39617,8 +44770,8 @@ cont {
   element {
     scale: 12
     symbol {
-      name: "waterfall-s"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39626,14 +44779,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 13
     symbol {
-      name: "waterfall-s"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39641,14 +44794,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 14
     symbol {
-      name: "waterfall-s"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39656,14 +44809,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 15
     symbol {
-      name: "waterfall-m"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39671,14 +44824,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "waterfall-m"
-      priority: 16878
+      name: "waterfall-l"
+      priority: 16861
     }
     caption {
       primary {
@@ -39686,52 +44839,52 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "waterfall-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "waterfall-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "waterfall-l"
-      priority: 16878
+      priority: 16861
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -39740,92 +44893,64 @@ cont {
   element {
     scale: 11
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 12
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 13
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 14
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 15
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 16
     area {
-      color: 6425
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 17510
-      }
-      priority: 15202
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 17
     area {
-      color: 6425
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 17510
-      }
-      priority: 15202
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 18
     area {
-      color: 6425
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 17510
-      }
-      priority: 15202
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 19
     area {
-      color: 6425
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 17510
-      }
-      priority: 15202
+      color: 3003130402
+      priority: -15806
     }
   }
 }
@@ -39834,92 +44959,64 @@ cont {
   element {
     scale: 11
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 12
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 13
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 14
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 15
     area {
-      color: 6425
-      priority: -15798
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 16
     area {
-      color: 6425
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 17510
-      }
-      priority: 15202
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 17
     area {
-      color: 6425
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 17510
-      }
-      priority: 15202
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 18
     area {
-      color: 6425
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 17510
-      }
-      priority: 15202
+      color: 3003130402
+      priority: -15806
     }
   }
   element {
     scale: 19
     area {
-      color: 6425
-      priority: -15798
-    }
-    caption {
-      primary {
-        height: 11
-        color: 17510
-      }
-      priority: 15202
+      color: 3003130402
+      priority: -15806
     }
   }
 }
@@ -39929,70 +45026,70 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
 }
@@ -40002,70 +45099,70 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
 }
@@ -40075,70 +45172,70 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
 }
@@ -40148,268 +45245,808 @@ cont {
     scale: 10
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 11
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 12
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 13
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 14
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 15
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 16
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 17
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 18
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
   element {
     scale: 19
     area {
       color: 1778944
-      priority: -15892
+      priority: -15889
     }
   }
 }
 cont {
   name: "office"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-company"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-estate_agent"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-government"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-lawyer"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "office-telecommunication"
   element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
@@ -40420,7 +46057,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40430,7 +46067,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40440,7 +46077,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40450,7 +46087,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40460,7 +46097,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40470,7 +46107,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40480,7 +46117,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40493,7 +46130,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40503,7 +46140,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40513,7 +46150,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40523,7 +46160,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40533,7 +46170,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40543,7 +46180,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40553,7 +46190,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40566,7 +46203,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40576,7 +46213,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40586,7 +46223,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40596,7 +46233,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40606,7 +46243,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40616,7 +46253,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40626,7 +46263,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40639,7 +46276,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40649,7 +46286,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40659,7 +46296,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40669,7 +46306,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40679,7 +46316,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40689,7 +46326,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40699,7 +46336,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40712,7 +46349,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40722,7 +46359,7 @@ cont {
     lines {
       width: 1.0
       color: 16711680
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40732,7 +46369,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40742,7 +46379,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40752,7 +46389,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40762,7 +46399,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40772,7 +46409,7 @@ cont {
     lines {
       width: 1.6
       color: 5131837
-      priority: 1945
+      priority: 1930
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40785,7 +46422,7 @@ cont {
     lines {
       width: 0.8
       color: 3355443
-      priority: 1081
+      priority: 1083
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40795,7 +46432,7 @@ cont {
     lines {
       width: 1.1
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40805,7 +46442,7 @@ cont {
     lines {
       width: 1.1
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40815,7 +46452,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40825,7 +46462,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40835,7 +46472,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40848,7 +46485,7 @@ cont {
     lines {
       width: 1.0
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40858,7 +46495,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40868,7 +46505,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40878,7 +46515,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40888,7 +46525,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40898,7 +46535,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40911,7 +46548,7 @@ cont {
     lines {
       width: 1.0
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40921,7 +46558,7 @@ cont {
     lines {
       width: 1.6
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40931,7 +46568,7 @@ cont {
     lines {
       width: 1.6
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40941,7 +46578,7 @@ cont {
     lines {
       width: 1.8
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40951,7 +46588,7 @@ cont {
     lines {
       width: 1.8
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40961,7 +46598,7 @@ cont {
     lines {
       width: 1.8
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -40974,7 +46611,7 @@ cont {
     lines {
       width: 1.0
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40984,7 +46621,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -40994,7 +46631,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41004,7 +46641,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41014,7 +46651,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41024,7 +46661,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41037,7 +46674,7 @@ cont {
     lines {
       width: 1.0
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41047,7 +46684,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41057,7 +46694,7 @@ cont {
     lines {
       width: 1.6
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41067,7 +46704,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41077,7 +46714,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41087,7 +46724,7 @@ cont {
     lines {
       width: 1.8
       color: 3355443
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41100,7 +46737,7 @@ cont {
     lines {
       width: 1.0
       color: 4456448
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41110,7 +46747,7 @@ cont {
     lines {
       width: 1.6
       color: 860094464
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41120,7 +46757,7 @@ cont {
     lines {
       width: 1.6
       color: 860094464
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41130,7 +46767,7 @@ cont {
     lines {
       width: 1.8
       color: 4456448
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41140,7 +46777,7 @@ cont {
     lines {
       width: 1.8
       color: 4456448
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41150,7 +46787,7 @@ cont {
     lines {
       width: 1.8
       color: 4456448
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41163,7 +46800,7 @@ cont {
     lines {
       width: 1.0
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41173,7 +46810,7 @@ cont {
     lines {
       width: 1.6
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41183,7 +46820,7 @@ cont {
     lines {
       width: 1.6
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41193,7 +46830,7 @@ cont {
     lines {
       width: 1.8
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41203,7 +46840,7 @@ cont {
     lines {
       width: 1.8
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41213,7 +46850,7 @@ cont {
     lines {
       width: 1.8
       color: 17408
-      priority: 1229
+      priority: 1222
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41226,7 +46863,7 @@ cont {
     lines {
       width: 0.8
       color: 3355443
-      priority: 1081
+      priority: 1083
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41236,7 +46873,7 @@ cont {
     lines {
       width: 1.1
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41246,7 +46883,7 @@ cont {
     lines {
       width: 1.1
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41256,7 +46893,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41266,7 +46903,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41276,7 +46913,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41289,7 +46926,7 @@ cont {
     lines {
       width: 0.8
       color: 3355443
-      priority: 1081
+      priority: 1083
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41299,7 +46936,7 @@ cont {
     lines {
       width: 1.1
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -41309,7 +46946,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41319,7 +46956,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41329,7 +46966,7 @@ cont {
     lines {
       width: 1.5
       color: 3355443
-      priority: 1324
+      priority: 1319
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -41342,17 +46979,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -41361,17 +46998,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -41380,17 +47017,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -41399,17 +47036,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -41418,17 +47055,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -41437,17 +47074,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -41456,17 +47093,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41475,17 +47112,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41493,18 +47130,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41512,18 +47149,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41532,17 +47169,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41551,16 +47189,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41568,17 +47206,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41587,16 +47225,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41605,16 +47243,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41623,16 +47261,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41641,16 +47279,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41659,16 +47297,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41677,16 +47315,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41695,16 +47333,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41713,16 +47351,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -41733,17 +47371,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -41752,17 +47390,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -41771,17 +47409,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -41790,17 +47428,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -41809,17 +47447,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -41828,17 +47466,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -41847,17 +47485,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41866,17 +47504,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41884,18 +47522,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41903,18 +47541,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -41923,17 +47561,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41942,16 +47581,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41959,17 +47598,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41978,16 +47617,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -41996,16 +47635,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42014,16 +47653,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42032,16 +47671,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42050,16 +47689,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42068,16 +47707,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42086,16 +47725,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42104,16 +47743,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -42124,17 +47763,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -42143,17 +47782,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -42162,17 +47801,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -42181,17 +47820,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -42200,17 +47839,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -42219,17 +47858,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -42238,17 +47877,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42257,17 +47896,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42275,18 +47914,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42294,18 +47933,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42314,17 +47953,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42333,16 +47973,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42350,17 +47990,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42369,16 +48009,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42387,16 +48027,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42405,16 +48045,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42423,16 +48063,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42441,16 +48081,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42459,16 +48099,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42477,16 +48117,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42495,16 +48135,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -42515,17 +48155,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -42534,17 +48174,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -42553,17 +48193,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -42572,17 +48212,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -42591,17 +48231,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -42610,17 +48250,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -42629,17 +48269,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42648,17 +48288,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42666,18 +48306,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42685,18 +48325,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -42705,17 +48345,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42724,16 +48365,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42741,17 +48382,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42760,16 +48401,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42778,16 +48419,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42796,16 +48437,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42814,16 +48455,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42832,16 +48473,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42850,16 +48491,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42868,16 +48509,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -42886,16 +48527,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -42906,23 +48547,23 @@ cont {
     symbol {
       name: "star-s"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 3
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 9
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -42930,23 +48571,23 @@ cont {
     symbol {
       name: "star-m"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 10
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 3
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 9
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -42954,23 +48595,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
-        height: 11
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 4
+        height: 9
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -42978,23 +48619,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 5
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 11
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43002,23 +48643,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
-        height: 11
-        color: 11711154
-        stroke_color: 1118464
+        height: 12
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 5
       }
       secondary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 11
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43026,23 +48667,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 5
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 11
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43050,23 +48691,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 3
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 9
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43074,23 +48715,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43098,23 +48739,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43122,23 +48763,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43146,23 +48787,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43170,23 +48811,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43194,23 +48835,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43218,23 +48859,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43242,23 +48883,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
   element {
@@ -43266,23 +48907,23 @@ cont {
     symbol {
       name: "star-l"
       apply_for_type: 1
-      priority: 16797
+      priority: 16805
     }
     caption {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 4
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 10
         text: "int_name"
       }
-      priority: 15797
+      priority: 15805
     }
   }
 }
@@ -43293,17 +48934,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -43312,17 +48953,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -43331,17 +48972,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -43350,17 +48991,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -43369,17 +49010,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -43388,17 +49029,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -43407,17 +49048,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43426,17 +49067,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43444,18 +49085,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43463,18 +49104,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43483,17 +49124,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43502,16 +49144,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43519,17 +49161,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43538,16 +49180,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43556,16 +49198,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43574,16 +49216,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43592,16 +49234,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43610,16 +49252,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43628,16 +49270,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43646,16 +49288,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43664,16 +49306,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -43684,17 +49326,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -43703,17 +49345,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -43722,17 +49364,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -43741,17 +49383,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -43760,17 +49402,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -43779,17 +49421,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -43798,17 +49440,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43817,17 +49459,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43835,18 +49477,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43854,18 +49496,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -43874,17 +49516,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43893,16 +49536,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43910,17 +49553,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43929,16 +49572,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43947,16 +49590,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43965,16 +49608,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -43983,16 +49626,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44001,16 +49644,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44019,16 +49662,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44037,16 +49680,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44055,16 +49698,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -44075,17 +49718,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44094,17 +49737,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44113,17 +49756,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44132,17 +49775,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44151,17 +49794,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44170,17 +49813,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44189,17 +49832,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44208,17 +49851,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44226,18 +49869,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44245,18 +49888,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44265,17 +49908,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44284,16 +49928,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44301,17 +49945,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44320,16 +49964,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44338,16 +49982,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44356,16 +50000,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44374,16 +50018,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44392,16 +50036,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44410,16 +50054,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44428,16 +50072,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44446,16 +50090,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -44466,17 +50110,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44485,17 +50129,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44504,17 +50148,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44523,17 +50167,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44542,17 +50186,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44561,17 +50205,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44580,17 +50224,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44599,17 +50243,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44617,18 +50261,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44636,18 +50280,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44656,17 +50300,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44675,16 +50320,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44692,17 +50337,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44711,16 +50356,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44729,16 +50374,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44747,16 +50392,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44765,16 +50410,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44783,16 +50428,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44801,16 +50446,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44819,16 +50464,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -44837,16 +50482,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -44857,17 +50502,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44876,17 +50521,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -44895,17 +50540,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44914,17 +50559,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -44933,17 +50578,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44952,17 +50597,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -44971,17 +50616,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -44990,17 +50635,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45008,18 +50653,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45027,18 +50672,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45047,17 +50692,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45066,16 +50712,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45083,17 +50729,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45102,16 +50748,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45120,16 +50766,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45138,16 +50784,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45156,16 +50802,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45174,16 +50820,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45192,16 +50838,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45210,16 +50856,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45228,16 +50874,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -45248,17 +50894,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -45267,17 +50913,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -45286,17 +50932,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -45305,17 +50951,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -45324,17 +50970,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -45343,17 +50989,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -45362,17 +51008,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45381,17 +51027,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45399,18 +51045,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45418,18 +51064,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45438,17 +51084,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45457,16 +51104,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45474,17 +51121,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45493,16 +51140,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45511,16 +51158,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45529,16 +51176,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45547,16 +51194,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45565,16 +51212,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45583,16 +51230,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45601,16 +51248,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45619,16 +51266,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -45639,17 +51286,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -45658,17 +51305,17 @@ cont {
     caption {
       primary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 8
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=1000000"
   }
@@ -45677,17 +51324,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -45696,17 +51343,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=150000"
   }
@@ -45715,17 +51362,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -45734,17 +51381,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=50000"
   }
@@ -45753,17 +51400,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45772,17 +51419,17 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45790,18 +51437,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45809,18 +51456,18 @@ cont {
     scale: 8
     caption {
       primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1118464
+        height: 11
+        color: 3355443
+        stroke_color: 1712394496
       }
       secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1118464
+        height: 10
+        color: 3355443
+        stroke_color: 1712394496
         offset_y: 20
         text: "int_name"
       }
-      priority: 15783
+      priority: 15791
     }
     apply_if: "population>=40000"
   }
@@ -45829,17 +51476,18 @@ cont {
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1118464
-        offset_y: 20
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 4
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45848,16 +51496,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 437326080
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45865,17 +51513,17 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 1118464
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45884,16 +51532,16 @@ cont {
       primary {
         height: 13
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 11
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45902,16 +51550,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45920,16 +51568,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45938,16 +51586,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45956,16 +51604,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45974,16 +51622,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -45992,16 +51640,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
   element {
@@ -46010,16 +51658,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15756
+      priority: 15763
     }
   }
 }
@@ -46032,17 +51680,17 @@ cont {
         height: 12
         color: 4473924
       }
-      priority: 15648
+      priority: 15652
     }
   }
   element {
     scale: 2
     caption {
       primary {
-        height: 12
+        height: 14
         color: 4473924
       }
-      priority: 15648
+      priority: 15652
     }
   }
 }
@@ -46061,7 +51709,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46077,23 +51725,23 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
     scale: 5
     caption {
       primary {
-        height: 13
+        height: 14
         color: 4473924
       }
       secondary {
-        height: 11
+        height: 12
         color: 4473924
         offset_y: 20
         text: "int_name"
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46109,7 +51757,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46119,7 +51767,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46129,7 +51777,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46139,7 +51787,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46149,7 +51797,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46159,7 +51807,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46169,7 +51817,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46179,7 +51827,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46189,7 +51837,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46199,7 +51847,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46209,7 +51857,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46219,7 +51867,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46229,7 +51877,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
   element {
@@ -46239,7 +51887,7 @@ cont {
         height: 15
         color: 4473924
       }
-      priority: 15662
+      priority: 15666
     }
   }
 }
@@ -46348,77 +51996,77 @@ cont {
     scale: 13
     caption {
       primary {
-        height: 11
-        color: 6710886
-        stroke_color: 1712394496
+        height: 12
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 11
-        color: 6710886
-        stroke_color: 1712394496
+        height: 12
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 11
-        color: 6710886
-        stroke_color: 1712394496
+        height: 12
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 11
-        color: 6710886
-        stroke_color: 1712394496
+        height: 12
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 11
-        color: 6710886
-        stroke_color: 1712394496
+        height: 12
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 11
-        color: 6710886
-        stroke_color: 1712394496
+        height: 12
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 15689
+      priority: 15694
     }
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 11
-        color: 6710886
-        stroke_color: 1712394496
+        height: 12
+        color: 4473924
+        stroke_color: 3004240128
       }
-      priority: 15689
+      priority: 15694
     }
   }
 }
@@ -46428,7 +52076,7 @@ cont {
     scale: 12
     caption {
       primary {
-        height: 9
+        height: 10
         color: 5592405
       }
       priority: 15000
@@ -46438,7 +52086,7 @@ cont {
     scale: 13
     caption {
       primary {
-        height: 9
+        height: 10
         color: 5592405
       }
       priority: 15000
@@ -46448,7 +52096,7 @@ cont {
     scale: 14
     caption {
       primary {
-        height: 9
+        height: 10
         color: 5592405
       }
       priority: 15000
@@ -46458,7 +52106,7 @@ cont {
     scale: 15
     caption {
       primary {
-        height: 9
+        height: 10
         color: 5592405
       }
       priority: 15000
@@ -46468,7 +52116,7 @@ cont {
     scale: 16
     caption {
       primary {
-        height: 9
+        height: 10
         color: 5592405
       }
       priority: 15000
@@ -46478,7 +52126,7 @@ cont {
     scale: 17
     caption {
       primary {
-        height: 9
+        height: 10
         color: 5592405
       }
       priority: 15000
@@ -46488,7 +52136,7 @@ cont {
     scale: 18
     caption {
       primary {
-        height: 9
+        height: 10
         color: 5592405
       }
       priority: 15000
@@ -46498,7 +52146,7 @@ cont {
     scale: 19
     caption {
       primary {
-        height: 9
+        height: 10
         color: 5592405
       }
       priority: 15000
@@ -46506,79 +52154,6 @@ cont {
   }
 }
 cont {
-  name: "place-islet"
-  element {
-    scale: 10
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 11
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 12
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 13
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 14
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 15
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 16
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 0
-      priority: -16700
-    }
-  }
-}
-cont {
   name: "place-isolated_dwelling"
   element {
     scale: 14
@@ -46905,190 +52480,190 @@ cont {
     scale: 1
     caption {
       primary {
-        height: 14
+        height: 15
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 2
     caption {
       primary {
-        height: 14
+        height: 15
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 3
     caption {
       primary {
-        height: 15
+        height: 16
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 4
     caption {
       primary {
-        height: 16
+        height: 17
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 5
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 6
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 7
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 8
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 9
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 10
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 11
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 18
+        height: 19
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
 }
@@ -47121,160 +52696,160 @@ cont {
     scale: 4
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 5
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 6
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 7
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 8
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 9
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 10
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 11
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 12
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 12
+        height: 14
         color: 17510
       }
-      priority: 15918
+      priority: 15902
     }
   }
 }
@@ -47303,7 +52878,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47319,7 +52894,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47335,7 +52910,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47351,7 +52926,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
 }
@@ -47390,7 +52965,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47406,7 +52981,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47422,7 +52997,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
   element {
@@ -47438,7 +53013,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15675
+      priority: 15680
     }
   }
 }
@@ -47516,7 +53091,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
     apply_if: "population>=40000"
   }
@@ -47533,7 +53108,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
     apply_if: "population>=40000"
   }
@@ -47550,7 +53125,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
     apply_if: "population>=20000"
   }
@@ -47567,7 +53142,7 @@ cont {
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
     apply_if: "population>=20000"
   }
@@ -47577,16 +53152,16 @@ cont {
       primary {
         height: 10
         color: 10066329
-        stroke_color: 1292964096
+        stroke_color: 1118464
       }
       secondary {
         height: 9
         color: 10066329
-        stroke_color: 1292964096
+        stroke_color: 1118464
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47595,16 +53170,16 @@ cont {
       primary {
         height: 11
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47613,16 +53188,16 @@ cont {
       primary {
         height: 12
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
       }
       secondary {
         height: 10
         color: 7829367
-        stroke_color: 1118464
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47631,16 +53206,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47649,16 +53224,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47667,16 +53242,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47685,16 +53260,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47703,16 +53278,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47721,16 +53296,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
   element {
@@ -47739,16 +53314,16 @@ cont {
       primary {
         height: 14
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
         height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15743
+      priority: 15750
     }
   }
 }
@@ -47760,9 +53335,9 @@ cont {
       primary {
         height: 10
         color: 10066329
-        stroke_color: 1292964096
+        stroke_color: 0
       }
-      priority: 15729
+      priority: 15736
     }
   }
   element {
@@ -47771,280 +53346,142 @@ cont {
       primary {
         height: 11
         color: 10066329
-        stroke_color: 1292964096
+        stroke_color: 0
       }
       secondary {
         height: 9
         color: 10066329
-        stroke_color: 1292964096
+        stroke_color: 0
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 13
     caption {
       primary {
-        height: 12
+        height: 13
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 14
     caption {
       primary {
-        height: 12
+        height: 13
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 15
     caption {
       primary {
-        height: 12
+        height: 13
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 16
     caption {
       primary {
-        height: 12
+        height: 13
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 17
     caption {
       primary {
-        height: 12
+        height: 13
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 18
     caption {
       primary {
-        height: 12
+        height: 13
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
+      priority: 15708
     }
   }
   element {
     scale: 19
     caption {
       primary {
-        height: 12
+        height: 13
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
       }
       secondary {
-        height: 10
+        height: 12
         color: 7829367
-        stroke_color: 856756480
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15702
-    }
-  }
-}
-cont {
-  name: "power-line"
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 5131837
-      priority: 1810
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "power-line-underground"
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 5131837
-      priority: 1810
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "power-station"
-  element {
-    scale: 18
-    symbol {
-      name: "power-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "power-l"
-      priority: 16837
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15837
-    }
-  }
-}
-cont {
-  name: "power-tower"
-  element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dot-m"
-      priority: 16851
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15851
-    }
-  }
-}
-cont {
-  name: "public_transport-platform"
-  element {
-    scale: 16
-    area {
-      color: 3026460
-      priority: -15838
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 3026460
-      priority: -15838
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 3026460
-      priority: -15838
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3026460
-      priority: -15838
+      priority: 15708
     }
   }
 }
@@ -48059,7 +53496,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48073,7 +53510,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48087,7 +53524,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48101,7 +53538,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48118,7 +53555,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48132,7 +53569,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48146,7 +53583,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48160,7 +53597,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48177,7 +53614,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48191,7 +53628,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48205,7 +53642,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48219,7 +53656,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48236,7 +53673,7 @@ cont {
         dd: 1.8
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48250,40 +53687,13 @@ cont {
         dd: 1.8
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "railway-crossing"
-  element {
-    scale: 17
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "railway-crossing"
-      apply_for_type: 1
-      priority: 16864
-    }
-  }
-}
-cont {
   name: "railway-disused"
   element {
     scale: 18
@@ -48294,7 +53704,7 @@ cont {
         dd: 1.8
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48308,7 +53718,7 @@ cont {
         dd: 1.8
         dd: 5.4
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48321,7 +53731,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48331,7 +53741,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48341,7 +53751,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48351,7 +53761,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48361,7 +53771,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48371,7 +53781,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48381,7 +53791,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48394,7 +53804,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48404,7 +53814,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48414,7 +53824,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48424,7 +53834,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48434,7 +53844,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48444,7 +53854,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48454,7 +53864,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48467,7 +53877,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48477,7 +53887,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48487,7 +53897,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48497,7 +53907,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48507,7 +53917,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48517,7 +53927,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48527,7 +53937,7 @@ cont {
     lines {
       width: 3.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -48536,75 +53946,27 @@ cont {
 cont {
   name: "railway-halt"
   element {
-    scale: 12
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 8
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "train-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -48612,47 +53974,47 @@ cont {
     symbol {
       name: "train-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 16
     symbol {
-      name: "train-m"
+      name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -48660,23 +54022,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -48684,23 +54046,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -48708,23 +54070,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -48869,14 +54231,14 @@ cont {
     lines {
       width: 2.4
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48893,14 +54255,14 @@ cont {
     lines {
       width: 2.8
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.4
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48917,14 +54279,14 @@ cont {
     lines {
       width: 3.0
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48952,14 +54314,14 @@ cont {
     lines {
       width: 6.4
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -48987,14 +54349,14 @@ cont {
     lines {
       width: 6.4
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49022,14 +54384,14 @@ cont {
     lines {
       width: 6.4
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49236,7 +54598,7 @@ cont {
     lines {
       width: 1.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49246,7 +54608,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49256,7 +54618,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49266,7 +54628,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49276,7 +54638,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49286,7 +54648,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49299,7 +54661,7 @@ cont {
     lines {
       width: 1.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49309,7 +54671,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49319,7 +54681,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49329,7 +54691,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49339,7 +54701,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49349,7 +54711,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49362,7 +54724,7 @@ cont {
     lines {
       width: 1.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49372,7 +54734,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49382,7 +54744,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49392,7 +54754,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49402,7 +54764,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49412,7 +54774,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49425,7 +54787,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49435,7 +54797,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49445,7 +54807,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49455,7 +54817,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49465,7 +54827,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49478,7 +54840,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49488,7 +54850,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49498,7 +54860,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49508,7 +54870,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49518,7 +54880,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49531,7 +54893,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49541,7 +54903,7 @@ cont {
     lines {
       width: 1.2
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49551,7 +54913,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49561,7 +54923,7 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49571,44 +54933,13 @@ cont {
     lines {
       width: 2.0
       color: 2171161
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
   }
 }
 cont {
-  name: "railway-platform"
-  element {
-    scale: 16
-    area {
-      color: 3026460
-      priority: -15838
-    }
-  }
-  element {
-    scale: 17
-    area {
-      color: 3026460
-      priority: -15838
-    }
-  }
-  element {
-    scale: 18
-    area {
-      color: 3026460
-      priority: -15838
-    }
-  }
-  element {
-    scale: 19
-    area {
-      color: 3026460
-      priority: -15838
-    }
-  }
-}
-cont {
   name: "railway-preserved"
   element {
     scale: 16
@@ -49619,7 +54950,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49633,7 +54964,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49647,7 +54978,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49661,7 +54992,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49678,7 +55009,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49692,7 +55023,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49706,7 +55037,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49720,7 +55051,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49737,7 +55068,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49751,7 +55082,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49765,7 +55096,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49779,7 +55110,7 @@ cont {
         dd: 6.3
         dd: 6.3
       }
-      priority: 1391
+      priority: 1388
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -49966,14 +55297,14 @@ cont {
     lines {
       width: 2.4
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.0
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -49990,14 +55321,14 @@ cont {
     lines {
       width: 2.8
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.4
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50014,14 +55345,14 @@ cont {
     lines {
       width: 3.0
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 3.6
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50049,14 +55380,14 @@ cont {
     lines {
       width: 6.4
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50084,14 +55415,14 @@ cont {
     lines {
       width: 6.4
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50119,14 +55450,14 @@ cont {
     lines {
       width: 6.4
       color: 2236945
-      priority: 1107
+      priority: 1110
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     lines {
       width: 8.0
       color: 4473924
-      priority: 1093
+      priority: 1096
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -50486,51 +55817,27 @@ cont {
 cont {
   name: "railway-station"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "train-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50538,47 +55845,47 @@ cont {
     symbol {
       name: "train-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 16
     symbol {
-      name: "train-m"
+      name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50586,23 +55893,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50610,23 +55917,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50634,74 +55941,50 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
 cont {
   name: "railway-station-light_rail"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "train-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50709,47 +55992,47 @@ cont {
     symbol {
       name: "train-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 16
     symbol {
-      name: "train-m"
+      name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50757,23 +56040,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50781,23 +56064,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50805,74 +56088,50 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
 cont {
   name: "railway-station-monorail"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "train-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50880,47 +56139,47 @@ cont {
     symbol {
       name: "train-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 16
     symbol {
-      name: "train-m"
+      name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50928,23 +56187,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50952,23 +56211,23 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -50976,74 +56235,50 @@ cont {
     symbol {
       name: "train-l"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
 cont {
   name: "railway-station-subway"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51051,23 +56286,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51075,23 +56310,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51099,23 +56334,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51123,23 +56358,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51147,74 +56382,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-barcelona"
   element {
-    scale: 13
-    symbol {
-      name: "subway-barcelona-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-barcelona-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51222,170 +56433,146 @@ cont {
     symbol {
       name: "subway-barcelona-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-barcelona-m"
+      name: "subway-barcelona-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-barcelona-m"
+      name: "subway-barcelona-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-barcelona-m"
+      name: "subway-barcelona-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-barcelona-m"
+      name: "subway-barcelona-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-berlin"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-berlin-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51393,170 +56580,146 @@ cont {
     symbol {
       name: "subway-berlin-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-berlin-m"
+      name: "subway-berlin-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-berlin-m"
+      name: "subway-berlin-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-berlin-m"
+      name: "subway-berlin-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-berlin-m"
+      name: "subway-berlin-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-blue"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51564,23 +56727,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51588,23 +56751,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51612,23 +56775,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51636,23 +56799,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51660,74 +56823,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-brown"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51735,23 +56874,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51759,23 +56898,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51783,23 +56922,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51807,23 +56946,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51831,74 +56970,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-darkgreen"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51906,23 +57021,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51930,23 +57045,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51954,23 +57069,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -51978,23 +57093,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52002,74 +57117,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-gray"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52077,23 +57168,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52101,23 +57192,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52125,23 +57216,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52149,23 +57240,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52173,74 +57264,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-green"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52248,23 +57315,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52272,23 +57339,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52296,23 +57363,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52320,23 +57387,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52344,74 +57411,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-grey"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52419,23 +57462,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52443,23 +57486,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52467,23 +57510,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52491,23 +57534,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52515,23 +57558,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -52547,17 +57590,10 @@ cont {
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
       priority: 15027
     }
   }
@@ -52566,23 +57602,23 @@ cont {
     symbol {
       name: "subway-kiev-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52590,23 +57626,23 @@ cont {
     symbol {
       name: "subway-kiev-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52614,7 +57650,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -52624,11 +57660,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52636,7 +57672,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -52646,11 +57682,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52658,7 +57694,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -52668,11 +57704,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52680,7 +57716,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -52690,62 +57726,38 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-lightblue"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52753,23 +57765,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52777,23 +57789,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52801,23 +57813,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52825,23 +57837,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52849,74 +57861,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-lightgreen"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52924,23 +57912,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52948,23 +57936,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52972,23 +57960,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -52996,23 +57984,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53020,74 +58008,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-london"
   element {
-    scale: 13
-    symbol {
-      name: "subway-london-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-london-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53095,170 +58059,146 @@ cont {
     symbol {
       name: "subway-london-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-london-m"
+      name: "subway-london-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-london-m"
+      name: "subway-london-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-london-m"
+      name: "subway-london-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-london-m"
+      name: "subway-london-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-madrid"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-madrid-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53266,119 +58206,119 @@ cont {
     symbol {
       name: "subway-madrid-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-madrid-m"
+      name: "subway-madrid-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-madrid-m"
+      name: "subway-madrid-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-madrid-m"
+      name: "subway-madrid-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-madrid-m"
+      name: "subway-madrid-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -53389,71 +58329,64 @@ cont {
     symbol {
       name: "subway-minsk-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 4
       }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 14
     symbol {
-      name: "subway-minsk-s"
+      name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 5
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 15
     symbol {
-      name: "subway-minsk-m"
+      name: "subway-minsk-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 5
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53461,7 +58394,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53471,11 +58404,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53483,7 +58416,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53493,11 +58426,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53505,7 +58438,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53515,11 +58448,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53527,7 +58460,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53537,11 +58470,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -53552,7 +58485,7 @@ cont {
     symbol {
       name: "subway-moscow-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
   }
   element {
@@ -53560,23 +58493,23 @@ cont {
     symbol {
       name: "subway-moscow-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 5
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53584,47 +58517,47 @@ cont {
     symbol {
       name: "subway-moscow-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 5
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 14
     symbol {
-      name: "subway-moscow-s"
+      name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
-        height: 11
-        color: 11711154
+        height: 12
+        color: 3355443
         stroke_color: 1118464
         offset_y: 8
       }
       secondary {
-        height: 9
-        color: 11711154
+        height: 10
+        color: 3355443
         stroke_color: 1118464
         offset_y: 24
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53632,23 +58565,23 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 9
       }
       secondary {
         height: 10
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 24
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53656,7 +58589,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53670,7 +58603,7 @@ cont {
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53678,7 +58611,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53692,7 +58625,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53700,7 +58633,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53714,7 +58647,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53722,7 +58655,7 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -53736,58 +58669,34 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-newyork"
   element {
-    scale: 13
-    symbol {
-      name: "subway-newyork-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-newyork-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53795,23 +58704,23 @@ cont {
     symbol {
       name: "subway-newyork-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53819,23 +58728,23 @@ cont {
     symbol {
       name: "subway-newyork-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53843,23 +58752,23 @@ cont {
     symbol {
       name: "subway-newyork-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53867,23 +58776,23 @@ cont {
     symbol {
       name: "subway-newyork-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53891,74 +58800,50 @@ cont {
     symbol {
       name: "subway-newyork-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-orange"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53966,23 +58851,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -53990,23 +58875,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54014,23 +58899,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54038,23 +58923,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54062,23 +58947,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -54089,23 +58974,7 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
+      priority: 16000
     }
   }
   element {
@@ -54113,23 +58982,23 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54137,170 +59006,146 @@ cont {
     symbol {
       name: "subway-paris-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 16
     symbol {
-      name: "subway-paris-m"
+      name: "subway-paris-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-paris-m"
+      name: "subway-paris-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-paris-m"
+      name: "subway-paris-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-paris-m"
+      name: "subway-paris-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-purple"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54308,23 +59153,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54332,23 +59177,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54356,23 +59201,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54380,23 +59225,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54404,74 +59249,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-red"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54479,23 +59300,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54503,23 +59324,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54527,23 +59348,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54551,23 +59372,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54575,74 +59396,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-roma"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-rome-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54650,23 +59447,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54674,23 +59471,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54698,7 +59495,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54708,11 +59505,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54720,7 +59517,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54730,11 +59527,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54742,7 +59539,7 @@ cont {
     symbol {
       name: "none"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54752,11 +59549,11 @@ cont {
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -54767,7 +59564,7 @@ cont {
     symbol {
       name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
   }
   element {
@@ -54775,23 +59572,23 @@ cont {
     symbol {
       name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 5
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54799,23 +59596,23 @@ cont {
     symbol {
       name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1712394496
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 5
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54823,47 +59620,47 @@ cont {
     symbol {
       name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 1292964096
-        offset_y: 7
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
     scale: 15
     symbol {
-      name: "subway-spb-m"
+      name: "subway-spb-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
-        offset_y: 7
+        color: 3355443
+        stroke_color: 2148602112
+        offset_y: 8
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54871,7 +59668,7 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54885,7 +59682,7 @@ cont {
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54893,7 +59690,7 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54907,7 +59704,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54915,7 +59712,7 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54929,7 +59726,7 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -54937,7 +59734,7 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
@@ -54951,58 +59748,34 @@ cont {
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-violet"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55010,23 +59783,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55034,23 +59807,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55058,23 +59831,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55082,23 +59855,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55106,74 +59879,50 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
 cont {
   name: "railway-station-subway-yellow"
   element {
-    scale: 13
-    symbol {
-      name: "train-s"
-      apply_for_type: 1
-      priority: 16891
-    }
-    caption {
-      primary {
-        height: 10
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-      }
-      secondary {
-        height: 9
-        color: 11711154
-        stroke_color: 1712394496
-        offset_y: 6
-        text: "int_name"
-      }
-      priority: 15891
-    }
-  }
-  element {
     scale: 14
     symbol {
       name: "subway-s"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 9
-        color: 11711154
-        stroke_color: 1292964096
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55181,23 +59930,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55205,23 +59954,23 @@ cont {
     symbol {
       name: "subway-m"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 7
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55229,23 +59978,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55253,23 +60002,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
   element {
@@ -55277,23 +60026,23 @@ cont {
     symbol {
       name: "subway-l"
       apply_for_type: 1
-      priority: 16905
+      priority: 16888
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 18
         text: "int_name"
       }
-      priority: 15905
+      priority: 15888
     }
   }
 }
@@ -55302,73 +60051,73 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "subway-entrance-m"
+      name: "subway-entrance-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-entrance-m"
+      name: "subway-entrance-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-entrance-m"
+      name: "subway-entrance-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55379,23 +60128,23 @@ cont {
     symbol {
       name: "subway-barcelona-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55403,23 +60152,23 @@ cont {
     symbol {
       name: "subway-barcelona-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55427,23 +60176,23 @@ cont {
     symbol {
       name: "subway-barcelona-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55454,23 +60203,23 @@ cont {
     symbol {
       name: "subway-berlin-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55478,23 +60227,23 @@ cont {
     symbol {
       name: "subway-berlin-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55502,23 +60251,23 @@ cont {
     symbol {
       name: "subway-berlin-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55534,8 +60283,8 @@ cont {
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       priority: 15027
@@ -55551,14 +60300,14 @@ cont {
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
@@ -55575,14 +60324,14 @@ cont {
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
@@ -55599,14 +60348,14 @@ cont {
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
@@ -55621,23 +60370,23 @@ cont {
     symbol {
       name: "subway-london-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55645,23 +60394,23 @@ cont {
     symbol {
       name: "subway-london-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55669,23 +60418,23 @@ cont {
     symbol {
       name: "subway-london-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55696,23 +60445,23 @@ cont {
     symbol {
       name: "subway-madrid-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55720,23 +60469,23 @@ cont {
     symbol {
       name: "subway-madrid-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55744,23 +60493,23 @@ cont {
     symbol {
       name: "subway-madrid-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55771,16 +60520,16 @@ cont {
     symbol {
       name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55788,23 +60537,23 @@ cont {
     symbol {
       name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55812,23 +60561,23 @@ cont {
     symbol {
       name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55836,23 +60585,23 @@ cont {
     symbol {
       name: "subway-minsk-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 6
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55863,23 +60612,23 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 10
       }
       secondary {
         height: 10
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 25
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55887,23 +60636,23 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 10
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 25
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55911,23 +60660,23 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 10
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 25
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55935,23 +60684,23 @@ cont {
     symbol {
       name: "subway-moscow-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 10
       }
       secondary {
         height: 11
-        color: 11711154
+        color: 3355443
         stroke_color: 1118464
         offset_y: 25
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -55962,23 +60711,23 @@ cont {
     symbol {
       name: "subway-newyork-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -55986,23 +60735,23 @@ cont {
     symbol {
       name: "subway-newyork-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56010,23 +60759,23 @@ cont {
     symbol {
       name: "subway-newyork-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -56037,23 +60786,23 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56061,23 +60810,23 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56085,23 +60834,23 @@ cont {
     symbol {
       name: "subway-paris-s"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -56112,23 +60861,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56136,23 +60885,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
@@ -56160,23 +60909,23 @@ cont {
     symbol {
       name: "subway-rome-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -56187,95 +60936,95 @@ cont {
     symbol {
       name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 20
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 17
     symbol {
-      name: "subway-spb-l"
+      name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 11
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 18
     symbol {
-      name: "subway-spb-l"
+      name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 19
     symbol {
-      name: "subway-spb-l"
+      name: "subway-spb-m"
       apply_for_type: 1
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 13
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 12
-        color: 11711154
-        stroke_color: 856756480
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
 }
@@ -56286,7 +61035,7 @@ cont {
     lines {
       width: 0.7
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56296,7 +61045,7 @@ cont {
     lines {
       width: 0.8
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56306,7 +61055,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56316,7 +61065,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56326,7 +61075,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56339,7 +61088,7 @@ cont {
     lines {
       width: 0.7
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56349,7 +61098,7 @@ cont {
     lines {
       width: 0.8
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56359,7 +61108,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56369,7 +61118,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56379,7 +61128,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56392,7 +61141,7 @@ cont {
     lines {
       width: 0.7
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -56402,7 +61151,7 @@ cont {
     lines {
       width: 0.8
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56412,7 +61161,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56422,7 +61171,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56432,7 +61181,7 @@ cont {
     lines {
       width: 1.0
       color: 6052945
-      priority: 1635
+      priority: 1638
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -56444,644 +61193,83 @@ cont {
     scale: 15
     symbol {
       name: "tram-m"
-      priority: 16891
+      priority: 16875
     }
   }
   element {
     scale: 16
     symbol {
       name: "tram-m"
-      priority: 16891
+      priority: 16875
     }
   }
   element {
     scale: 17
     symbol {
       name: "tram-l"
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 11
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 18
     symbol {
       name: "tram-l"
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
+      priority: 15875
     }
   }
   element {
     scale: 19
     symbol {
       name: "tram-l"
-      priority: 16891
+      priority: 16875
     }
     caption {
       primary {
         height: 12
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
       }
       secondary {
         height: 10
-        color: 11711154
-        stroke_color: 437326080
+        color: 3355443
+        stroke_color: 2148602112
         offset_y: 8
         text: "int_name"
       }
-      priority: 15891
-    }
-  }
-}
-cont {
-  name: "railway-yard"
-  element {
-    scale: 11
-    lines {
-      width: 0.6
-      color: 2171161
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.6
-      color: 2171161
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.8
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 1.3
-      color: 0
-      dashdot {
-        dd: 4.5
-        dd: 4.5
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "railway-yard-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.6
-      color: 2171161
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.6
-      color: 2171161
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.8
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 1.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.4
-      color: 2236945
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.0
-      color: 4473924
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 1.2
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.8
-      color: 2236945
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.4
-      color: 4473924
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 2.6
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 3.0
-      color: 2236945
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.6
-      color: 4473924
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.3
-      color: 0
-      dashdot {
-        dd: 4.5
-        dd: 4.5
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 6.4
-      color: 2236945
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 4473924
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 6.4
-      color: 2236945
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 4473924
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 6.4
-      color: 2236945
-      priority: 1107
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 8.0
-      color: 4473924
-      priority: 1093
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "railway-yard-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.6
-      color: 2171161
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 12
-    lines {
-      width: 0.6
-      color: 2171161
-      priority: 1486
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 13
-    lines {
-      width: 0.8
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 14
-    lines {
-      width: 3.0
-      color: 2171161
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 15
-    lines {
-      width: 3.2
-      color: 2171161
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 1.2
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 4.6
-      color: 2171161
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 2.6
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 1.3
-      color: 0
-      dashdot {
-        dd: 4.5
-        dd: 4.5
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 5.0
-      color: 2171161
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 6.3
-        dd: 6.3
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 5.0
-      color: 2171161
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 5.0
-      color: 2171161
-      dashdot {
-        dd: 5.0
-        dd: 5.0
-      }
-      priority: 1485
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-    lines {
-      width: 3.0
-      color: 2171161
-      priority: 1486
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-    lines {
-      width: 2.0
-      color: 0
-      dashdot {
-        dd: 8.1
-        dd: 8.1
-      }
-      priority: 1500
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 15875
     }
   }
 }
@@ -57096,7 +61284,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57105,7 +61293,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57117,7 +61305,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57126,7 +61314,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57138,7 +61326,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57147,7 +61335,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57159,7 +61347,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57168,7 +61356,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57180,7 +61368,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57189,7 +61377,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57201,7 +61389,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57210,7 +61398,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57222,7 +61410,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57231,7 +61419,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57243,7 +61431,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57252,7 +61440,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57264,7 +61452,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57273,7 +61461,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57285,7 +61473,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57294,7 +61482,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
 }
@@ -57309,7 +61497,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57318,7 +61506,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57330,7 +61518,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57339,7 +61527,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57351,7 +61539,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57360,7 +61548,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57372,7 +61560,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57381,7 +61569,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57393,7 +61581,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57402,7 +61590,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57414,7 +61602,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57423,7 +61611,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57435,7 +61623,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57444,7 +61632,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57456,7 +61644,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57465,7 +61653,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57477,7 +61665,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57486,7 +61674,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57498,7 +61686,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57507,7 +61695,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
 }
@@ -57522,7 +61710,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57531,7 +61719,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57543,7 +61731,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57552,7 +61740,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57564,7 +61752,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: BEVELJOIN
       cap: BUTTCAP
     }
@@ -57573,7 +61761,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57585,7 +61773,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57594,7 +61782,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57606,7 +61794,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57615,7 +61803,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57627,7 +61815,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -57636,7 +61824,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57648,7 +61836,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1256
+      priority: 1250
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57657,7 +61845,7 @@ cont {
         height: 9
         color: 17510
       }
-      priority: 16256
+      priority: 16250
     }
   }
   element {
@@ -57669,7 +61857,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57678,7 +61866,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57690,7 +61878,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57699,7 +61887,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
   element {
@@ -57711,7 +61899,7 @@ cont {
         dd: 5.4
         dd: 2.7
       }
-      priority: 1270
+      priority: 1263
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -57720,7 +61908,7 @@ cont {
         height: 10
         color: 17510
       }
-      priority: 16270
+      priority: 16263
     }
   }
 }
@@ -57730,290 +61918,1091 @@ cont {
     scale: 19
     symbol {
       name: "shop-m"
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "shop-alcohol"
   element {
+    scale: 12
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "alcohol-l"
+      apply_for_type: 1
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "alcohol-l"
       apply_for_type: 1
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "alcohol-l"
-      priority: 16837
+      name: "shop-m"
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15833
     }
   }
 }
 cont {
   name: "shop-bakery"
   element {
+    scale: 12
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bakery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bakery-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "bakery-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-beauty"
   element {
+    scale: 12
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "beauty-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "beauty-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "beauty-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-beverages"
   element {
+    scale: 12
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "alcohol-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "alcohol-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "alcohol-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-bicycle"
   element {
+    scale: 12
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shop-bicycle-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "shop-bicycle-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "shop-bicycle-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-books"
   element {
+    scale: 12
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "book-shop-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "book-shop-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "book-shop-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-butcher"
   element {
+    scale: 12
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "butcher-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "butcher-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "butcher-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-car"
   element {
+    scale: 12
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "car_sharing-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "car_sharing-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-car_repair"
   element {
+    scale: 12
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "car-repair-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "car-repair-l"
-      priority: 16851
+      priority: 16819
     }
     caption {
       primary {
@@ -58021,613 +63010,2142 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "car-repair-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "car-repair-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-chemist"
   element {
+    scale: 12
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "chemist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "chemist-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "chemist-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-clothes"
   element {
+    scale: 12
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "clothes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "clothes-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "clothes-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-computer"
   element {
+    scale: 12
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "computer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "computer-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "computer-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-confectionery"
   element {
+    scale: 12
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "sweets-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "sweets-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "sweets-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-convenience"
   element {
+    scale: 12
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "convenience-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "convenience-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "convenience-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-department_store"
   element {
+    scale: 12
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "department_store-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "department_store-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "department_store-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-doityourself"
   element {
+    scale: 12
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "doityourself-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "doityourself-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "doityourself-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-electronics"
   element {
+    scale: 12
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "electronics-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "electronics-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "electronics-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-florist"
   element {
+    scale: 12
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "florist-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "florist-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "florist-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-furniture"
   element {
+    scale: 12
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "furniture-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "furniture-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "furniture-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-garden_centre"
   element {
+    scale: 12
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "garden_center-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "garden_center-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "garden_center-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-gift"
   element {
+    scale: 12
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "gift-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "gift-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "gift-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-greengrocer"
   element {
+    scale: 12
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "greengrocer-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "greengrocer-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "greengrocer-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-hairdresser"
   element {
+    scale: 12
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hairdresser-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "hairdresser-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "hairdresser-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-hardware"
   element {
+    scale: 12
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "hardware-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "hardware-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "hardware-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-jewelry"
   element {
+    scale: 12
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "jewelry-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "jewelry-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "jewelry-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-kiosk"
   element {
+    scale: 12
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "kiosk-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "kiosk-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "kiosk-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-laundry"
   element {
-    scale: 17
+    scale: 12
     symbol {
       name: "laundry-l"
-      apply_for_type: 1
       priority: 16972
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -58635,14 +65153,14 @@ cont {
     }
   }
   element {
-    scale: 18
+    scale: 13
     symbol {
       name: "laundry-l"
       priority: 16972
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -58650,29 +65168,168 @@ cont {
     }
   }
   element {
-    scale: 19
+    scale: 14
     symbol {
       name: "laundry-l"
       priority: 16972
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
       priority: 15972
     }
   }
+  element {
+    scale: 15
+    symbol {
+      name: "laundry-l"
+      priority: 16972
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15972
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "laundry-l"
+      priority: 16972
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15972
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "laundry-l"
+      priority: 16972
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15972
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "laundry-l"
+      priority: 16972
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15972
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
 }
 cont {
   name: "shop-mall"
   element {
+    scale: 12
+    symbol {
+      name: "shop-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "shop-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shop-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shop-l"
+      apply_for_type: 1
+      priority: 16847
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "shop-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -58680,7 +65337,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -58688,7 +65345,7 @@ cont {
     symbol {
       name: "shop-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -58696,7 +65353,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -58704,7 +65361,7 @@ cont {
     symbol {
       name: "shop-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
     }
     caption {
       primary {
@@ -58712,14 +65369,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
-      name: "shop-l"
-      priority: 16864
+      name: "shop-m"
+      priority: 16833
     }
     caption {
       primary {
@@ -58727,150 +65384,590 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15833
     }
   }
 }
 cont {
   name: "shop-mobile_phone"
   element {
+    scale: 12
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "mobile_phone-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "mobile_phone-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "mobile_phone-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-optician"
   element {
+    scale: 12
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "optician-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "optician-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "optician-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-shoes"
   element {
+    scale: 12
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "shoes-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "shoes-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "shoes-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-sports"
   element {
+    scale: 12
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "sports-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "sports-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "sports-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "shop-supermarket"
   element {
+    scale: 12
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "grocery-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "grocery-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -58878,7 +65975,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -58886,7 +65983,7 @@ cont {
     symbol {
       name: "grocery-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -58894,14 +65991,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
-      name: "grocery-l"
-      priority: 16851
+      name: "shop-m"
+      priority: 16833
     }
     caption {
       primary {
@@ -58909,59 +66006,245 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "shop-toys"
   element {
+    scale: 12
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "toys-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "toys-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "toys-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-american_football"
   element {
+    scale: 12
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "america-football-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "america-football-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -58969,67 +66252,253 @@ cont {
     symbol {
       name: "america-football-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-archery"
   element {
+    scale: 12
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "archery-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "archery-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "archery-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-athletics"
   element {
+    scale: 12
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59037,67 +66506,253 @@ cont {
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-australian_football"
   element {
+    scale: 12
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "australian-football-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "australian-football-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "australian-football-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-baseball"
   element {
+    scale: 12
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "baseball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "baseball-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59105,34 +66760,130 @@ cont {
     symbol {
       name: "baseball-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-basketball"
   element {
+    scale: 12
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "basketball-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "basketball-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59140,190 +66891,469 @@ cont {
     symbol {
       name: "basketball-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-bowls"
   element {
+    scale: 12
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "bowls-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "bowls-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "bowls-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-cricket"
   element {
+    scale: 12
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "cricket-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "cricket-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "cricket-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-curling"
   element {
+    scale: 12
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "curling-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "curling-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "curling-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-diving"
   element {
-    scale: 18
+    scale: 12
     symbol {
       name: "diving-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 13
     symbol {
       name: "diving-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
-}
-cont {
-  name: "sport-equestrian"
   element {
-    scale: 18
+    scale: 14
     symbol {
-      name: "equestrian-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 15
     symbol {
-      name: "equestrian-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "sport-football"
   element {
     scale: 17
     symbol {
-      name: "soccer-l"
-      priority: 16067
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -59331,14 +67361,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
-      name: "soccer-l"
-      priority: 16067
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -59346,14 +67376,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "soccer-l"
-      priority: 16067
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
@@ -59361,26 +67391,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-golf"
   element {
+    scale: 12
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "golf-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "golf-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59388,65 +67514,74 @@ cont {
     symbol {
       name: "golf-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-gymnastics"
   element {
-    scale: 18
+    scale: 12
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
-    scale: 19
+    scale: 13
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
-}
-cont {
-  name: "sport-multi"
   element {
-    scale: 17
-    area {
-      color: 1118464
-      priority: -15933
+    scale: 14
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
+  }
+  element {
+    scale: 15
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59454,19 +67589,47 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
-    scale: 18
-    area {
-      color: 1118464
-      priority: -15933
+    scale: 16
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "pitch-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
+  }
+  element {
+    scale: 18
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59474,19 +67637,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 19
-    area {
-      color: 1118464
-      priority: -15933
-    }
     symbol {
       name: "pitch-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59494,88 +67653,209 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-scuba_diving"
   element {
-    scale: 18
+    scale: 12
     symbol {
       name: "diving-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
-    scale: 19
+    scale: 13
     symbol {
       name: "diving-l"
-      priority: 16837
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "diving-l"
+      priority: 16819
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
     }
   }
-}
-cont {
-  name: "sport-shooting"
   element {
     scale: 18
     symbol {
-      name: "archery-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
-      name: "archery-l"
-      priority: 16837
+      name: "diving-l"
+      priority: 16819
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "sport-soccer"
   element {
+    scale: 12
+    symbol {
+      name: "soccer-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "soccer-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "soccer-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "soccer-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 16
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
-      name: "soccer-m"
+      name: "soccer-l"
       apply_for_type: 1
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59583,18 +67863,18 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 17
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "soccer-l"
-      priority: 16067
+      priority: 16833
     }
     caption {
       primary {
@@ -59602,18 +67882,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 18
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "soccer-l"
-      priority: 16067
+      apply_for_type: 1
+      priority: 16833
     }
     caption {
       primary {
@@ -59621,18 +67902,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
   element {
     scale: 19
     area {
       color: 1118464
-      priority: -15933
+      priority: -15167
     }
     symbol {
       name: "soccer-l"
-      priority: 16067
+      apply_for_type: 1
+      priority: 16833
     }
     caption {
       primary {
@@ -59640,26 +67922,122 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15067
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-swimming"
   element {
+    scale: 12
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "swimming-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "swimming-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59667,26 +68045,106 @@ cont {
     symbol {
       name: "swimming-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "sport-tennis"
   element {
+    scale: 12
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tennis-l"
+      apply_for_type: 1
+      priority: 16833
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -59694,7 +68152,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59702,7 +68160,7 @@ cont {
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -59710,7 +68168,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -59718,7 +68176,7 @@ cont {
     symbol {
       name: "tennis-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
     }
     caption {
       primary {
@@ -59726,51 +68184,269 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-alpine_hut"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "alpine_hut-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "alpine_hut-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "alpine_hut-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-artwork"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59778,7 +68454,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -59786,7 +68462,8 @@ cont {
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59794,7 +68471,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -59802,7 +68479,8 @@ cont {
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59810,18 +68488,87 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-attraction"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 15
     symbol {
-      name: "tourism-m"
+      name: "tourism-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59829,14 +68576,16 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15847
     }
   }
   element {
     scale: 16
     symbol {
-      name: "tourism-m"
-      priority: 16864
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59844,14 +68593,16 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "tourism-l"
-      priority: 16864
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59859,14 +68610,16 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "tourism-l"
-      priority: 16864
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59874,14 +68627,16 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "tourism-l"
-      priority: 16864
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59889,39 +68644,115 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-camp_site"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 15
     symbol {
-      name: "campsite-m"
-      priority: 16878
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
     }
   }
   element {
     scale: 16
     symbol {
-      name: "campsite-m"
-      priority: 16878
+      name: "campsite-l"
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
     scale: 17
     symbol {
       name: "campsite-l"
-      priority: 16878
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -59929,114 +68760,449 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15847
     }
   }
   element {
     scale: 18
     symbol {
       name: "campsite-l"
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
     scale: 19
     symbol {
       name: "campsite-l"
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-caravan_site"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "caravan_site-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "caravan_site-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "caravan_site-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-guest_house"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "motel-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "motel-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-hostel"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60044,7 +69210,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -60052,7 +69218,8 @@ cont {
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60060,7 +69227,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -60068,7 +69235,8 @@ cont {
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60076,18 +69244,121 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-hotel"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "hotel-l"
+      apply_for_type: 1
+      priority: 16847
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15847
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60095,7 +69366,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -60103,7 +69374,8 @@ cont {
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60111,7 +69383,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
   element {
@@ -60119,7 +69391,8 @@ cont {
     symbol {
       name: "hotel-l"
       apply_for_type: 1
-      priority: 16864
+      priority: 16847
+      min_distance: 1
     }
     caption {
       primary {
@@ -60127,18 +69400,121 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15864
+      priority: 15847
     }
   }
 }
 cont {
   name: "tourism-information"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60146,7 +69522,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60154,7 +69530,8 @@ cont {
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60162,7 +69539,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60170,7 +69547,8 @@ cont {
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60178,18 +69556,121 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-information-guidepost"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "information-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60197,7 +69678,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60205,7 +69686,8 @@ cont {
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60213,7 +69695,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60221,7 +69703,8 @@ cont {
     symbol {
       name: "information-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60229,18 +69712,19 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-information-office"
   element {
-    scale: 17
+    scale: 11
     symbol {
-      name: "information-l"
+      name: "museum-m"
       apply_for_type: 1
-      priority: 16851
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60248,80 +69732,310 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "office-l"
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
     }
   }
   element {
     scale: 18
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
     scale: 19
     symbol {
       name: "office-l"
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-motel"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "motel-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 18
     symbol {
       name: "motel-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "motel-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-museum"
   element {
-    scale: 15
+    scale: 11
     symbol {
       name: "museum-m"
-      priority: 16878
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "museum-l"
+      priority: 16861
       min_distance: 1
     }
     caption {
@@ -60330,29 +70044,79 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "museum-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "museum-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "museum-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "museum-m"
-      priority: 16878
+      name: "museum-l"
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60360,47 +70124,147 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "museum-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
 cont {
   name: "tourism-picnic_site"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "picnic-l"
+      priority: 16819
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15819
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "picnic-l"
-      priority: 16851
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
@@ -60408,48 +70272,153 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15819
     }
   }
   element {
     scale: 18
     symbol {
       name: "picnic-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
   element {
     scale: 19
     symbol {
       name: "picnic-l"
-      priority: 16837
+      priority: 16819
+      min_distance: 1
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15837
+      priority: 15819
     }
   }
 }
 cont {
   name: "tourism-viewpoint"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-l"
+      apply_for_type: 1
+      priority: 16833
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15833
+    }
+  }
+  element {
     scale: 17
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60457,7 +70426,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60465,7 +70434,8 @@ cont {
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60473,7 +70443,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
   element {
@@ -60481,7 +70451,8 @@ cont {
     symbol {
       name: "tourism-l"
       apply_for_type: 1
-      priority: 16851
+      priority: 16833
+      min_distance: 1
     }
     caption {
       primary {
@@ -60489,17 +70460,83 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15851
+      priority: 15833
     }
   }
 }
 cont {
   name: "tourism-zoo"
   element {
+    scale: 11
+    symbol {
+      name: "museum-m"
+      apply_for_type: 1
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 12
+    symbol {
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 13
+    symbol {
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15861
+    }
+  }
+  element {
     scale: 15
     symbol {
-      name: "zoo-m"
-      priority: 16878
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60507,29 +70544,31 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 16
     symbol {
-      name: "zoo-m"
-      priority: 16878
+      name: "zoo-l"
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
         height: 10
         color: 5592405
-        offset_y: 12
+        offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 17
     symbol {
       name: "zoo-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60537,14 +70576,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 18
     symbol {
       name: "zoo-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60552,14 +70592,15 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
   element {
     scale: 19
     symbol {
       name: "zoo-l"
-      priority: 16878
+      priority: 16861
+      min_distance: 1
     }
     caption {
       primary {
@@ -60567,7 +70608,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15878
+      priority: 15861
     }
   }
 }
@@ -60576,52 +70617,52 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60629,16 +70670,16 @@ cont {
     lines {
       width: 1.5
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60646,7 +70687,7 @@ cont {
     lines {
       width: 1.5
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60655,7 +70696,7 @@ cont {
         height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60663,7 +70704,7 @@ cont {
     lines {
       width: 1.5
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60672,7 +70713,7 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60680,7 +70721,7 @@ cont {
     lines {
       width: 1.5
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60689,7 +70730,7 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -60698,52 +70739,52 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60751,16 +70792,16 @@ cont {
     lines {
       width: 1.5
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60768,7 +70809,7 @@ cont {
     lines {
       width: 1.5
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60777,7 +70818,7 @@ cont {
         height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60785,7 +70826,7 @@ cont {
     lines {
       width: 1.5
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60794,7 +70835,7 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
@@ -60802,7 +70843,7 @@ cont {
     lines {
       width: 1.5
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60811,7 +70852,7 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -60822,7 +70863,7 @@ cont {
     lines {
       width: 1.0
       color: 4473924
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: BUTTCAP
     }
@@ -60831,7 +70872,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 16662
+      priority: 16666
     }
   }
   element {
@@ -60839,7 +70880,7 @@ cont {
     lines {
       width: 1.0
       color: 4473924
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60848,7 +70889,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 16662
+      priority: 16666
     }
   }
   element {
@@ -60856,7 +70897,7 @@ cont {
     lines {
       width: 1.0
       color: 4473924
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60865,7 +70906,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 16662
+      priority: 16666
     }
   }
   element {
@@ -60873,7 +70914,7 @@ cont {
     lines {
       width: 1.0
       color: 4473924
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60882,7 +70923,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 16662
+      priority: 16666
     }
   }
   element {
@@ -60890,7 +70931,7 @@ cont {
     lines {
       width: 1.0
       color: 4473924
-      priority: 1662
+      priority: 1666
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60899,7 +70940,7 @@ cont {
         height: 10
         color: 5592405
       }
-      priority: 16662
+      priority: 16666
     }
   }
 }
@@ -60914,7 +70955,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60928,7 +70969,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60942,7 +70983,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60959,7 +71000,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60973,7 +71014,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60987,7 +71028,7 @@ cont {
         dd: 1.0
         dd: 1.0
       }
-      priority: 1216
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -60999,308 +71040,140 @@ cont {
     scale: 0
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 11
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 12
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 13
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 14
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 15
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 16
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 17
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 18
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 19
     area {
       color: 8738
-      priority: -15771
-    }
-  }
-}
-cont {
-  name: "waterway-drain"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "waterway-drain-tunnel"
-  element {
-    scale: 17
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.8
-      color: 401446
-      dashdot {
-        dd: 1.0
-        dd: 1.0
-      }
-      priority: 1216
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-}
-cont {
-  name: "waterway-lock"
-  element {
-    scale: 16
-    lines {
-      width: 1.5
-      color: 401446
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.5
-      color: 401446
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.5
-      color: 401446
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.5
-      color: 401446
-      priority: -15800
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-}
-cont {
-  name: "waterway-lock_gate"
-  element {
-    scale: 16
-    symbol {
-      name: "dot-m"
-      apply_for_type: 1
-      priority: 16243
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "dot-m"
-      apply_for_type: 1
-      priority: 16243
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "dot-m"
-      apply_for_type: 1
-      priority: 16243
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "dot-m"
-      apply_for_type: 1
-      priority: 16243
+      priority: -15778
     }
   }
 }
@@ -61309,204 +71182,204 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.6
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15784
+      priority: -15792
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.2
+      width: 0.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.2
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 1.2
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 15
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 16
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
 }
@@ -61515,204 +71388,204 @@ cont {
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.6
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15784
+      priority: -15792
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.2
+      width: 0.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.2
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 1.2
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 15
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 16
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
 }
@@ -61722,273 +71595,273 @@ cont {
     scale: 0
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 1
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 2
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 3
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 4
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 5
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 6
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 7
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 8
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 9
     area {
       color: 8738
-      priority: -15771
+      priority: -15778
     }
   }
   element {
     scale: 10
     lines {
-      width: 1.0
+      width: 0.6
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15784
+      priority: -15792
     }
   }
   element {
     scale: 11
     lines {
-      width: 1.2
+      width: 0.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 12
     lines {
-      width: 1.2
+      width: 0.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: BEVELJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 13
     lines {
-      width: 1.6
+      width: 1.2
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 1.2
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 15
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 16
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 17
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
-        height: 12
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 18
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
   element {
     scale: 19
     lines {
-      width: 2.2
+      width: 1.8
       color: 401446
-      priority: -15800
+      priority: 1208
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     area {
       color: 8738
-      priority: -15041
+      priority: -15792
     }
     path_text {
       primary {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16208
     }
   }
 }
@@ -61997,77 +71870,77 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62076,15 +71949,15 @@ cont {
         height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62093,15 +71966,15 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62110,7 +71983,7 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -62119,77 +71992,77 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62198,15 +72071,15 @@ cont {
         height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62215,15 +72088,15 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62232,7 +72105,7 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -62241,94 +72114,94 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 401446
       dashdot {
         dd: 2.7
         dd: 2.7
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 401446
       dashdot {
         dd: 2.7
         dd: 2.7
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.4
+      width: 1.0
       color: 401446
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.4
+      width: 1.0
       color: 401446
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.4
+      width: 1.0
       color: 401446
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62337,18 +72210,18 @@ cont {
         height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.4
+      width: 1.0
       color: 401446
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62357,18 +72230,18 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.4
+      width: 1.0
       color: 401446
       dashdot {
         dd: 4.95
       }
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62377,7 +72250,7 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
 }
@@ -62386,77 +72259,77 @@ cont {
   element {
     scale: 13
     lines {
-      width: 0.7
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 14
     lines {
-      width: 1.0
+      width: 0.2
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 10
+        height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 15
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: BUTTCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 16
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
     path_text {
       primary {
-        height: 11
+        height: 10
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 17
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62465,15 +72338,15 @@ cont {
         height: 11
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 18
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62482,15 +72355,15 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
+      priority: 16944
     }
   }
   element {
     scale: 19
     lines {
-      width: 1.6
+      width: 1.0
       color: 401446
-      priority: -15800
+      priority: 1944
       join: ROUNDJOIN
       cap: ROUNDCAP
     }
@@ -62499,183 +72372,7 @@ cont {
         height: 12
         color: 17510
       }
-      priority: 16959
-    }
-  }
-}
-cont {
-  name: "waterway-waterfall"
-  element {
-    scale: 12
-    symbol {
-      name: "waterfall-s"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 13
-    symbol {
-      name: "waterfall-s"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "waterfall-s"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 15
-    symbol {
-      name: "waterfall-m"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 16
-    symbol {
-      name: "waterfall-m"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "waterfall-l"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "waterfall-l"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "waterfall-l"
-      priority: 16878
-    }
-    path_text {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 16878
-    }
-  }
-}
-cont {
-  name: "waterway-weir"
-  element {
-    scale: 15
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1243
-      join: ROUNDJOIN
-      cap: BUTTCAP
-    }
-  }
-  element {
-    scale: 16
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1243
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 17
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1243
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 18
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1243
-      join: ROUNDJOIN
-      cap: ROUNDCAP
-    }
-  }
-  element {
-    scale: 19
-    lines {
-      width: 1.0
-      color: 4473924
-      priority: 1243
-      join: ROUNDJOIN
-      cap: ROUNDCAP
+      priority: 16944
     }
   }
 }
diff --git a/data/patterns.txt b/data/patterns.txt
index 4fed69b903..e09c5d507f 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -12,6 +12,8 @@
 13.5 5.4
 18.0 6.3
 2.0 2.0
+5.0 5.0
+2.52 1.35
 2.0 1.0
 3.6 1.6
 5.0 2.2
@@ -19,8 +21,6 @@
 5.0 2.0
 7.0 3.0
 16.2 8.1
-5.0 5.0
-2.52 1.35
 1.5 1.5
 2.3 2.3
 3.2 3.2
diff --git a/data/resources-6plus/symbols.png b/data/resources-6plus/symbols.png
index e864ccc67c..2f8269917b 100644
--- a/data/resources-6plus/symbols.png
+++ b/data/resources-6plus/symbols.png
diff --git a/data/resources-6plus/symbols.sdf b/data/resources-6plus/symbols.sdf
index b7e709001f..463e38b79a 100644
--- a/data/resources-6plus/symbols.sdf
+++ b/data/resources-6plus/symbols.sdf
@@ -1,179 +1,179 @@
 <!DOCTYPE skin>
 <root>
  <file width="1024" height="1024">
-  <symbol minY="0" maxY="165" name="route_to" minX="0" maxX="165"/>
-  <symbol minY="0" maxY="157" name="route-arrow" minX="165" maxX="488"/>
-  <symbol minY="0" maxY="138" name="compass-image" minX="488" maxX="626"/>
-  <symbol minY="0" maxY="88" name="current-position-compas" minX="626" maxX="695"/>
-  <symbol minY="0" maxY="88" name="current-routing-compas" minX="695" maxX="764"/>
-  <symbol minY="0" maxY="78" name="search-result-active" minX="764" maxX="842"/>
-  <symbol minY="0" maxY="69" name="placemark-orange" minX="842" maxX="877"/>
-  <symbol minY="0" maxY="69" name="placemark-green" minX="877" maxX="912"/>
-  <symbol minY="0" maxY="69" name="placemark-purple" minX="912" maxX="947"/>
-  <symbol minY="0" maxY="69" name="placemark-brown" minX="947" maxX="982"/>
-  <symbol minY="0" maxY="69" name="placemark-red" minX="982" maxX="1017"/>
-  <symbol minY="165" maxY="234" name="placemark-yellow" minX="0" maxX="35"/>
-  <symbol minY="165" maxY="234" name="placemark-blue" minX="35" maxX="70"/>
-  <symbol minY="165" maxY="234" name="placemark-pink" minX="70" maxX="105"/>
-  <symbol minY="165" maxY="223" name="hospital" minX="105" maxX="163"/>
-  <symbol minY="165" maxY="223" name="basketball" minX="163" maxX="221"/>
-  <symbol minY="165" maxY="223" name="baseball" minX="221" maxX="279"/>
-  <symbol minY="165" maxY="223" name="bicycle_rental" minX="279" maxX="337"/>
-  <symbol minY="165" maxY="223" name="bird" minX="337" maxX="395"/>
-  <symbol minY="165" maxY="223" name="bowls-borderless" minX="395" maxX="453"/>
-  <symbol minY="165" maxY="223" name="bowls" minX="453" maxX="511"/>
-  <symbol minY="165" maxY="223" name="baseball-borderless" minX="511" maxX="569"/>
-  <symbol minY="165" maxY="223" name="barrier" minX="569" maxX="627"/>
-  <symbol minY="165" maxY="223" name="bus-mini" minX="627" maxX="685"/>
-  <symbol minY="165" maxY="223" name="bus" minX="685" maxX="743"/>
-  <symbol minY="165" maxY="223" name="bus_sta" minX="743" maxX="801"/>
-  <symbol minY="165" maxY="223" name="cafe" minX="801" maxX="859"/>
-  <symbol minY="165" maxY="223" name="campsite" minX="859" maxX="917"/>
-  <symbol minY="165" maxY="223" name="cannon" minX="917" maxX="975"/>
-  <symbol minY="234" maxY="292" name="car_rental" minX="0" maxX="58"/>
-  <symbol minY="234" maxY="292" name="car_repair" minX="58" maxX="116"/>
-  <symbol minY="234" maxY="292" name="bar" minX="116" maxX="174"/>
-  <symbol minY="234" maxY="292" name="castle" minX="174" maxX="232"/>
-  <symbol minY="234" maxY="292" name="bakery" minX="232" maxX="290"/>
-  <symbol minY="234" maxY="292" name="atm" minX="290" maxX="348"/>
-  <symbol minY="234" maxY="292" name="cinema" minX="348" maxX="406"/>
-  <symbol minY="234" maxY="292" name="clothes" minX="406" maxX="464"/>
-  <symbol minY="234" maxY="292" name="cricket-borderless" minX="464" maxX="522"/>
-  <symbol minY="234" maxY="292" name="cricket" minX="522" maxX="580"/>
-  <symbol minY="234" maxY="292" name="curling-borderless" minX="580" maxX="638"/>
-  <symbol minY="234" maxY="292" name="curling" minX="638" maxX="696"/>
-  <symbol minY="234" maxY="292" name="athletics" minX="696" maxX="754"/>
-  <symbol minY="234" maxY="292" name="diving-borderless" minX="754" maxX="812"/>
-  <symbol minY="234" maxY="292" name="diving" minX="812" maxX="870"/>
-  <symbol minY="234" maxY="292" name="athletics-borderless" minX="870" maxX="928"/>
-  <symbol minY="234" maxY="292" name="dog_park" minX="928" maxX="986"/>
-  <symbol minY="292" maxY="350" name="arrow" minX="0" maxX="58"/>
-  <symbol minY="292" maxY="350" name="earthquake-camp" minX="58" maxX="116"/>
-  <symbol minY="292" maxY="350" name="archery" minX="116" maxX="174"/>
-  <symbol minY="292" maxY="350" name="equestrian-borderless" minX="174" maxX="232"/>
-  <symbol minY="292" maxY="350" name="equestrian" minX="232" maxX="290"/>
-  <symbol minY="292" maxY="350" name="fastfood" minX="290" maxX="348"/>
-  <symbol minY="292" maxY="350" name="firebrigade" minX="348" maxX="406"/>
-  <symbol minY="292" maxY="350" name="football-borderless" minX="406" maxX="464"/>
-  <symbol minY="292" maxY="350" name="football" minX="464" maxX="522"/>
-  <symbol minY="292" maxY="350" name="fountain" minX="522" maxX="580"/>
-  <symbol minY="292" maxY="350" name="gate" minX="580" maxX="638"/>
-  <symbol minY="292" maxY="350" name="golf-course" minX="638" maxX="696"/>
-  <symbol minY="292" maxY="350" name="gymnastics-borderless" minX="696" maxX="754"/>
-  <symbol minY="292" maxY="350" name="gymnastics" minX="754" maxX="812"/>
-  <symbol minY="292" maxY="350" name="hairdresser" minX="812" maxX="870"/>
-  <symbol minY="292" maxY="350" name="handball-borderless" minX="870" maxX="928"/>
-  <symbol minY="292" maxY="350" name="handball" minX="928" maxX="986"/>
-  <symbol minY="350" maxY="408" name="helipad" minX="0" maxX="58"/>
-  <symbol minY="350" maxY="408" name="slipway" minX="58" maxX="116"/>
-  <symbol minY="350" maxY="408" name="hostel" minX="116" maxX="174"/>
-  <symbol minY="350" maxY="408" name="hotel" minX="174" maxX="232"/>
-  <symbol minY="350" maxY="408" name="archery-borderless" minX="232" maxX="290"/>
-  <symbol minY="350" maxY="408" name="hunting_closed_high" minX="290" maxX="348"/>
-  <symbol minY="350" maxY="408" name="information-guidepost" minX="348" maxX="406"/>
-  <symbol minY="350" maxY="408" name="information-office" minX="406" maxX="464"/>
-  <symbol minY="350" maxY="408" name="information" minX="464" maxX="522"/>
-  <symbol minY="350" maxY="408" name="soccer-borderless" minX="522" maxX="580"/>
-  <symbol minY="350" maxY="408" name="kindergarten" minX="580" maxX="638"/>
-  <symbol minY="350" maxY="408" name="kindergarten2" minX="638" maxX="696"/>
-  <symbol minY="350" maxY="408" name="kiosk" minX="696" maxX="754"/>
-  <symbol minY="350" maxY="408" name="library" minX="754" maxX="812"/>
-  <symbol minY="350" maxY="408" name="alpine_hut" minX="812" maxX="870"/>
-  <symbol minY="350" maxY="408" name="man-made-halfpipe" minX="870" maxX="928"/>
-  <symbol minY="350" maxY="408" name="memorial" minX="928" maxX="986"/>
-  <symbol minY="408" maxY="466" name="airport" minX="0" maxX="58"/>
-  <symbol minY="408" maxY="466" name="mountain_pass" minX="58" maxX="116"/>
-  <symbol minY="408" maxY="466" name="museum" minX="116" maxX="174"/>
-  <symbol minY="408" maxY="466" name="university" minX="174" maxX="232"/>
-  <symbol minY="408" maxY="466" name="tramway" minX="232" maxX="290"/>
-  <symbol minY="408" maxY="466" name="parking-mini" minX="290" maxX="348"/>
-  <symbol minY="408" maxY="466" name="tramway-mini" minX="348" maxX="406"/>
-  <symbol minY="408" maxY="466" name="toilets" minX="406" maxX="464"/>
-  <symbol minY="408" maxY="466" name="parking" minX="464" maxX="522"/>
-  <symbol minY="408" maxY="466" name="theatre" minX="522" maxX="580"/>
-  <symbol minY="408" maxY="466" name="tennis" minX="580" maxX="638"/>
-  <symbol minY="408" maxY="466" name="tennis-borderless" minX="638" maxX="696"/>
-  <symbol minY="408" maxY="466" name="parking_roof" minX="696" maxX="754"/>
-  <symbol minY="408" maxY="466" name="telephone" minX="754" maxX="812"/>
-  <symbol minY="408" maxY="466" name="taxi" minX="812" maxX="870"/>
-  <symbol minY="408" maxY="466" name="peak-mini" minX="870" maxX="928"/>
-  <symbol minY="408" maxY="466" name="peak" minX="928" maxX="986"/>
-  <symbol minY="466" maxY="524" name="petrolstation" minX="0" maxX="58"/>
-  <symbol minY="466" maxY="524" name="pharmacy" minX="58" maxX="116"/>
-  <symbol minY="466" maxY="524" name="synagogue" minX="116" maxX="174"/>
-  <symbol minY="466" maxY="524" name="playground" minX="174" maxX="232"/>
-  <symbol minY="466" maxY="524" name="police" minX="232" maxX="290"/>
-  <symbol minY="466" maxY="524" name="postbox" minX="290" maxX="348"/>
-  <symbol minY="466" maxY="524" name="postoffice" minX="348" maxX="406"/>
-  <symbol minY="466" maxY="524" name="swimming" minX="406" maxX="464"/>
-  <symbol minY="466" maxY="524" name="swimming-borderless" minX="464" maxX="522"/>
-  <symbol minY="466" maxY="524" name="supermarket" minX="522" maxX="580"/>
-  <symbol minY="466" maxY="524" name="subway" minX="580" maxX="638"/>
-  <symbol minY="466" maxY="524" name="subway-station-s" minX="638" maxX="696"/>
-  <symbol minY="466" maxY="524" name="subway-station-m" minX="696" maxX="754"/>
-  <symbol minY="466" maxY="524" name="pub" minX="754" maxX="812"/>
-  <symbol minY="466" maxY="524" name="pubx" minX="812" maxX="870"/>
-  <symbol minY="466" maxY="524" name="railway-crossing-small" minX="870" maxX="928"/>
-  <symbol minY="466" maxY="524" name="railway-crossing" minX="928" maxX="986"/>
-  <symbol minY="524" maxY="582" name="railway-station-mini" minX="0" maxX="58"/>
-  <symbol minY="524" maxY="582" name="railway-station" minX="58" maxX="116"/>
-  <symbol minY="524" maxY="582" name="recycling" minX="116" maxX="174"/>
-  <symbol minY="524" maxY="582" name="religion" minX="174" maxX="232"/>
-  <symbol minY="524" maxY="582" name="restaurant" minX="232" maxX="290"/>
-  <symbol minY="524" maxY="582" name="subway-station-l" minX="290" maxX="348"/>
-  <symbol minY="524" maxY="582" name="soccer" minX="348" maxX="406"/>
-  <symbol minY="524" maxY="582" name="ruins" minX="406" maxX="464"/>
-  <symbol minY="524" maxY="582" name="school" minX="464" maxX="522"/>
-  <symbol minY="524" maxY="582" name="shelter-fireplace" minX="522" maxX="580"/>
-  <symbol minY="524" maxY="582" name="shelter" minX="580" maxX="638"/>
-  <symbol minY="524" maxY="582" name="shooting-borderless" minX="638" maxX="696"/>
-  <symbol minY="524" maxY="582" name="shooting" minX="696" maxX="754"/>
-  <symbol minY="524" maxY="580" name="basketball-borderless" minX="754" maxX="812"/>
-  <symbol minY="524" maxY="578" name="khanda" minX="812" maxX="866"/>
-  <symbol minY="524" maxY="573" name="parking-private" minX="866" maxX="915"/>
-  <symbol minY="524" maxY="573" name="parking-permissive" minX="915" maxX="964"/>
-  <symbol minY="524" maxY="569" name="roundabout_left" minX="964" maxX="1009"/>
-  <symbol minY="582" maxY="627" name="doctor" minX="0" maxX="45"/>
-  <symbol minY="582" maxY="627" name="drinking_water" minX="45" maxX="90"/>
-  <symbol minY="582" maxY="627" name="embassy" minX="90" maxX="135"/>
-  <symbol minY="582" maxY="627" name="housenumber" minX="135" maxX="180"/>
-  <symbol minY="582" maxY="627" name="bank" minX="180" maxX="225"/>
-  <symbol minY="582" maxY="627" name="mosque" minX="225" maxX="270"/>
-  <symbol minY="582" maxY="627" name="windmill" minX="270" maxX="315"/>
-  <symbol minY="582" maxY="627" name="church" minX="315" maxX="360"/>
-  <symbol minY="582" maxY="627" name="speed_trap" minX="360" maxX="405"/>
-  <symbol minY="582" maxY="627" name="traffic_signal" minX="405" maxX="450"/>
-  <symbol minY="582" maxY="627" name="parking_roof-permissive" minX="450" maxX="495"/>
-  <symbol minY="582" maxY="627" name="roundabout_right" minX="495" maxX="540"/>
-  <symbol minY="582" maxY="622" name="bureau_de_change" minX="540" maxX="580"/>
-  <symbol minY="582" maxY="622" name="viewpoint" minX="580" maxX="620"/>
-  <symbol minY="582" maxY="622" name="cave_entrance" minX="620" maxX="660"/>
-  <symbol minY="582" maxY="622" name="power_wind" minX="660" maxX="700"/>
-  <symbol minY="582" maxY="622" name="power_photovoltaic" minX="700" maxX="740"/>
-  <symbol minY="582" maxY="622" name="power_hydro" minX="740" maxX="780"/>
-  <symbol minY="582" maxY="622" name="power_generic" minX="780" maxX="820"/>
-  <symbol minY="582" maxY="622" name="lighthouse" minX="820" maxX="860"/>
-  <symbol minY="582" maxY="622" name="waterfall" minX="860" maxX="900"/>
-  <symbol minY="582" maxY="622" name="wastewater" minX="900" maxX="940"/>
-  <symbol minY="582" maxY="620" name="car_sharing" minX="940" maxX="980"/>
-  <symbol minY="582" maxY="620" name="current-position" minX="980" maxX="1018"/>
-  <symbol minY="627" maxY="660" name="route_from" minX="0" maxX="33"/>
-  <symbol minY="627" maxY="658" name="bench" minX="33" maxX="64"/>
-  <symbol minY="627" maxY="658" name="picnic" minX="64" maxX="95"/>
-  <symbol minY="627" maxY="658" name="parking_fee" minX="95" maxX="153"/>
-  <symbol minY="627" maxY="658" name="park_and_ride-permissive" minX="153" maxX="211"/>
-  <symbol minY="627" maxY="658" name="parking_fee-permissive" minX="211" maxX="269"/>
-  <symbol minY="627" maxY="658" name="park_and_ride" minX="269" maxX="327"/>
-  <symbol minY="627" maxY="658" name="parking_roof_fee" minX="327" maxX="385"/>
-  <symbol minY="627" maxY="658" name="parking_roof_fee-permissive" minX="385" maxX="443"/>
-  <symbol minY="627" maxY="656" name="api-result" minX="443" maxX="472"/>
-  <symbol minY="627" maxY="655" name="search-result" minX="472" maxX="500"/>
-  <symbol minY="627" maxY="651" name="disused" minX="500" maxX="524"/>
-  <symbol minY="627" maxY="651" name="power-tower" minX="524" maxX="548"/>
-  <symbol minY="627" maxY="651" name="building" minX="548" maxX="572"/>
-  <symbol minY="627" maxY="651" name="vulcan" minX="572" maxX="596"/>
-  <symbol minY="627" maxY="649" name="survey_point" minX="596" maxX="618"/>
-  <symbol minY="627" maxY="642" name="power-pole" minX="618" maxX="633"/>
-  <symbol minY="627" maxY="640" name="tree" minX="633" maxX="646"/>
+  <symbol minX="0" maxX="165" minY="0" maxY="165" name="route_to"/>
+  <symbol minX="165" maxX="488" minY="0" maxY="157" name="route-arrow"/>
+  <symbol minX="488" maxX="626" minY="0" maxY="138" name="compass-image"/>
+  <symbol minX="626" maxX="695" minY="0" maxY="88" name="current-position-compas"/>
+  <symbol minX="695" maxX="764" minY="0" maxY="88" name="current-routing-compas"/>
+  <symbol minX="764" maxX="842" minY="0" maxY="78" name="search-result-active"/>
+  <symbol minX="842" maxX="877" minY="0" maxY="69" name="placemark-orange"/>
+  <symbol minX="877" maxX="912" minY="0" maxY="69" name="placemark-green"/>
+  <symbol minX="912" maxX="947" minY="0" maxY="69" name="placemark-purple"/>
+  <symbol minX="947" maxX="982" minY="0" maxY="69" name="placemark-brown"/>
+  <symbol minX="982" maxX="1017" minY="0" maxY="69" name="placemark-red"/>
+  <symbol minX="0" maxX="35" minY="165" maxY="234" name="placemark-yellow"/>
+  <symbol minX="35" maxX="70" minY="165" maxY="234" name="placemark-blue"/>
+  <symbol minX="70" maxX="105" minY="165" maxY="234" name="placemark-pink"/>
+  <symbol minX="105" maxX="163" minY="165" maxY="223" name="hospital"/>
+  <symbol minX="163" maxX="221" minY="165" maxY="223" name="basketball"/>
+  <symbol minX="221" maxX="279" minY="165" maxY="223" name="baseball"/>
+  <symbol minX="279" maxX="337" minY="165" maxY="223" name="bicycle_rental"/>
+  <symbol minX="337" maxX="395" minY="165" maxY="223" name="bird"/>
+  <symbol minX="395" maxX="453" minY="165" maxY="223" name="bowls-borderless"/>
+  <symbol minX="453" maxX="511" minY="165" maxY="223" name="bowls"/>
+  <symbol minX="511" maxX="569" minY="165" maxY="223" name="baseball-borderless"/>
+  <symbol minX="569" maxX="627" minY="165" maxY="223" name="barrier"/>
+  <symbol minX="627" maxX="685" minY="165" maxY="223" name="bus-mini"/>
+  <symbol minX="685" maxX="743" minY="165" maxY="223" name="bus"/>
+  <symbol minX="743" maxX="801" minY="165" maxY="223" name="bus_sta"/>
+  <symbol minX="801" maxX="859" minY="165" maxY="223" name="cafe"/>
+  <symbol minX="859" maxX="917" minY="165" maxY="223" name="campsite"/>
+  <symbol minX="917" maxX="975" minY="165" maxY="223" name="cannon"/>
+  <symbol minX="0" maxX="58" minY="234" maxY="292" name="car_rental"/>
+  <symbol minX="58" maxX="116" minY="234" maxY="292" name="car_repair"/>
+  <symbol minX="116" maxX="174" minY="234" maxY="292" name="bar"/>
+  <symbol minX="174" maxX="232" minY="234" maxY="292" name="castle"/>
+  <symbol minX="232" maxX="290" minY="234" maxY="292" name="bakery"/>
+  <symbol minX="290" maxX="348" minY="234" maxY="292" name="atm"/>
+  <symbol minX="348" maxX="406" minY="234" maxY="292" name="cinema"/>
+  <symbol minX="406" maxX="464" minY="234" maxY="292" name="clothes"/>
+  <symbol minX="464" maxX="522" minY="234" maxY="292" name="cricket-borderless"/>
+  <symbol minX="522" maxX="580" minY="234" maxY="292" name="cricket"/>
+  <symbol minX="580" maxX="638" minY="234" maxY="292" name="curling-borderless"/>
+  <symbol minX="638" maxX="696" minY="234" maxY="292" name="curling"/>
+  <symbol minX="696" maxX="754" minY="234" maxY="292" name="athletics"/>
+  <symbol minX="754" maxX="812" minY="234" maxY="292" name="diving-borderless"/>
+  <symbol minX="812" maxX="870" minY="234" maxY="292" name="diving"/>
+  <symbol minX="870" maxX="928" minY="234" maxY="292" name="athletics-borderless"/>
+  <symbol minX="928" maxX="986" minY="234" maxY="292" name="dog_park"/>
+  <symbol minX="0" maxX="58" minY="292" maxY="350" name="arrow"/>
+  <symbol minX="58" maxX="116" minY="292" maxY="350" name="earthquake-camp"/>
+  <symbol minX="116" maxX="174" minY="292" maxY="350" name="archery"/>
+  <symbol minX="174" maxX="232" minY="292" maxY="350" name="equestrian-borderless"/>
+  <symbol minX="232" maxX="290" minY="292" maxY="350" name="equestrian"/>
+  <symbol minX="290" maxX="348" minY="292" maxY="350" name="fastfood"/>
+  <symbol minX="348" maxX="406" minY="292" maxY="350" name="firebrigade"/>
+  <symbol minX="406" maxX="464" minY="292" maxY="350" name="football-borderless"/>
+  <symbol minX="464" maxX="522" minY="292" maxY="350" name="football"/>
+  <symbol minX="522" maxX="580" minY="292" maxY="350" name="fountain"/>
+  <symbol minX="580" maxX="638" minY="292" maxY="350" name="gate"/>
+  <symbol minX="638" maxX="696" minY="292" maxY="350" name="golf-course"/>
+  <symbol minX="696" maxX="754" minY="292" maxY="350" name="gymnastics-borderless"/>
+  <symbol minX="754" maxX="812" minY="292" maxY="350" name="gymnastics"/>
+  <symbol minX="812" maxX="870" minY="292" maxY="350" name="hairdresser"/>
+  <symbol minX="870" maxX="928" minY="292" maxY="350" name="handball-borderless"/>
+  <symbol minX="928" maxX="986" minY="292" maxY="350" name="handball"/>
+  <symbol minX="0" maxX="58" minY="350" maxY="408" name="helipad"/>
+  <symbol minX="58" maxX="116" minY="350" maxY="408" name="slipway"/>
+  <symbol minX="116" maxX="174" minY="350" maxY="408" name="hostel"/>
+  <symbol minX="174" maxX="232" minY="350" maxY="408" name="hotel"/>
+  <symbol minX="232" maxX="290" minY="350" maxY="408" name="archery-borderless"/>
+  <symbol minX="290" maxX="348" minY="350" maxY="408" name="hunting_closed_high"/>
+  <symbol minX="348" maxX="406" minY="350" maxY="408" name="information-guidepost"/>
+  <symbol minX="406" maxX="464" minY="350" maxY="408" name="information-office"/>
+  <symbol minX="464" maxX="522" minY="350" maxY="408" name="information"/>
+  <symbol minX="522" maxX="580" minY="350" maxY="408" name="soccer-borderless"/>
+  <symbol minX="580" maxX="638" minY="350" maxY="408" name="kindergarten"/>
+  <symbol minX="638" maxX="696" minY="350" maxY="408" name="kindergarten2"/>
+  <symbol minX="696" maxX="754" minY="350" maxY="408" name="kiosk"/>
+  <symbol minX="754" maxX="812" minY="350" maxY="408" name="library"/>
+  <symbol minX="812" maxX="870" minY="350" maxY="408" name="alpine_hut"/>
+  <symbol minX="870" maxX="928" minY="350" maxY="408" name="man-made-halfpipe"/>
+  <symbol minX="928" maxX="986" minY="350" maxY="408" name="memorial"/>
+  <symbol minX="0" maxX="58" minY="408" maxY="466" name="airport"/>
+  <symbol minX="58" maxX="116" minY="408" maxY="466" name="mountain_pass"/>
+  <symbol minX="116" maxX="174" minY="408" maxY="466" name="museum"/>
+  <symbol minX="174" maxX="232" minY="408" maxY="466" name="university"/>
+  <symbol minX="232" maxX="290" minY="408" maxY="466" name="tramway"/>
+  <symbol minX="290" maxX="348" minY="408" maxY="466" name="parking-mini"/>
+  <symbol minX="348" maxX="406" minY="408" maxY="466" name="tramway-mini"/>
+  <symbol minX="406" maxX="464" minY="408" maxY="466" name="toilets"/>
+  <symbol minX="464" maxX="522" minY="408" maxY="466" name="parking"/>
+  <symbol minX="522" maxX="580" minY="408" maxY="466" name="theatre"/>
+  <symbol minX="580" maxX="638" minY="408" maxY="466" name="tennis"/>
+  <symbol minX="638" maxX="696" minY="408" maxY="466" name="tennis-borderless"/>
+  <symbol minX="696" maxX="754" minY="408" maxY="466" name="parking_roof"/>
+  <symbol minX="754" maxX="812" minY="408" maxY="466" name="telephone"/>
+  <symbol minX="812" maxX="870" minY="408" maxY="466" name="taxi"/>
+  <symbol minX="870" maxX="928" minY="408" maxY="466" name="peak-mini"/>
+  <symbol minX="928" maxX="986" minY="408" maxY="466" name="peak"/>
+  <symbol minX="0" maxX="58" minY="466" maxY="524" name="petrolstation"/>
+  <symbol minX="58" maxX="116" minY="466" maxY="524" name="pharmacy"/>
+  <symbol minX="116" maxX="174" minY="466" maxY="524" name="synagogue"/>
+  <symbol minX="174" maxX="232" minY="466" maxY="524" name="playground"/>
+  <symbol minX="232" maxX="290" minY="466" maxY="524" name="police"/>
+  <symbol minX="290" maxX="348" minY="466" maxY="524" name="postbox"/>
+  <symbol minX="348" maxX="406" minY="466" maxY="524" name="postoffice"/>
+  <symbol minX="406" maxX="464" minY="466" maxY="524" name="swimming"/>
+  <symbol minX="464" maxX="522" minY="466" maxY="524" name="swimming-borderless"/>
+  <symbol minX="522" maxX="580" minY="466" maxY="524" name="supermarket"/>
+  <symbol minX="580" maxX="638" minY="466" maxY="524" name="subway"/>
+  <symbol minX="638" maxX="696" minY="466" maxY="524" name="subway-station-s"/>
+  <symbol minX="696" maxX="754" minY="466" maxY="524" name="subway-station-m"/>
+  <symbol minX="754" maxX="812" minY="466" maxY="524" name="pub"/>
+  <symbol minX="812" maxX="870" minY="466" maxY="524" name="pubx"/>
+  <symbol minX="870" maxX="928" minY="466" maxY="524" name="railway-crossing-small"/>
+  <symbol minX="928" maxX="986" minY="466" maxY="524" name="railway-crossing"/>
+  <symbol minX="0" maxX="58" minY="524" maxY="582" name="railway-station-mini"/>
+  <symbol minX="58" maxX="116" minY="524" maxY="582" name="railway-station"/>
+  <symbol minX="116" maxX="174" minY="524" maxY="582" name="recycling"/>
+  <symbol minX="174" maxX="232" minY="524" maxY="582" name="religion"/>
+  <symbol minX="232" maxX="290" minY="524" maxY="582" name="restaurant"/>
+  <symbol minX="290" maxX="348" minY="524" maxY="582" name="subway-station-l"/>
+  <symbol minX="348" maxX="406" minY="524" maxY="582" name="soccer"/>
+  <symbol minX="406" maxX="464" minY="524" maxY="582" name="ruins"/>
+  <symbol minX="464" maxX="522" minY="524" maxY="582" name="school"/>
+  <symbol minX="522" maxX="580" minY="524" maxY="582" name="shelter-fireplace"/>
+  <symbol minX="580" maxX="638" minY="524" maxY="582" name="shelter"/>
+  <symbol minX="638" maxX="696" minY="524" maxY="582" name="shooting-borderless"/>
+  <symbol minX="696" maxX="754" minY="524" maxY="582" name="shooting"/>
+  <symbol minX="754" maxX="812" minY="524" maxY="580" name="basketball-borderless"/>
+  <symbol minX="812" maxX="866" minY="524" maxY="578" name="khanda"/>
+  <symbol minX="866" maxX="915" minY="524" maxY="573" name="parking-private"/>
+  <symbol minX="915" maxX="964" minY="524" maxY="573" name="parking-permissive"/>
+  <symbol minX="964" maxX="1009" minY="524" maxY="569" name="roundabout_left"/>
+  <symbol minX="0" maxX="45" minY="582" maxY="627" name="doctor"/>
+  <symbol minX="45" maxX="90" minY="582" maxY="627" name="drinking_water"/>
+  <symbol minX="90" maxX="135" minY="582" maxY="627" name="embassy"/>
+  <symbol minX="135" maxX="180" minY="582" maxY="627" name="housenumber"/>
+  <symbol minX="180" maxX="225" minY="582" maxY="627" name="bank"/>
+  <symbol minX="225" maxX="270" minY="582" maxY="627" name="mosque"/>
+  <symbol minX="270" maxX="315" minY="582" maxY="627" name="windmill"/>
+  <symbol minX="315" maxX="360" minY="582" maxY="627" name="church"/>
+  <symbol minX="360" maxX="405" minY="582" maxY="627" name="speed_trap"/>
+  <symbol minX="405" maxX="450" minY="582" maxY="627" name="traffic_signal"/>
+  <symbol minX="450" maxX="495" minY="582" maxY="627" name="parking_roof-permissive"/>
+  <symbol minX="495" maxX="540" minY="582" maxY="627" name="roundabout_right"/>
+  <symbol minX="540" maxX="580" minY="582" maxY="622" name="bureau_de_change"/>
+  <symbol minX="580" maxX="620" minY="582" maxY="622" name="viewpoint"/>
+  <symbol minX="620" maxX="660" minY="582" maxY="622" name="cave_entrance"/>
+  <symbol minX="660" maxX="700" minY="582" maxY="622" name="power_wind"/>
+  <symbol minX="700" maxX="740" minY="582" maxY="622" name="power_photovoltaic"/>
+  <symbol minX="740" maxX="780" minY="582" maxY="622" name="power_hydro"/>
+  <symbol minX="780" maxX="820" minY="582" maxY="622" name="power_generic"/>
+  <symbol minX="820" maxX="860" minY="582" maxY="622" name="lighthouse"/>
+  <symbol minX="860" maxX="900" minY="582" maxY="622" name="waterfall"/>
+  <symbol minX="900" maxX="940" minY="582" maxY="622" name="wastewater"/>
+  <symbol minX="940" maxX="980" minY="582" maxY="620" name="car_sharing"/>
+  <symbol minX="980" maxX="1018" minY="582" maxY="620" name="current-position"/>
+  <symbol minX="0" maxX="33" minY="627" maxY="660" name="route_from"/>
+  <symbol minX="33" maxX="64" minY="627" maxY="658" name="bench"/>
+  <symbol minX="64" maxX="95" minY="627" maxY="658" name="picnic"/>
+  <symbol minX="95" maxX="153" minY="627" maxY="658" name="parking_fee"/>
+  <symbol minX="153" maxX="211" minY="627" maxY="658" name="park_and_ride-permissive"/>
+  <symbol minX="211" maxX="269" minY="627" maxY="658" name="parking_fee-permissive"/>
+  <symbol minX="269" maxX="327" minY="627" maxY="658" name="park_and_ride"/>
+  <symbol minX="327" maxX="385" minY="627" maxY="658" name="parking_roof_fee"/>
+  <symbol minX="385" maxX="443" minY="627" maxY="658" name="parking_roof_fee-permissive"/>
+  <symbol minX="443" maxX="472" minY="627" maxY="656" name="api-result"/>
+  <symbol minX="472" maxX="500" minY="627" maxY="655" name="search-result"/>
+  <symbol minX="500" maxX="524" minY="627" maxY="651" name="disused"/>
+  <symbol minX="524" maxX="548" minY="627" maxY="651" name="power-tower"/>
+  <symbol minX="548" maxX="572" minY="627" maxY="651" name="building"/>
+  <symbol minX="572" maxX="596" minY="627" maxY="651" name="vulcan"/>
+  <symbol minX="596" maxX="618" minY="627" maxY="649" name="survey_point"/>
+  <symbol minX="618" maxX="633" minY="627" maxY="642" name="power-pole"/>
+  <symbol minX="633" maxX="646" minY="627" maxY="640" name="tree"/>
  </file>
 </root>
diff --git a/data/resources-6plus_clear/symbols.png b/data/resources-6plus_clear/symbols.png
index 8bf0280797..8e3592d2e9 100644
--- a/data/resources-6plus_clear/symbols.png
+++ b/data/resources-6plus_clear/symbols.png
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/resources-6plus_clear/symbols.sdf
index e77a2f602f..f87e7a3393 100644
--- a/data/resources-6plus_clear/symbols.sdf
+++ b/data/resources-6plus_clear/symbols.sdf
@@ -15,449 +15,449 @@
   <symbol minX="1017" maxX="1052" minY="0" maxY="69" name="placemark-red"/>
   <symbol minX="1052" maxX="1087" minY="0" maxY="69" name="placemark-yellow"/>
   <symbol minX="1087" maxX="1122" minY="0" maxY="69" name="placemark-orange"/>
-  <symbol minX="1122" maxX="1180" minY="0" maxY="58" name="shop-l"/>
+  <symbol minX="1122" maxX="1180" minY="0" maxY="58" name="garden_center-l"/>
   <symbol minX="1180" maxX="1238" minY="0" maxY="58" name="atm-l"/>
-  <symbol minX="1238" maxX="1296" minY="0" maxY="58" name="shop-bicycle-l"/>
+  <symbol minX="1238" maxX="1296" minY="0" maxY="58" name="shoes-l"/>
   <symbol minX="1296" maxX="1354" minY="0" maxY="58" name="archery-l"/>
   <symbol minX="1354" maxX="1412" minY="0" maxY="58" name="australian-football-l"/>
-  <symbol minX="1412" maxX="1470" minY="0" maxY="58" name="shoes-l"/>
+  <symbol minX="1412" maxX="1470" minY="0" maxY="58" name="shop-bicycle-l"/>
   <symbol minX="1470" maxX="1528" minY="0" maxY="58" name="bakery-l"/>
   <symbol minX="1528" maxX="1586" minY="0" maxY="58" name="ship-l"/>
   <symbol minX="1586" maxX="1643" minY="0" maxY="58" name="bank-l"/>
   <symbol minX="1643" maxX="1699" minY="0" maxY="58" name="bank-m"/>
   <symbol minX="1699" maxX="1756" minY="0" maxY="58" name="banknote-l"/>
-  <symbol minX="1756" maxX="1814" minY="0" maxY="58" name="skiing-l"/>
+  <symbol minX="1756" maxX="1814" minY="0" maxY="58" name="school-l"/>
   <symbol minX="1814" maxX="1872" minY="0" maxY="58" name="bar-l"/>
-  <symbol minX="1872" maxX="1930" minY="0" maxY="58" name="school-l"/>
-  <symbol minX="1930" maxX="1988" minY="0" maxY="58" name="soccer-l"/>
+  <symbol minX="1872" maxX="1930" minY="0" maxY="58" name="shop-l"/>
+  <symbol minX="1930" maxX="1988" minY="0" maxY="58" name="restaurant-l"/>
   <symbol minX="1988" maxX="2046" minY="0" maxY="58" name="baseball-l"/>
-  <symbol minX="0" maxX="58" minY="165" maxY="223" name="restaurant-l"/>
+  <symbol minX="0" maxX="58" minY="165" maxY="223" name="skiing-l"/>
   <symbol minX="58" maxX="116" minY="165" maxY="223" name="america-football-l"/>
   <symbol minX="116" maxX="174" minY="165" maxY="223" name="basketball-l"/>
-  <symbol minX="174" maxX="230" minY="165" maxY="223" name="remains-m"/>
-  <symbol minX="230" maxX="287" minY="165" maxY="223" name="remains-l"/>
-  <symbol minX="287" maxX="345" minY="165" maxY="223" name="bbq-l"/>
-  <symbol minX="345" maxX="403" minY="165" maxY="223" name="recycling-l"/>
-  <symbol minX="403" maxX="460" minY="165" maxY="223" name="bcontrol-l"/>
-  <symbol minX="460" maxX="516" minY="165" maxY="223" name="bcontrol-m"/>
-  <symbol minX="516" maxX="574" minY="165" maxY="223" name="sports-l"/>
-  <symbol minX="574" maxX="632" minY="165" maxY="223" name="beach-l"/>
-  <symbol minX="632" maxX="690" minY="165" maxY="223" name="pub-l"/>
-  <symbol minX="690" maxX="748" minY="165" maxY="223" name="beauty-l"/>
-  <symbol minX="748" maxX="806" minY="165" maxY="223" name="power-m"/>
-  <symbol minX="806" maxX="863" minY="165" maxY="223" name="beer-l"/>
-  <symbol minX="863" maxX="919" minY="165" maxY="223" name="beer-m"/>
-  <symbol minX="919" maxX="977" minY="165" maxY="223" name="power-l"/>
-  <symbol minX="977" maxX="1035" minY="165" maxY="223" name="alpine_hut-l"/>
-  <symbol minX="1035" maxX="1093" minY="165" maxY="223" name="bicycle-l"/>
-  <symbol minX="1093" maxX="1151" minY="165" maxY="223" name="postbox-l"/>
-  <symbol minX="1151" maxX="1209" minY="165" maxY="223" name="police-l"/>
-  <symbol minX="1209" maxX="1267" minY="165" maxY="223" name="book-shop-l"/>
-  <symbol minX="1267" maxX="1325" minY="165" maxY="223" name="place-of-worship-l"/>
-  <symbol minX="1325" maxX="1383" minY="165" maxY="223" name="alcohol-l"/>
-  <symbol minX="1383" maxX="1441" minY="165" maxY="223" name="boundary_stone-l"/>
-  <symbol minX="1441" maxX="1499" minY="165" maxY="223" name="pitch-l"/>
-  <symbol minX="1499" maxX="1557" minY="165" maxY="223" name="bowls-l"/>
-  <symbol minX="1557" maxX="1613" minY="165" maxY="223" name="picnic-m"/>
-  <symbol minX="1613" maxX="1671" minY="165" maxY="223" name="bus-l"/>
-  <symbol minX="1671" maxX="1728" minY="165" maxY="223" name="picnic-l"/>
-  <symbol minX="1728" maxX="1786" minY="165" maxY="223" name="subway-entrance-l"/>
-  <symbol minX="1786" maxX="1844" minY="165" maxY="223" name="butcher-l"/>
-  <symbol minX="1844" maxX="1902" minY="165" maxY="223" name="phone-l"/>
-  <symbol minX="1902" maxX="1960" minY="165" maxY="223" name="cable-car-l"/>
-  <symbol minX="1960" maxX="2018" minY="165" maxY="223" name="pharmacy-l"/>
-  <symbol minX="0" maxX="58" minY="223" maxY="281" name="airport-m"/>
+  <symbol minX="174" maxX="232" minY="165" maxY="223" name="remains-l"/>
+  <symbol minX="232" maxX="290" minY="165" maxY="223" name="recycling-l"/>
+  <symbol minX="290" maxX="348" minY="165" maxY="223" name="bbq-l"/>
+  <symbol minX="348" maxX="406" minY="165" maxY="223" name="soccer-l"/>
+  <symbol minX="406" maxX="464" minY="165" maxY="223" name="bcontrol-l"/>
+  <symbol minX="464" maxX="522" minY="165" maxY="223" name="pub-l"/>
+  <symbol minX="522" maxX="580" minY="165" maxY="223" name="alpine_hut-l"/>
+  <symbol minX="580" maxX="638" minY="165" maxY="223" name="beach-l"/>
+  <symbol minX="638" maxX="696" minY="165" maxY="223" name="power-m"/>
+  <symbol minX="696" maxX="754" minY="165" maxY="223" name="beauty-l"/>
+  <symbol minX="754" maxX="812" minY="165" maxY="223" name="power-l"/>
+  <symbol minX="812" maxX="870" minY="165" maxY="223" name="beer-l"/>
+  <symbol minX="870" maxX="928" minY="165" maxY="223" name="postbox-l"/>
+  <symbol minX="928" maxX="986" minY="165" maxY="223" name="sports-l"/>
+  <symbol minX="986" maxX="1044" minY="165" maxY="223" name="police-l"/>
+  <symbol minX="1044" maxX="1102" minY="165" maxY="223" name="bicycle-l"/>
+  <symbol minX="1102" maxX="1160" minY="165" maxY="223" name="place-of-worship-l"/>
+  <symbol minX="1160" maxX="1218" minY="165" maxY="223" name="alcohol-l"/>
+  <symbol minX="1218" maxX="1276" minY="165" maxY="223" name="book-shop-l"/>
+  <symbol minX="1276" maxX="1334" minY="165" maxY="223" name="pitch-l"/>
+  <symbol minX="1334" maxX="1392" minY="165" maxY="223" name="picnic-l"/>
+  <symbol minX="1392" maxX="1450" minY="165" maxY="223" name="boundary_stone-l"/>
+  <symbol minX="1450" maxX="1508" minY="165" maxY="223" name="phone-l"/>
+  <symbol minX="1508" maxX="1566" minY="165" maxY="223" name="bowls-l"/>
+  <symbol minX="1566" maxX="1624" minY="165" maxY="223" name="subway-entrance-l"/>
+  <symbol minX="1624" maxX="1682" minY="165" maxY="223" name="bus-l"/>
+  <symbol minX="1682" maxX="1740" minY="165" maxY="223" name="pharmacy-l"/>
+  <symbol minX="1740" maxX="1798" minY="165" maxY="223" name="airport-m"/>
+  <symbol minX="1798" maxX="1856" minY="165" maxY="223" name="butcher-l"/>
+  <symbol minX="1856" maxX="1914" minY="165" maxY="223" name="subway-l"/>
+  <symbol minX="1914" maxX="1972" minY="165" maxY="223" name="cable-car-l"/>
+  <symbol minX="1972" maxX="2030" minY="165" maxY="223" name="peak-l"/>
+  <symbol minX="0" maxX="58" minY="223" maxY="281" name="airport-l"/>
   <symbol minX="58" maxX="116" minY="223" maxY="281" name="cafe-l"/>
-  <symbol minX="116" maxX="174" minY="223" maxY="281" name="subway-l"/>
-  <symbol minX="174" maxX="232" minY="223" maxY="281" name="airport-l"/>
+  <symbol minX="116" maxX="174" minY="223" maxY="281" name="parking-meter-l"/>
+  <symbol minX="174" maxX="232" minY="223" maxY="281" name="subway-newyork-l"/>
   <symbol minX="232" maxX="290" minY="223" maxY="281" name="campsite-l"/>
-  <symbol minX="290" maxX="348" minY="223" maxY="281" name="subway-newyork-l"/>
-  <symbol minX="348" maxX="406" minY="223" maxY="281" name="parking-meter-l"/>
-  <symbol minX="406" maxX="463" minY="223" maxY="281" name="car-repair-l"/>
-  <symbol minX="463" maxX="519" minY="223" maxY="281" name="car-repair-m"/>
-  <symbol minX="519" maxX="577" minY="223" maxY="281" name="zoo-l"/>
-  <symbol minX="577" maxX="635" minY="223" maxY="281" name="car_sharing-l"/>
-  <symbol minX="635" maxX="693" minY="223" maxY="281" name="subway-paris-l"/>
-  <symbol minX="693" maxX="751" minY="223" maxY="281" name="caravan_site-l"/>
-  <symbol minX="751" maxX="809" minY="223" maxY="281" name="park-l"/>
-  <symbol minX="809" maxX="867" minY="223" maxY="281" name="casino-l"/>
-  <symbol minX="867" maxX="925" minY="223" maxY="281" name="optician-l"/>
-  <symbol minX="925" maxX="981" minY="223" maxY="281" name="office-m"/>
-  <symbol minX="981" maxX="1039" minY="223" maxY="281" name="cave-l"/>
-  <symbol minX="1039" maxX="1096" minY="223" maxY="281" name="office-l"/>
-  <symbol minX="1096" maxX="1154" minY="223" maxY="281" name="windmill-l"/>
-  <symbol minX="1154" maxX="1212" minY="223" maxY="281" name="cemetery-l"/>
-  <symbol minX="1212" maxX="1270" minY="223" maxY="281" name="nparkf-l"/>
-  <symbol minX="1270" maxX="1328" minY="223" maxY="281" name="npark-l"/>
-  <symbol minX="1328" maxX="1386" minY="223" maxY="281" name="chemist-l"/>
-  <symbol minX="1386" maxX="1444" minY="223" maxY="281" name="subway-spb-l"/>
-  <symbol minX="1444" maxX="1502" minY="223" maxY="281" name="cinema-l"/>
-  <symbol minX="1502" maxX="1560" minY="223" maxY="281" name="museum-l"/>
-  <symbol minX="1560" maxX="1618" minY="223" maxY="281" name="wayside_shrine-l"/>
-  <symbol minX="1618" maxX="1676" minY="223" maxY="281" name="clothes-l"/>
-  <symbol minX="1676" maxX="1734" minY="223" maxY="281" name="motel-l"/>
-  <symbol minX="1734" maxX="1792" minY="223" maxY="281" name="college-l"/>
-  <symbol minX="1792" maxX="1850" minY="223" maxY="281" name="sweets-l"/>
-  <symbol minX="1850" maxX="1908" minY="223" maxY="281" name="monument-l"/>
-  <symbol minX="1908" maxX="1966" minY="223" maxY="281" name="computer-l"/>
-  <symbol minX="1966" maxX="2024" minY="223" maxY="281" name="mobile_phone-l"/>
+  <symbol minX="290" maxX="348" minY="223" maxY="281" name="park-l"/>
+  <symbol minX="348" maxX="406" minY="223" maxY="281" name="zoo-l"/>
+  <symbol minX="406" maxX="464" minY="223" maxY="281" name="car-repair-l"/>
+  <symbol minX="464" maxX="522" minY="223" maxY="281" name="optician-l"/>
+  <symbol minX="522" maxX="580" minY="223" maxY="281" name="office-l"/>
+  <symbol minX="580" maxX="638" minY="223" maxY="281" name="car_sharing-l"/>
+  <symbol minX="638" maxX="696" minY="223" maxY="281" name="subway-paris-l"/>
+  <symbol minX="696" maxX="754" minY="223" maxY="281" name="caravan_site-l"/>
+  <symbol minX="754" maxX="812" minY="223" maxY="281" name="nparkf-l"/>
+  <symbol minX="812" maxX="870" minY="223" maxY="281" name="casino-l"/>
+  <symbol minX="870" maxX="928" minY="223" maxY="281" name="npark-l"/>
+  <symbol minX="928" maxX="986" minY="223" maxY="281" name="windmill-l"/>
+  <symbol minX="986" maxX="1044" minY="223" maxY="281" name="cave-l"/>
+  <symbol minX="1044" maxX="1102" minY="223" maxY="281" name="museum-l"/>
+  <symbol minX="1102" maxX="1160" minY="223" maxY="281" name="motel-l"/>
+  <symbol minX="1160" maxX="1218" minY="223" maxY="281" name="cemetery-l"/>
+  <symbol minX="1218" maxX="1276" minY="223" maxY="281" name="subway-spb-l"/>
+  <symbol minX="1276" maxX="1334" minY="223" maxY="281" name="wayside_shrine-l"/>
+  <symbol minX="1334" maxX="1392" minY="223" maxY="281" name="chemist-l"/>
+  <symbol minX="1392" maxX="1450" minY="223" maxY="281" name="monument-l"/>
+  <symbol minX="1450" maxX="1508" minY="223" maxY="281" name="cinema-l"/>
+  <symbol minX="1508" maxX="1566" minY="223" maxY="281" name="mobile_phone-l"/>
+  <symbol minX="1566" maxX="1624" minY="223" maxY="281" name="military-l"/>
+  <symbol minX="1624" maxX="1682" minY="223" maxY="281" name="clothes-l"/>
+  <symbol minX="1682" maxX="1740" minY="223" maxY="281" name="sweets-l"/>
+  <symbol minX="1740" maxX="1798" minY="223" maxY="281" name="college-l"/>
+  <symbol minX="1798" maxX="1856" minY="223" maxY="281" name="marketplace-l"/>
+  <symbol minX="1856" maxX="1914" minY="223" maxY="281" name="wayside_cross-l"/>
+  <symbol minX="1914" maxX="1972" minY="223" maxY="281" name="computer-l"/>
+  <symbol minX="1972" maxX="2030" minY="223" maxY="281" name="swimming-l"/>
   <symbol minX="0" maxX="58" minY="281" maxY="339" name="convenience-l"/>
-  <symbol minX="58" maxX="116" minY="281" maxY="339" name="military-l"/>
+  <symbol minX="58" maxX="116" minY="281" maxY="339" name="mail-l"/>
   <symbol minX="116" maxX="174" minY="281" maxY="339" name="cricket-l"/>
-  <symbol minX="174" maxX="232" minY="281" maxY="339" name="swimming-l"/>
-  <symbol minX="232" maxX="290" minY="281" maxY="339" name="wayside_cross-l"/>
-  <symbol minX="290" maxX="348" minY="281" maxY="339" name="marketplace-l"/>
-  <symbol minX="348" maxX="404" minY="281" maxY="339" name="waterfall-m"/>
-  <symbol minX="404" maxX="462" minY="281" maxY="339" name="curling-l"/>
-  <symbol minX="462" maxX="520" minY="281" maxY="339" name="taxi-l"/>
-  <symbol minX="520" maxX="578" minY="281" maxY="339" name="department_store-l"/>
-  <symbol minX="578" maxX="636" minY="281" maxY="339" name="mail-l"/>
-  <symbol minX="636" maxX="694" minY="281" maxY="339" name="diving-l"/>
-  <symbol minX="694" maxX="752" minY="281" maxY="339" name="lightrail-berlin-l"/>
-  <symbol minX="752" maxX="810" minY="281" maxY="339" name="dog_park-l"/>
-  <symbol minX="810" maxX="868" minY="281" maxY="339" name="tennis-l"/>
-  <symbol minX="868" maxX="926" minY="281" maxY="339" name="doityourself-l"/>
-  <symbol minX="926" maxX="984" minY="281" maxY="339" name="lighthouse-l"/>
-  <symbol minX="984" maxX="1041" minY="281" maxY="339" name="waterfall-l"/>
-  <symbol minX="1041" maxX="1099" minY="281" maxY="339" name="lift_gate-l"/>
-  <symbol minX="1099" maxX="1157" minY="281" maxY="339" name="volcano-l"/>
+  <symbol minX="174" maxX="232" minY="281" maxY="339" name="lightrail-berlin-l"/>
+  <symbol minX="232" maxX="290" minY="281" maxY="339" name="taxi-l"/>
+  <symbol minX="290" maxX="346" minY="281" maxY="339" name="waterfall-m"/>
+  <symbol minX="346" maxX="403" minY="281" maxY="339" name="waterfall-l"/>
+  <symbol minX="403" maxX="461" minY="281" maxY="339" name="curling-l"/>
+  <symbol minX="461" maxX="519" minY="281" maxY="339" name="lighthouse-l"/>
+  <symbol minX="519" maxX="577" minY="281" maxY="339" name="department_store-l"/>
+  <symbol minX="577" maxX="635" minY="281" maxY="339" name="lift_gate-l"/>
+  <symbol minX="635" maxX="693" minY="281" maxY="339" name="diving-l"/>
+  <symbol minX="693" maxX="751" minY="281" maxY="339" name="library-l"/>
+  <symbol minX="751" maxX="809" minY="281" maxY="339" name="dog_park-l"/>
+  <symbol minX="809" maxX="867" minY="281" maxY="339" name="laundry-l"/>
+  <symbol minX="867" maxX="925" minY="281" maxY="339" name="doityourself-l"/>
+  <symbol minX="925" maxX="983" minY="281" maxY="339" name="kiosk-l"/>
+  <symbol minX="983" maxX="1041" minY="281" maxY="339" name="tennis-l"/>
+  <symbol minX="1041" maxX="1099" minY="281" maxY="339" name="volcano-l"/>
+  <symbol minX="1099" maxX="1157" minY="281" maxY="339" name="kindergarten-m"/>
   <symbol minX="1157" maxX="1215" minY="281" maxY="339" name="drinking-water-l"/>
-  <symbol minX="1215" maxX="1273" minY="281" maxY="339" name="library-l"/>
-  <symbol minX="1273" maxX="1329" minY="281" maxY="339" name="laundry-m"/>
-  <symbol minX="1329" maxX="1386" minY="281" maxY="339" name="laundry-l"/>
-  <symbol minX="1386" maxX="1444" minY="281" maxY="339" name="electronics-l"/>
-  <symbol minX="1444" maxX="1502" minY="281" maxY="339" name="kiosk-l"/>
-  <symbol minX="1502" maxX="1560" minY="281" maxY="339" name="embassy-l"/>
-  <symbol minX="1560" maxX="1618" minY="281" maxY="339" name="theatre-l"/>
-  <symbol minX="1618" maxX="1676" minY="281" maxY="339" name="vending-l"/>
-  <symbol minX="1676" maxX="1734" minY="281" maxY="339" name="kindergarten-m"/>
-  <symbol minX="1734" maxX="1792" minY="281" maxY="339" name="tram-l"/>
-  <symbol minX="1792" maxX="1850" minY="281" maxY="339" name="equestrian-l"/>
-  <symbol minX="1850" maxX="1908" minY="281" maxY="339" name="equestrian-m"/>
-  <symbol minX="1908" maxX="1966" minY="281" maxY="339" name="kindergarten-l"/>
-  <symbol minX="1966" maxX="2024" minY="281" maxY="339" name="fastfood-l"/>
-  <symbol minX="0" maxX="58" minY="339" maxY="397" name="jewelry-l"/>
-  <symbol minX="58" maxX="116" minY="339" maxY="397" name="train-l"/>
+  <symbol minX="1215" maxX="1273" minY="281" maxY="339" name="kindergarten-l"/>
+  <symbol minX="1273" maxX="1331" minY="281" maxY="339" name="vending-l"/>
+  <symbol minX="1331" maxX="1389" minY="281" maxY="339" name="jewelry-l"/>
+  <symbol minX="1389" maxX="1447" minY="281" maxY="339" name="electronics-l"/>
+  <symbol minX="1447" maxX="1505" minY="281" maxY="339" name="information-l"/>
+  <symbol minX="1505" maxX="1563" minY="281" maxY="339" name="embassy-l"/>
+  <symbol minX="1563" maxX="1621" minY="281" maxY="339" name="hunting-tower-l"/>
+  <symbol minX="1621" maxX="1679" minY="281" maxY="339" name="theatre-l"/>
+  <symbol minX="1679" maxX="1737" minY="281" maxY="339" name="tram-l"/>
+  <symbol minX="1737" maxX="1795" minY="281" maxY="339" name="hotel-l"/>
+  <symbol minX="1795" maxX="1853" minY="281" maxY="339" name="equestrian-l"/>
+  <symbol minX="1853" maxX="1911" minY="281" maxY="339" name="equestrian-m"/>
+  <symbol minX="1911" maxX="1969" minY="281" maxY="339" name="train-l"/>
+  <symbol minX="1969" maxX="2027" minY="281" maxY="339" name="fastfood-l"/>
+  <symbol minX="0" maxX="58" minY="339" maxY="397" name="hospital-l"/>
+  <symbol minX="58" maxX="116" minY="339" maxY="397" name="historic-ship-l"/>
   <symbol minX="116" maxX="174" minY="339" maxY="397" name="fire_station-l"/>
-  <symbol minX="174" maxX="232" minY="339" maxY="397" name="information-l"/>
-  <symbol minX="232" maxX="288" minY="339" maxY="397" name="hunting-tower-m"/>
-  <symbol minX="288" maxX="346" minY="339" maxY="397" name="florist-l"/>
-  <symbol minX="346" maxX="403" minY="339" maxY="397" name="hunting-tower-l"/>
-  <symbol minX="403" maxX="461" minY="339" maxY="397" name="fountain-l"/>
-  <symbol minX="461" maxX="519" minY="339" maxY="397" name="toilets-l"/>
-  <symbol minX="519" maxX="577" minY="339" maxY="397" name="toys-l"/>
-  <symbol minX="577" maxX="635" minY="339" maxY="397" name="fuel-l"/>
-  <symbol minX="635" maxX="693" minY="339" maxY="397" name="hotel-l"/>
-  <symbol minX="693" maxX="751" minY="339" maxY="397" name="hospital-l"/>
-  <symbol minX="751" maxX="809" minY="339" maxY="397" name="funicular-l"/>
-  <symbol minX="809" maxX="867" minY="339" maxY="397" name="historic-ship-l"/>
-  <symbol minX="867" maxX="925" minY="339" maxY="397" name="townhall-l"/>
-  <symbol minX="925" maxX="983" minY="339" maxY="397" name="furniture-l"/>
-  <symbol minX="983" maxX="1039" minY="339" maxY="397" name="heliport-m"/>
-  <symbol minX="1039" maxX="1097" minY="339" maxY="397" name="gallery-l"/>
-  <symbol minX="1097" maxX="1154" minY="339" maxY="397" name="heliport-l"/>
-  <symbol minX="1154" maxX="1212" minY="339" maxY="397" name="toll_booth-l"/>
-  <symbol minX="1212" maxX="1270" minY="339" maxY="397" name="garden-l"/>
-  <symbol minX="1270" maxX="1328" minY="339" maxY="397" name="helipad-l"/>
-  <symbol minX="1328" maxX="1386" minY="339" maxY="397" name="tourism-l"/>
-  <symbol minX="1386" maxX="1444" minY="339" maxY="397" name="garden_center-l"/>
-  <symbol minX="1444" maxX="1502" minY="339" maxY="397" name="hardware-l"/>
-  <symbol minX="1502" maxX="1560" minY="339" maxY="397" name="gate-l"/>
-  <symbol minX="1560" maxX="1618" minY="339" maxY="397" name="hand-m"/>
-  <symbol minX="1618" maxX="1676" minY="339" maxY="397" name="gift-l"/>
-  <symbol minX="1676" maxX="1734" minY="339" maxY="397" name="hand-l"/>
-  <symbol minX="1734" maxX="1792" minY="339" maxY="397" name="golf-l"/>
-  <symbol minX="1792" maxX="1850" minY="339" maxY="397" name="hairdresser-l"/>
-  <symbol minX="1850" maxX="1908" minY="339" maxY="397" name="tomb-l"/>
-  <symbol minX="1908" maxX="1966" minY="339" maxY="397" name="greengrocer-l"/>
-  <symbol minX="1966" maxX="2024" minY="339" maxY="397" name="grocery-l"/>
-  <symbol minX="0" maxX="56" minY="397" maxY="453" name="greengrocer-m"/>
+  <symbol minX="174" maxX="232" minY="339" maxY="397" name="toilets-l"/>
+  <symbol minX="232" maxX="290" minY="339" maxY="397" name="toys-l"/>
+  <symbol minX="290" maxX="348" minY="339" maxY="397" name="florist-l"/>
+  <symbol minX="348" maxX="406" minY="339" maxY="397" name="heliport-l"/>
+  <symbol minX="406" maxX="464" minY="339" maxY="397" name="fountain-l"/>
+  <symbol minX="464" maxX="522" minY="339" maxY="397" name="helipad-l"/>
+  <symbol minX="522" maxX="580" minY="339" maxY="397" name="hardware-l"/>
+  <symbol minX="580" maxX="638" minY="339" maxY="397" name="fuel-l"/>
+  <symbol minX="638" maxX="696" minY="339" maxY="397" name="toll_booth-l"/>
+  <symbol minX="696" maxX="754" minY="339" maxY="397" name="townhall-l"/>
+  <symbol minX="754" maxX="812" minY="339" maxY="397" name="funicular-l"/>
+  <symbol minX="812" maxX="870" minY="339" maxY="397" name="hand-m"/>
+  <symbol minX="870" maxX="928" minY="339" maxY="397" name="hand-l"/>
+  <symbol minX="928" maxX="986" minY="339" maxY="397" name="furniture-l"/>
+  <symbol minX="986" maxX="1044" minY="339" maxY="397" name="hairdresser-l"/>
+  <symbol minX="1044" maxX="1102" minY="339" maxY="397" name="gallery-l"/>
+  <symbol minX="1102" maxX="1160" minY="339" maxY="397" name="grocery-l"/>
+  <symbol minX="1160" maxX="1218" minY="339" maxY="397" name="tourism-l"/>
+  <symbol minX="1218" maxX="1276" minY="339" maxY="397" name="garden-l"/>
+  <symbol minX="1276" maxX="1334" minY="339" maxY="397" name="greengrocer-l"/>
+  <symbol minX="1334" maxX="1392" minY="339" maxY="397" name="tomb-l"/>
+  <symbol minX="1392" maxX="1450" minY="339" maxY="397" name="golf-l"/>
+  <symbol minX="1450" maxX="1508" minY="339" maxY="397" name="gift-l"/>
+  <symbol minX="1508" maxX="1566" minY="339" maxY="397" name="gate-l"/>
+  <symbol minX="1566" maxX="1622" minY="339" maxY="395" name="gate-m"/>
+  <symbol minX="1622" maxX="1678" minY="339" maxY="395" name="garden_center-m"/>
+  <symbol minX="1678" maxX="1734" minY="339" maxY="395" name="gift-m"/>
+  <symbol minX="1734" maxX="1790" minY="339" maxY="395" name="archery-m"/>
+  <symbol minX="1790" maxX="1846" minY="339" maxY="395" name="golf-m"/>
+  <symbol minX="1846" maxX="1902" minY="339" maxY="395" name="tomb-m"/>
+  <symbol minX="1902" maxX="1958" minY="339" maxY="395" name="garden-m"/>
+  <symbol minX="1958" maxX="2014" minY="339" maxY="395" name="greengrocer-m"/>
+  <symbol minX="0" maxX="56" minY="397" maxY="453" name="gallery-m"/>
   <symbol minX="56" maxX="112" minY="397" maxY="453" name="grocery-m"/>
-  <symbol minX="112" maxX="168" minY="397" maxY="453" name="tomb-m"/>
-  <symbol minX="168" maxX="224" minY="397" maxY="453" name="golf-m"/>
+  <symbol minX="112" maxX="168" minY="397" maxY="453" name="toll_booth-m"/>
+  <symbol minX="168" maxX="224" minY="397" maxY="453" name="furniture-m"/>
   <symbol minX="224" maxX="280" minY="397" maxY="453" name="hairdresser-m"/>
-  <symbol minX="280" maxX="336" minY="397" maxY="453" name="gift-m"/>
-  <symbol minX="336" maxX="392" minY="397" maxY="453" name="gate-m"/>
-  <symbol minX="392" maxX="448" minY="397" maxY="453" name="toll_booth-m"/>
-  <symbol minX="448" maxX="504" minY="397" maxY="453" name="archery-m"/>
+  <symbol minX="280" maxX="336" minY="397" maxY="453" name="tourism-m"/>
+  <symbol minX="336" maxX="392" minY="397" maxY="453" name="funicular-m"/>
+  <symbol minX="392" maxX="448" minY="397" maxY="453" name="fuel-m"/>
+  <symbol minX="448" maxX="504" minY="397" maxY="453" name="townhall-m"/>
   <symbol minX="504" maxX="560" minY="397" maxY="453" name="hardware-m"/>
-  <symbol minX="560" maxX="616" minY="397" maxY="453" name="garden-m"/>
+  <symbol minX="560" maxX="616" minY="397" maxY="453" name="fountain-m"/>
   <symbol minX="616" maxX="672" minY="397" maxY="453" name="helipad-m"/>
-  <symbol minX="672" maxX="728" minY="397" maxY="453" name="tourism-m"/>
-  <symbol minX="728" maxX="784" minY="397" maxY="453" name="gallery-m"/>
-  <symbol minX="784" maxX="840" minY="397" maxY="453" name="furniture-m"/>
-  <symbol minX="840" maxX="896" minY="397" maxY="453" name="garden_center-m"/>
-  <symbol minX="896" maxX="952" minY="397" maxY="453" name="funicular-m"/>
+  <symbol minX="672" maxX="728" minY="397" maxY="453" name="toilets-m"/>
+  <symbol minX="728" maxX="784" minY="397" maxY="453" name="florist-m"/>
+  <symbol minX="784" maxX="840" minY="397" maxY="453" name="heliport-m"/>
+  <symbol minX="840" maxX="896" minY="397" maxY="453" name="fire_station-m"/>
+  <symbol minX="896" maxX="952" minY="397" maxY="453" name="toys-m"/>
   <symbol minX="952" maxX="1008" minY="397" maxY="453" name="historic-ship-m"/>
-  <symbol minX="1008" maxX="1064" minY="397" maxY="453" name="townhall-m"/>
+  <symbol minX="1008" maxX="1064" minY="397" maxY="453" name="fastfood-m"/>
   <symbol minX="1064" maxX="1120" minY="397" maxY="453" name="hospital-m"/>
-  <symbol minX="1120" maxX="1176" minY="397" maxY="453" name="toilets-m"/>
-  <symbol minX="1176" maxX="1232" minY="397" maxY="453" name="fuel-m"/>
+  <symbol minX="1120" maxX="1176" minY="397" maxY="453" name="theatre-m"/>
+  <symbol minX="1176" maxX="1232" minY="397" maxY="453" name="train-m"/>
   <symbol minX="1232" maxX="1288" minY="397" maxY="453" name="hotel-m"/>
-  <symbol minX="1288" maxX="1344" minY="397" maxY="453" name="fountain-m"/>
-  <symbol minX="1344" maxX="1400" minY="397" maxY="453" name="florist-m"/>
-  <symbol minX="1400" maxX="1456" minY="397" maxY="453" name="toys-m"/>
-  <symbol minX="1456" maxX="1512" minY="397" maxY="453" name="shop-bicycle-m"/>
-  <symbol minX="1512" maxX="1568" minY="397" maxY="453" name="fire_station-m"/>
+  <symbol minX="1288" maxX="1344" minY="397" maxY="453" name="tram-m"/>
+  <symbol minX="1344" maxX="1400" minY="397" maxY="453" name="embassy-m"/>
+  <symbol minX="1400" maxX="1456" minY="397" maxY="453" name="hunting-tower-m"/>
+  <symbol minX="1456" maxX="1512" minY="397" maxY="453" name="atm-m"/>
+  <symbol minX="1512" maxX="1568" minY="397" maxY="453" name="electronics-m"/>
   <symbol minX="1568" maxX="1624" minY="397" maxY="453" name="information-m"/>
-  <symbol minX="1624" maxX="1680" minY="397" maxY="453" name="theatre-m"/>
-  <symbol minX="1680" maxX="1736" minY="397" maxY="453" name="fastfood-m"/>
+  <symbol minX="1624" maxX="1680" minY="397" maxY="453" name="tennis-m"/>
+  <symbol minX="1680" maxX="1736" minY="397" maxY="453" name="drugs"/>
   <symbol minX="1736" maxX="1792" minY="397" maxY="453" name="jewelry-m"/>
-  <symbol minX="1792" maxX="1848" minY="397" maxY="453" name="train-m"/>
-  <symbol minX="1848" maxX="1904" minY="397" maxY="453" name="tram-m"/>
-  <symbol minX="1904" maxX="1960" minY="397" maxY="453" name="embassy-m"/>
-  <symbol minX="1960" maxX="2016" minY="397" maxY="453" name="electronics-m"/>
+  <symbol minX="1792" maxX="1848" minY="397" maxY="453" name="drinking-water-m"/>
+  <symbol minX="1848" maxX="1904" minY="397" maxY="453" name="vending-m"/>
+  <symbol minX="1904" maxX="1960" minY="397" maxY="453" name="volcano-m"/>
+  <symbol minX="1960" maxX="2016" minY="397" maxY="453" name="doityourself-m"/>
   <symbol minX="0" maxX="56" minY="453" maxY="509" name="kiosk-m"/>
-  <symbol minX="56" maxX="112" minY="453" maxY="509" name="drugs"/>
-  <symbol minX="112" maxX="168" minY="453" maxY="509" name="vending-m"/>
-  <symbol minX="168" maxX="224" minY="453" maxY="509" name="drinking-water-m"/>
+  <symbol minX="56" maxX="112" minY="453" maxY="509" name="dog_park-m"/>
+  <symbol minX="112" maxX="168" minY="453" maxY="509" name="laundry-m"/>
+  <symbol minX="168" maxX="224" minY="453" maxY="509" name="diving-m"/>
   <symbol minX="224" maxX="280" minY="453" maxY="509" name="library-m"/>
-  <symbol minX="280" maxX="336" minY="453" maxY="509" name="tennis-m"/>
-  <symbol minX="336" maxX="392" minY="453" maxY="509" name="volcano-m"/>
+  <symbol minX="280" maxX="336" minY="453" maxY="509" name="taxi-m"/>
+  <symbol minX="336" maxX="392" minY="453" maxY="509" name="department_store-m"/>
   <symbol minX="392" maxX="448" minY="453" maxY="509" name="lift_gate-m"/>
-  <symbol minX="448" maxX="504" minY="453" maxY="509" name="doityourself-m"/>
+  <symbol minX="448" maxX="504" minY="453" maxY="509" name="curling-m"/>
   <symbol minX="504" maxX="560" minY="453" maxY="509" name="lighthouse-m"/>
-  <symbol minX="560" maxX="616" minY="453" maxY="509" name="dog_park-m"/>
-  <symbol minX="616" maxX="672" minY="453" maxY="509" name="diving-m"/>
-  <symbol minX="672" maxX="728" minY="453" maxY="509" name="atm-m"/>
-  <symbol minX="728" maxX="784" minY="453" maxY="509" name="taxi-m"/>
-  <symbol minX="784" maxX="840" minY="453" maxY="509" name="department_store-m"/>
+  <symbol minX="560" maxX="616" minY="453" maxY="509" name="australian-football-m"/>
+  <symbol minX="616" maxX="672" minY="453" maxY="509" name="cricket-m"/>
+  <symbol minX="672" maxX="728" minY="453" maxY="509" name="ship-m"/>
+  <symbol minX="728" maxX="784" minY="453" maxY="509" name="swimming-m"/>
+  <symbol minX="784" maxX="840" minY="453" maxY="509" name="convenience-m"/>
   <symbol minX="840" maxX="896" minY="453" maxY="509" name="mail-m"/>
-  <symbol minX="896" maxX="952" minY="453" maxY="509" name="curling-m"/>
-  <symbol minX="952" maxX="1008" minY="453" maxY="509" name="shoes-m"/>
+  <symbol minX="896" maxX="952" minY="453" maxY="509" name="computer-m"/>
+  <symbol minX="952" maxX="1008" minY="453" maxY="509" name="college-m"/>
   <symbol minX="1008" maxX="1064" minY="453" maxY="509" name="marketplace-m"/>
-  <symbol minX="1064" maxX="1120" minY="453" maxY="509" name="swimming-m"/>
-  <symbol minX="1120" maxX="1176" minY="453" maxY="509" name="cricket-m"/>
-  <symbol minX="1176" maxX="1232" minY="453" maxY="509" name="convenience-m"/>
+  <symbol minX="1064" maxX="1120" minY="453" maxY="509" name="sweets-m"/>
+  <symbol minX="1120" maxX="1176" minY="453" maxY="509" name="clothes-m"/>
+  <symbol minX="1176" maxX="1232" minY="453" maxY="509" name="wayside_cross-m"/>
   <symbol minX="1232" maxX="1288" minY="453" maxY="509" name="military-m"/>
-  <symbol minX="1288" maxX="1344" minY="453" maxY="509" name="sweets-m"/>
-  <symbol minX="1344" maxX="1400" minY="453" maxY="509" name="computer-m"/>
+  <symbol minX="1288" maxX="1344" minY="453" maxY="509" name="subway-spb-m"/>
+  <symbol minX="1344" maxX="1400" minY="453" maxY="509" name="cinema-m"/>
   <symbol minX="1400" maxX="1456" minY="453" maxY="509" name="mobile_phone-m"/>
-  <symbol minX="1456" maxX="1512" minY="453" maxY="509" name="wayside_cross-m"/>
+  <symbol minX="1456" maxX="1512" minY="453" maxY="509" name="chemist-m"/>
   <symbol minX="1512" maxX="1568" minY="453" maxY="509" name="monument-m"/>
-  <symbol minX="1568" maxX="1624" minY="453" maxY="509" name="college-m"/>
-  <symbol minX="1624" maxX="1680" minY="453" maxY="509" name="clothes-m"/>
+  <symbol minX="1568" maxX="1624" minY="453" maxY="509" name="cemetery-m"/>
+  <symbol minX="1624" maxX="1680" minY="453" maxY="509" name="wayside_shrine-m"/>
   <symbol minX="1680" maxX="1736" minY="453" maxY="509" name="motel-m"/>
-  <symbol minX="1736" maxX="1792" minY="453" maxY="509" name="cinema-m"/>
+  <symbol minX="1736" maxX="1792" minY="453" maxY="509" name="cave-m"/>
   <symbol minX="1792" maxX="1848" minY="453" maxY="509" name="museum-m"/>
-  <symbol minX="1848" maxX="1904" minY="453" maxY="509" name="subway-spb-m"/>
-  <symbol minX="1904" maxX="1960" minY="453" maxY="509" name="australian-football-m"/>
-  <symbol minX="1960" maxX="2016" minY="453" maxY="509" name="shop-m"/>
-  <symbol minX="0" maxX="56" minY="509" maxY="565" name="ship-m"/>
-  <symbol minX="56" maxX="112" minY="509" maxY="565" name="bakery-m"/>
-  <symbol minX="112" maxX="168" minY="509" maxY="565" name="banknote-m"/>
-  <symbol minX="168" maxX="224" minY="509" maxY="565" name="chemist-m"/>
-  <symbol minX="224" maxX="280" minY="509" maxY="565" name="wayside_shrine-m"/>
+  <symbol minX="1848" maxX="1904" minY="453" maxY="509" name="bakery-m"/>
+  <symbol minX="1904" maxX="1960" minY="453" maxY="509" name="shoes-m"/>
+  <symbol minX="1960" maxX="2016" minY="453" maxY="509" name="shop-bicycle-m"/>
+  <symbol minX="0" maxX="56" minY="509" maxY="565" name="school-m"/>
+  <symbol minX="56" maxX="112" minY="509" maxY="565" name="banknote-m"/>
+  <symbol minX="112" maxX="168" minY="509" maxY="565" name="bar-m"/>
+  <symbol minX="168" maxX="224" minY="509" maxY="565" name="shop-m"/>
+  <symbol minX="224" maxX="280" minY="509" maxY="565" name="casino-m"/>
   <symbol minX="280" maxX="336" minY="509" maxY="565" name="npark-m"/>
-  <symbol minX="336" maxX="392" minY="509" maxY="565" name="school-m"/>
-  <symbol minX="392" maxX="448" minY="509" maxY="565" name="cemetery-m"/>
+  <symbol minX="336" maxX="392" minY="509" maxY="565" name="restaurant-m"/>
+  <symbol minX="392" maxX="448" minY="509" maxY="565" name="caravan_site-m"/>
   <symbol minX="448" maxX="504" minY="509" maxY="565" name="nparkf-m "/>
   <symbol minX="504" maxX="560" minY="509" maxY="565" name="nparkf-m"/>
-  <symbol minX="560" maxX="616" minY="509" maxY="565" name="bar-m"/>
-  <symbol minX="616" maxX="672" minY="509" maxY="565" name="cave-m"/>
-  <symbol minX="672" maxX="728" minY="509" maxY="565" name="windmill-m"/>
-  <symbol minX="728" maxX="784" minY="509" maxY="565" name="skiing-m"/>
-  <symbol minX="784" maxX="840" minY="509" maxY="565" name="casino-m"/>
+  <symbol minX="560" maxX="616" minY="509" maxY="565" name="car_sharing-m"/>
+  <symbol minX="616" maxX="672" minY="509" maxY="565" name="windmill-m"/>
+  <symbol minX="672" maxX="728" minY="509" maxY="565" name="office-m"/>
+  <symbol minX="728" maxX="784" minY="509" maxY="565" name="subway-newyork-m"/>
+  <symbol minX="784" maxX="840" minY="509" maxY="565" name="car-repair-m"/>
   <symbol minX="840" maxX="896" minY="509" maxY="565" name="optician-m"/>
-  <symbol minX="896" maxX="952" minY="509" maxY="565" name="caravan_site-m"/>
+  <symbol minX="896" maxX="952" minY="509" maxY="565" name="campsite-m"/>
   <symbol minX="952" maxX="1008" minY="509" maxY="565" name="park-m"/>
-  <symbol minX="1008" maxX="1064" minY="509" maxY="565" name="america-football-m"/>
-  <symbol minX="1064" maxX="1120" minY="509" maxY="565" name="restaurant-m"/>
-  <symbol minX="1120" maxX="1176" minY="509" maxY="565" name="car_sharing-m"/>
-  <symbol minX="1176" maxX="1232" minY="509" maxY="565" name="zoo-m"/>
+  <symbol minX="1008" maxX="1064" minY="509" maxY="565" name="zoo-m"/>
+  <symbol minX="1064" maxX="1120" minY="509" maxY="565" name="america-football-m"/>
+  <symbol minX="1120" maxX="1176" minY="509" maxY="565" name="baseball-m"/>
+  <symbol minX="1176" maxX="1232" minY="509" maxY="565" name="cafe-m"/>
   <symbol minX="1232" maxX="1288" minY="509" maxY="565" name="parking-meter-m"/>
-  <symbol minX="1288" maxX="1344" minY="509" maxY="565" name="subway-newyork-m"/>
-  <symbol minX="1344" maxX="1400" minY="509" maxY="565" name="campsite-m"/>
-  <symbol minX="1400" maxX="1456" minY="509" maxY="565" name="baseball-m"/>
-  <symbol minX="1456" maxX="1512" minY="509" maxY="565" name="basketball-m"/>
-  <symbol minX="1512" maxX="1568" minY="509" maxY="565" name="subway-m"/>
-  <symbol minX="1568" maxX="1624" minY="509" maxY="565" name="alpine_hut-m"/>
-  <symbol minX="1624" maxX="1680" minY="509" maxY="565" name="cafe-m"/>
+  <symbol minX="1288" maxX="1344" minY="509" maxY="565" name="remains-m"/>
+  <symbol minX="1344" maxX="1400" minY="509" maxY="565" name="cable-car-m"/>
+  <symbol minX="1400" maxX="1456" minY="509" maxY="565" name="peak-m"/>
+  <symbol minX="1456" maxX="1512" minY="509" maxY="565" name="subway-m"/>
+  <symbol minX="1512" maxX="1568" minY="509" maxY="565" name="basketball-m"/>
+  <symbol minX="1568" maxX="1624" minY="509" maxY="565" name="butcher-m"/>
+  <symbol minX="1624" maxX="1680" minY="509" maxY="565" name="subway-entrance-m"/>
   <symbol minX="1680" maxX="1736" minY="509" maxY="565" name="pharmacy-2-m"/>
-  <symbol minX="1736" maxX="1792" minY="509" maxY="565" name="cable-car-m"/>
+  <symbol minX="1736" maxX="1792" minY="509" maxY="565" name="bus-m"/>
   <symbol minX="1792" maxX="1848" minY="509" maxY="565" name="pharmacy-m"/>
-  <symbol minX="1848" maxX="1904" minY="509" maxY="565" name="subway-entrance-m"/>
-  <symbol minX="1904" maxX="1960" minY="509" maxY="565" name="butcher-m"/>
+  <symbol minX="1848" maxX="1904" minY="509" maxY="565" name="bowls-m"/>
+  <symbol minX="1904" maxX="1960" minY="509" maxY="565" name="boundary_stone-m"/>
   <symbol minX="1960" maxX="2016" minY="509" maxY="565" name="phone-m"/>
-  <symbol minX="0" maxX="56" minY="565" maxY="621" name="soccer-m"/>
-  <symbol minX="56" maxX="112" minY="565" maxY="621" name="bus-m"/>
-  <symbol minX="112" maxX="168" minY="565" maxY="621" name="bowls-m"/>
+  <symbol minX="0" maxX="56" minY="565" maxY="621" name="subway-entrance-2-m"/>
+  <symbol minX="56" maxX="112" minY="565" maxY="621" name="skiing-m"/>
+  <symbol minX="112" maxX="168" minY="565" maxY="621" name="picnic-m"/>
   <symbol minX="168" maxX="224" minY="565" maxY="621" name="recycling-m"/>
-  <symbol minX="224" maxX="280" minY="565" maxY="621" name="boundary_stone-m"/>
+  <symbol minX="224" maxX="280" minY="565" maxY="621" name="book-shop-m"/>
   <symbol minX="280" maxX="336" minY="565" maxY="621" name="pitch-m"/>
-  <symbol minX="336" maxX="392" minY="565" maxY="621" name="subway-entrance-2-m"/>
-  <symbol minX="392" maxX="448" minY="565" maxY="621" name="book-shop-m"/>
+  <symbol minX="336" maxX="392" minY="565" maxY="621" name="alpine_hut-m"/>
+  <symbol minX="392" maxX="448" minY="565" maxY="621" name="bicycle-m"/>
   <symbol minX="448" maxX="504" minY="565" maxY="621" name="place-of-worship-m"/>
-  <symbol minX="504" maxX="560" minY="565" maxY="621" name="bbq-m"/>
+  <symbol minX="504" maxX="560" minY="565" maxY="621" name="sports-m"/>
   <symbol minX="560" maxX="616" minY="565" maxY="621" name="alcohol-m"/>
   <symbol minX="616" maxX="672" minY="565" maxY="621" name="police-m"/>
-  <symbol minX="672" maxX="728" minY="565" maxY="621" name="pub-m"/>
-  <symbol minX="728" maxX="784" minY="565" maxY="621" name="bicycle-m"/>
+  <symbol minX="672" maxX="728" minY="565" maxY="621" name="bbq-m"/>
+  <symbol minX="728" maxX="784" minY="565" maxY="621" name="beer-m"/>
   <symbol minX="784" maxX="840" minY="565" maxY="621" name="postbox-m"/>
-  <symbol minX="840" maxX="896" minY="565" maxY="621" name="beach-m"/>
-  <symbol minX="896" maxX="952" minY="565" maxY="621" name="beauty-m"/>
-  <symbol minX="952" maxX="1008" minY="565" maxY="621" name="sports-m"/>
-  <symbol minX="1008" maxX="1059" minY="565" maxY="616" name="subway-rome-l"/>
-  <symbol minX="1059" maxX="1110" minY="565" maxY="616" name="subway-berlin-l"/>
-  <symbol minX="1110" maxX="1161" minY="565" maxY="616" name="lightrail-berlin-m"/>
-  <symbol minX="1161" maxX="1212" minY="565" maxY="616" name="speedcam-l"/>
-  <symbol minX="1212" maxX="1263" minY="565" maxY="616" name="parking-l"/>
-  <symbol minX="1263" maxX="1321" minY="565" maxY="616" name="subway-moscow-l"/>
-  <symbol minX="1321" maxX="1368" minY="565" maxY="612" name="no-icon-leisure"/>
-  <symbol minX="1368" maxX="1415" minY="565" maxY="612" name="subway-paris-m"/>
-  <symbol minX="1415" maxX="1462" minY="565" maxY="612" name="no-icon-amenity"/>
-  <symbol minX="1462" maxX="1509" minY="565" maxY="612" name="no-icon-tourism"/>
-  <symbol minX="1509" maxX="1563" minY="565" maxY="612" name="subway-moscow-m"/>
-  <symbol minX="1563" maxX="1610" minY="565" maxY="612" name="subway-berlin-m"/>
-  <symbol minX="1610" maxX="1657" minY="565" maxY="612" name="no-icon"/>
-  <symbol minX="1657" maxX="1704" minY="565" maxY="612" name="subway-rome-m"/>
-  <symbol minX="1704" maxX="1751" minY="565" maxY="612" name="no-icon-shop"/>
-  <symbol minX="1751" maxX="1793" minY="565" maxY="610" name="office-s"/>
-  <symbol minX="1793" maxX="1835" minY="565" maxY="610" name="beer-s"/>
-  <symbol minX="1835" maxX="1877" minY="565" maxY="610" name="remains-s"/>
-  <symbol minX="1877" maxX="1935" minY="565" maxY="610" name="subway-london-l"/>
-  <symbol minX="1935" maxX="1980" minY="565" maxY="610" name="airport-s"/>
-  <symbol minX="1980" maxX="2022" minY="565" maxY="610" name="picnic-s"/>
-  <symbol minX="0" maxX="42" minY="621" maxY="666" name="waterfall-s"/>
-  <symbol minX="42" maxX="84" minY="621" maxY="666" name="bcontrol-s"/>
-  <symbol minX="84" maxX="126" minY="621" maxY="666" name="hunting-tower-s"/>
-  <symbol minX="126" maxX="168" minY="621" maxY="666" name="heliport-s"/>
-  <symbol minX="168" maxX="210" minY="621" maxY="663" name="ship-s"/>
-  <symbol minX="210" maxX="252" minY="621" maxY="663" name="shop-s"/>
-  <symbol minX="252" maxX="294" minY="621" maxY="663" name="school-s"/>
-  <symbol minX="294" maxX="336" minY="621" maxY="663" name="funicular-s"/>
-  <symbol minX="336" maxX="378" minY="621" maxY="663" name="skiing-s"/>
-  <symbol minX="378" maxX="420" minY="621" maxY="663" name="restaurant-s"/>
-  <symbol minX="420" maxX="462" minY="621" maxY="663" name="recycling-s"/>
-  <symbol minX="462" maxX="504" minY="621" maxY="663" name="soccer-s"/>
-  <symbol minX="504" maxX="546" minY="621" maxY="663" name="alcohol-s"/>
-  <symbol minX="546" maxX="588" minY="621" maxY="663" name="speedcam-m"/>
-  <symbol minX="588" maxX="630" minY="621" maxY="663" name="america-football-s"/>
-  <symbol minX="630" maxX="672" minY="621" maxY="663" name="pub-s"/>
-  <symbol minX="672" maxX="714" minY="621" maxY="663" name="power-s"/>
-  <symbol minX="714" maxX="756" minY="621" maxY="663" name="tourism-s"/>
-  <symbol minX="756" maxX="798" minY="621" maxY="663" name="atm-s"/>
-  <symbol minX="798" maxX="840" minY="621" maxY="663" name="bar-s"/>
-  <symbol minX="840" maxX="882" minY="621" maxY="663" name="gallery-s"/>
-  <symbol minX="882" maxX="940" minY="621" maxY="663" name="subway-barcelona-m"/>
-  <symbol minX="940" maxX="991" minY="621" maxY="663" name="subway-barcelona-s"/>
-  <symbol minX="991" maxX="1033" minY="621" maxY="663" name="police-s"/>
-  <symbol minX="1033" maxX="1075" minY="621" maxY="663" name="place-of-worship-s"/>
-  <symbol minX="1075" maxX="1117" minY="621" maxY="663" name="baseball-s"/>
-  <symbol minX="1117" maxX="1159" minY="621" maxY="663" name="pitch-s"/>
-  <symbol minX="1159" maxX="1201" minY="621" maxY="663" name="subway-entrance-2-s"/>
-  <symbol minX="1201" maxX="1243" minY="621" maxY="663" name="subway-entrance-arrow"/>
-  <symbol minX="1243" maxX="1285" minY="621" maxY="663" name="phone-s"/>
-  <symbol minX="1285" maxX="1327" minY="621" maxY="663" name="pharmacy-s"/>
-  <symbol minX="1327" maxX="1369" minY="621" maxY="663" name="subway-entrance-s"/>
-  <symbol minX="1369" maxX="1411" minY="621" maxY="663" name="basketball-s"/>
-  <symbol minX="1411" maxX="1453" minY="621" maxY="663" name="bicycle-s"/>
-  <symbol minX="1453" maxX="1495" minY="621" maxY="663" name="book-shop-s"/>
-  <symbol minX="1495" maxX="1537" minY="621" maxY="663" name="bus-s"/>
-  <symbol minX="1537" maxX="1579" minY="621" maxY="663" name="cable-car-s"/>
-  <symbol minX="1579" maxX="1635" minY="621" maxY="663" name="subway-london-m"/>
-  <symbol minX="1635" maxX="1677" minY="621" maxY="663" name="cafe-s"/>
-  <symbol minX="1677" maxX="1719" minY="621" maxY="663" name="zoo-s"/>
-  <symbol minX="1719" maxX="1761" minY="621" maxY="663" name="garden-s"/>
-  <symbol minX="1761" maxX="1819" minY="621" maxY="663" name="subway-madrid-m"/>
-  <symbol minX="1819" maxX="1861" minY="621" maxY="663" name="campsite-s"/>
-  <symbol minX="1861" maxX="1903" minY="621" maxY="663" name="car-repair-s"/>
-  <symbol minX="1903" maxX="1945" minY="621" maxY="663" name="windmill-s"/>
-  <symbol minX="1945" maxX="1987" minY="621" maxY="663" name="casino-s"/>
-  <symbol minX="1987" maxX="2029" minY="621" maxY="663" name="cave-s"/>
-  <symbol minX="0" maxX="42" minY="666" maxY="708" name="cemetery-s"/>
-  <symbol minX="42" maxX="84" minY="666" maxY="708" name="cinema-s"/>
-  <symbol minX="84" maxX="126" minY="666" maxY="708" name="college-s"/>
-  <symbol minX="126" maxX="168" minY="666" maxY="708" name="volcano-s"/>
+  <symbol minX="840" maxX="896" minY="565" maxY="621" name="beauty-m"/>
+  <symbol minX="896" maxX="952" minY="565" maxY="621" name="beach-m"/>
+  <symbol minX="952" maxX="1008" minY="565" maxY="621" name="soccer-m"/>
+  <symbol minX="1008" maxX="1064" minY="565" maxY="621" name="bcontrol-m"/>
+  <symbol minX="1064" maxX="1120" minY="565" maxY="621" name="pub-m"/>
+  <symbol minX="1120" maxX="1171" minY="565" maxY="616" name="speedcam-l"/>
+  <symbol minX="1171" maxX="1222" minY="565" maxY="616" name="lightrail-berlin-m"/>
+  <symbol minX="1222" maxX="1273" minY="565" maxY="616" name="subway-berlin-l"/>
+  <symbol minX="1273" maxX="1324" minY="565" maxY="616" name="subway-rome-l"/>
+  <symbol minX="1324" maxX="1375" minY="565" maxY="616" name="parking-l"/>
+  <symbol minX="1375" maxX="1433" minY="565" maxY="616" name="subway-moscow-l"/>
+  <symbol minX="1433" maxX="1480" minY="565" maxY="612" name="no-icon-shop"/>
+  <symbol minX="1480" maxX="1534" minY="565" maxY="612" name="subway-moscow-m"/>
+  <symbol minX="1534" maxX="1581" minY="565" maxY="612" name="subway-rome-m"/>
+  <symbol minX="1581" maxX="1628" minY="565" maxY="612" name="subway-paris-m"/>
+  <symbol minX="1628" maxX="1675" minY="565" maxY="612" name="subway-berlin-m"/>
+  <symbol minX="1675" maxX="1722" minY="565" maxY="612" name="no-icon"/>
+  <symbol minX="1722" maxX="1769" minY="565" maxY="612" name="no-icon-tourism"/>
+  <symbol minX="1769" maxX="1816" minY="565" maxY="612" name="no-icon-amenity"/>
+  <symbol minX="1816" maxX="1863" minY="565" maxY="612" name="no-icon-leisure"/>
+  <symbol minX="1863" maxX="1908" minY="565" maxY="610" name="airport-s"/>
+  <symbol minX="1908" maxX="1950" minY="565" maxY="610" name="beer-s"/>
+  <symbol minX="1950" maxX="1992" minY="565" maxY="610" name="waterfall-s"/>
+  <symbol minX="1992" maxX="2034" minY="565" maxY="610" name="hunting-tower-s"/>
+  <symbol minX="0" maxX="58" minY="621" maxY="666" name="subway-london-l"/>
+  <symbol minX="58" maxX="100" minY="621" maxY="663" name="ship-s"/>
+  <symbol minX="100" maxX="142" minY="621" maxY="663" name="school-s"/>
+  <symbol minX="142" maxX="184" minY="621" maxY="663" name="alcohol-s"/>
+  <symbol minX="184" maxX="226" minY="621" maxY="663" name="restaurant-s"/>
+  <symbol minX="226" maxX="268" minY="621" maxY="663" name="shop-s"/>
+  <symbol minX="268" maxX="310" minY="621" maxY="663" name="remains-s"/>
+  <symbol minX="310" maxX="352" minY="621" maxY="663" name="recycling-s"/>
+  <symbol minX="352" maxX="394" minY="621" maxY="663" name="skiing-s"/>
+  <symbol minX="394" maxX="436" minY="621" maxY="663" name="america-football-s"/>
+  <symbol minX="436" maxX="478" minY="621" maxY="663" name="pub-s"/>
+  <symbol minX="478" maxX="520" minY="621" maxY="663" name="soccer-s"/>
+  <symbol minX="520" maxX="562" minY="621" maxY="663" name="power-s"/>
+  <symbol minX="562" maxX="604" minY="621" maxY="663" name="speedcam-m"/>
+  <symbol minX="604" maxX="646" minY="621" maxY="663" name="atm-s"/>
+  <symbol minX="646" maxX="688" minY="621" maxY="663" name="police-s"/>
+  <symbol minX="688" maxX="730" minY="621" maxY="663" name="place-of-worship-s"/>
+  <symbol minX="730" maxX="772" minY="621" maxY="663" name="bar-s"/>
+  <symbol minX="772" maxX="814" minY="621" maxY="663" name="baseball-s"/>
+  <symbol minX="814" maxX="856" minY="621" maxY="663" name="basketball-s"/>
+  <symbol minX="856" maxX="898" minY="621" maxY="663" name="bcontrol-s"/>
+  <symbol minX="898" maxX="956" minY="621" maxY="663" name="subway-barcelona-m"/>
+  <symbol minX="956" maxX="1007" minY="621" maxY="663" name="subway-barcelona-s"/>
+  <symbol minX="1007" maxX="1049" minY="621" maxY="663" name="pitch-s"/>
+  <symbol minX="1049" maxX="1091" minY="621" maxY="663" name="picnic-s"/>
+  <symbol minX="1091" maxX="1133" minY="621" maxY="663" name="bicycle-s"/>
+  <symbol minX="1133" maxX="1175" minY="621" maxY="663" name="phone-s"/>
+  <symbol minX="1175" maxX="1217" minY="621" maxY="663" name="subway-entrance-2-s"/>
+  <symbol minX="1217" maxX="1259" minY="621" maxY="663" name="subway-entrance-arrow"/>
+  <symbol minX="1259" maxX="1301" minY="621" maxY="663" name="pharmacy-s"/>
+  <symbol minX="1301" maxX="1343" minY="621" maxY="663" name="book-shop-s"/>
+  <symbol minX="1343" maxX="1385" minY="621" maxY="663" name="subway-entrance-s"/>
+  <symbol minX="1385" maxX="1427" minY="621" maxY="663" name="bus-s"/>
+  <symbol minX="1427" maxX="1469" minY="621" maxY="663" name="cable-car-s"/>
+  <symbol minX="1469" maxX="1511" minY="621" maxY="663" name="zoo-s"/>
+  <symbol minX="1511" maxX="1553" minY="621" maxY="663" name="cafe-s"/>
+  <symbol minX="1553" maxX="1595" minY="621" maxY="663" name="campsite-s"/>
+  <symbol minX="1595" maxX="1651" minY="621" maxY="663" name="subway-london-m"/>
+  <symbol minX="1651" maxX="1693" minY="621" maxY="663" name="windmill-s"/>
+  <symbol minX="1693" maxX="1735" minY="621" maxY="663" name="peak-s"/>
+  <symbol minX="1735" maxX="1777" minY="621" maxY="663" name="car-repair-s"/>
+  <symbol minX="1777" maxX="1835" minY="621" maxY="663" name="subway-madrid-m"/>
+  <symbol minX="1835" maxX="1877" minY="621" maxY="663" name="casino-s"/>
+  <symbol minX="1877" maxX="1919" minY="621" maxY="663" name="cave-s"/>
+  <symbol minX="1919" maxX="1961" minY="621" maxY="663" name="cemetery-s"/>
+  <symbol minX="1961" maxX="2003" minY="621" maxY="663" name="cinema-s"/>
+  <symbol minX="2003" maxX="2045" minY="621" maxY="663" name="college-s"/>
+  <symbol minX="0" maxX="42" minY="666" maxY="708" name="volcano-s"/>
+  <symbol minX="42" maxX="84" minY="666" maxY="708" name="drinking-water-s"/>
+  <symbol minX="84" maxX="126" minY="666" maxY="708" name="park-s"/>
+  <symbol minX="126" maxX="168" minY="666" maxY="708" name="office-s"/>
   <symbol minX="168" maxX="210" minY="666" maxY="708" name="subway-newyork-s"/>
-  <symbol minX="210" maxX="252" minY="666" maxY="708" name="drinking-water-s"/>
-  <symbol minX="252" maxX="294" minY="666" maxY="708" name="golf-s"/>
-  <symbol minX="294" maxX="336" minY="666" maxY="708" name="park-s"/>
+  <symbol minX="210" maxX="252" minY="666" maxY="708" name="tram-s"/>
+  <symbol minX="252" maxX="294" minY="666" maxY="708" name="nparkf-s"/>
+  <symbol minX="294" maxX="336" minY="666" maxY="708" name="npark-s"/>
   <symbol minX="336" maxX="378" minY="666" maxY="708" name="embassy-s"/>
-  <symbol minX="378" maxX="420" minY="666" maxY="708" name="nparkf-s"/>
-  <symbol minX="420" maxX="462" minY="666" maxY="708" name="npark-s"/>
-  <symbol minX="462" maxX="504" minY="666" maxY="708" name="tram-s"/>
+  <symbol minX="378" maxX="420" minY="666" maxY="708" name="train-s"/>
+  <symbol minX="420" maxX="462" minY="666" maxY="708" name="museum-s"/>
+  <symbol minX="462" maxX="504" minY="666" maxY="708" name="equestrian-s"/>
   <symbol minX="504" maxX="546" minY="666" maxY="708" name="subway-s"/>
-  <symbol minX="546" maxX="588" minY="666" maxY="708" name="train-s"/>
-  <symbol minX="588" maxX="630" minY="666" maxY="708" name="museum-s"/>
+  <symbol minX="546" maxX="588" minY="666" maxY="708" name="monument-s"/>
+  <symbol minX="588" maxX="630" minY="666" maxY="708" name="military-s"/>
   <symbol minX="630" maxX="672" minY="666" maxY="708" name="subway-spb-s"/>
-  <symbol minX="672" maxX="714" minY="666" maxY="708" name="equestrian-s"/>
-  <symbol minX="714" maxX="756" minY="666" maxY="708" name="fastfood-s"/>
-  <symbol minX="756" maxX="798" minY="666" maxY="708" name="fire_station-s"/>
+  <symbol minX="672" maxX="714" minY="666" maxY="708" name="fastfood-s"/>
+  <symbol minX="714" maxX="756" minY="666" maxY="708" name="fire_station-s"/>
+  <symbol minX="756" maxX="798" minY="666" maxY="708" name="townhall-s"/>
   <symbol minX="798" maxX="840" minY="666" maxY="708" name="fountain-s"/>
-  <symbol minX="840" maxX="882" minY="666" maxY="708" name="monument-s"/>
-  <symbol minX="882" maxX="924" minY="666" maxY="708" name="military-s"/>
-  <symbol minX="924" maxX="966" minY="666" maxY="708" name="townhall-s"/>
-  <symbol minX="966" maxX="1024" minY="666" maxY="708" name="metro-barcelona-m"/>
+  <symbol minX="840" maxX="882" minY="666" maxY="708" name="fuel-s"/>
+  <symbol minX="882" maxX="940" minY="666" maxY="708" name="metro-barcelona-m"/>
+  <symbol minX="940" maxX="982" minY="666" maxY="708" name="mail-s"/>
+  <symbol minX="982" maxX="1024" minY="666" maxY="708" name="tourism-s"/>
   <symbol minX="1024" maxX="1066" minY="666" maxY="708" name="swimming-s"/>
-  <symbol minX="1066" maxX="1108" minY="666" maxY="708" name="mail-s"/>
-  <symbol minX="1108" maxX="1150" minY="666" maxY="708" name="fuel-s"/>
-  <symbol minX="1150" maxX="1192" minY="666" maxY="708" name="lighthouse-s"/>
-  <symbol minX="1192" maxX="1234" minY="666" maxY="708" name="library-s"/>
+  <symbol minX="1066" maxX="1108" minY="666" maxY="708" name="lighthouse-s"/>
+  <symbol minX="1108" maxX="1150" minY="666" maxY="708" name="library-s"/>
+  <symbol minX="1150" maxX="1192" minY="666" maxY="708" name="kindergarten-s"/>
+  <symbol minX="1192" maxX="1234" minY="666" maxY="708" name="information-s"/>
   <symbol minX="1234" maxX="1276" minY="666" maxY="708" name="tennis-s"/>
-  <symbol minX="1276" maxX="1318" minY="666" maxY="708" name="kindergarten-s"/>
-  <symbol minX="1318" maxX="1360" minY="666" maxY="708" name="information-s"/>
+  <symbol minX="1276" maxX="1318" minY="666" maxY="708" name="hotel-s"/>
+  <symbol minX="1318" maxX="1360" minY="666" maxY="708" name="hospital-s"/>
   <symbol minX="1360" maxX="1402" minY="666" maxY="708" name="theatre-s"/>
-  <symbol minX="1402" maxX="1444" minY="666" maxY="708" name="hotel-s"/>
-  <symbol minX="1444" maxX="1486" minY="666" maxY="708" name="hospital-s"/>
+  <symbol minX="1402" maxX="1444" minY="666" maxY="708" name="heliport-s"/>
+  <symbol minX="1444" maxX="1486" minY="666" maxY="708" name="helipad-s"/>
   <symbol minX="1486" maxX="1528" minY="666" maxY="708" name="toilets-s"/>
-  <symbol minX="1528" maxX="1570" minY="666" maxY="708" name="helipad-s"/>
-  <symbol minX="1570" maxX="1612" minY="666" maxY="708" name="hand-s"/>
-  <symbol minX="1612" maxX="1654" minY="666" maxY="708" name="grocery-s"/>
-  <symbol minX="1654" maxX="1712" minY="666" maxY="707" name="subway-madrid-l"/>
-  <symbol minX="1712" maxX="1770" minY="666" maxY="707" name="subway-barcelona-l"/>
-  <symbol minX="1770" maxX="1810" minY="666" maxY="706" name="parking-m"/>
-  <symbol minX="1810" maxX="1850" minY="666" maxY="706" name="route_from"/>
-  <symbol minX="1850" maxX="1888" minY="666" maxY="706" name="s-arrow"/>
-  <symbol minX="1888" maxX="1926" minY="666" maxY="704" name="lightrail-berlin-s"/>
-  <symbol minX="1926" maxX="1977" minY="666" maxY="704" name="metro-barcelona-s"/>
-  <symbol minX="1977" maxX="2028" minY="666" maxY="704" name="subway-madrid-s"/>
-  <symbol minX="0" maxX="38" minY="708" maxY="746" name="subway-paris-s"/>
-  <symbol minX="38" maxX="76" minY="708" maxY="746" name="current-position"/>
-  <symbol minX="76" maxX="114" minY="708" maxY="746" name="peak-l"/>
-  <symbol minX="114" maxX="170" minY="708" maxY="746" name="subway-kiev-m"/>
-  <symbol minX="170" maxX="226" minY="708" maxY="746" name="subway-kiev-l"/>
-  <symbol minX="226" maxX="262" minY="708" maxY="744" name="subway-moscow-s"/>
-  <symbol minX="262" maxX="295" minY="708" maxY="741" name="subway-rome-s"/>
-  <symbol minX="295" maxX="328" minY="708" maxY="741" name="subway-berlin-s"/>
-  <symbol minX="328" maxX="366" minY="708" maxY="741" name="bench"/>
-  <symbol minX="366" maxX="399" minY="708" maxY="741" name="parking-s"/>
-  <symbol minX="399" maxX="432" minY="708" maxY="741" name="speedcam-s"/>
-  <symbol minX="432" maxX="474" minY="708" maxY="741" name="subway-london-s"/>
-  <symbol minX="474" maxX="530" minY="708" maxY="739" name="subway-minsk-l"/>
-  <symbol minX="530" maxX="563" minY="708" maxY="739" name="peakt-l"/>
-  <symbol minX="563" maxX="594" minY="708" maxY="739" name="survey_point-l"/>
-  <symbol minX="594" maxX="625" minY="708" maxY="739" name="star-l"/>
-  <symbol minX="625" maxX="654" minY="708" maxY="737" name="api-result"/>
-  <symbol minX="654" maxX="683" minY="708" maxY="737" name="star-m"/>
-  <symbol minX="683" maxX="730" minY="708" maxY="737" name="subway-kiev-s"/>
-  <symbol minX="730" maxX="758" minY="708" maxY="736" name="search-result"/>
-  <symbol minX="758" maxX="805" minY="708" maxY="735" name="subway-minsk-m"/>
-  <symbol minX="805" maxX="834" minY="708" maxY="735" name="peak-m"/>
-  <symbol minX="834" maxX="861" minY="708" maxY="735" name="survey_point-m"/>
-  <symbol minX="861" maxX="888" minY="708" maxY="735" name="subway-newyork-xs"/>
-  <symbol minX="888" maxX="915" minY="708" maxY="735" name="subway-xs"/>
-  <symbol minX="915" maxX="957" minY="708" maxY="735" name="railway-crossing"/>
-  <symbol minX="957" maxX="999" minY="708" maxY="732" name="subway-minsk-s"/>
-  <symbol minX="999" maxX="1023" minY="708" maxY="732" name="crossing-l"/>
-  <symbol minX="1023" maxX="1047" minY="708" maxY="732" name="star-s"/>
-  <symbol minX="1047" maxX="1098" minY="708" maxY="730" name="arrow-m"/>
-  <symbol minX="1098" maxX="1122" minY="708" maxY="730" name="peak-s"/>
-  <symbol minX="1122" maxX="1146" minY="708" maxY="730" name="peakt-m"/>
-  <symbol minX="1146" maxX="1168" minY="708" maxY="730" name="survey_point-s"/>
-  <symbol minX="1168" maxX="1188" minY="708" maxY="728" name="crossing-m"/>
-  <symbol minX="1188" maxX="1208" minY="708" maxY="728" name="entrance-s"/>
-  <symbol minX="1208" maxX="1228" minY="708" maxY="726" name="peakt-s"/>
-  <symbol minX="1228" maxX="1243" minY="708" maxY="723" name="tree-l"/>
-  <symbol minX="1243" maxX="1258" minY="708" maxY="723" name="crossing-s"/>
-  <symbol minX="1258" maxX="1273" minY="708" maxY="723" name="none"/>
-  <symbol minX="1273" maxX="1288" minY="708" maxY="723" name="dot-m"/>
-  <symbol minX="1288" maxX="1326" minY="708" maxY="723" name="arrow-s"/>
-  <symbol minX="1326" maxX="1339" minY="708" maxY="721" name="tree-m"/>
-  <symbol minX="1339" maxX="1352" minY="708" maxY="721" name="entrance-xs"/>
-  <symbol minX="1352" maxX="1363" minY="708" maxY="719" name="dot-s-light"/>
-  <symbol minX="1363" maxX="1374" minY="708" maxY="719" name="tree-s"/>
-  <symbol minX="1374" maxX="1385" minY="708" maxY="719" name="zero-icon"/>
-  <symbol minX="1385" maxX="1396" minY="708" maxY="719" name="dot-s"/>
+  <symbol minX="1528" maxX="1570" minY="666" maxY="708" name="hand-s"/>
+  <symbol minX="1570" maxX="1612" minY="666" maxY="708" name="grocery-s"/>
+  <symbol minX="1612" maxX="1654" minY="666" maxY="708" name="golf-s"/>
+  <symbol minX="1654" maxX="1696" minY="666" maxY="708" name="garden-s"/>
+  <symbol minX="1696" maxX="1738" minY="666" maxY="708" name="gallery-s"/>
+  <symbol minX="1738" maxX="1780" minY="666" maxY="708" name="funicular-s"/>
+  <symbol minX="1780" maxX="1838" minY="666" maxY="707" name="subway-madrid-l"/>
+  <symbol minX="1838" maxX="1896" minY="666" maxY="707" name="subway-barcelona-l"/>
+  <symbol minX="1896" maxX="1936" minY="666" maxY="706" name="parking-m"/>
+  <symbol minX="1936" maxX="1974" minY="666" maxY="706" name="s-arrow"/>
+  <symbol minX="1974" maxX="2012" minY="666" maxY="704" name="lightrail-berlin-s"/>
+  <symbol minX="0" maxX="56" minY="708" maxY="746" name="subway-kiev-l"/>
+  <symbol minX="56" maxX="107" minY="708" maxY="746" name="subway-madrid-s"/>
+  <symbol minX="107" maxX="158" minY="708" maxY="746" name="metro-barcelona-s"/>
+  <symbol minX="158" maxX="214" minY="708" maxY="746" name="subway-kiev-m"/>
+  <symbol minX="214" maxX="252" minY="708" maxY="746" name="subway-paris-s"/>
+  <symbol minX="252" maxX="290" minY="708" maxY="746" name="current-position"/>
+  <symbol minX="290" maxX="326" minY="708" maxY="744" name="subway-moscow-s"/>
+  <symbol minX="326" maxX="359" minY="708" maxY="741" name="subway-berlin-s"/>
+  <symbol minX="359" maxX="397" minY="708" maxY="741" name="bench"/>
+  <symbol minX="397" maxX="439" minY="708" maxY="741" name="subway-london-s"/>
+  <symbol minX="439" maxX="472" minY="708" maxY="741" name="speedcam-s"/>
+  <symbol minX="472" maxX="505" minY="708" maxY="741" name="route_from"/>
+  <symbol minX="505" maxX="538" minY="708" maxY="741" name="subway-rome-s"/>
+  <symbol minX="538" maxX="571" minY="708" maxY="741" name="parking-s"/>
+  <symbol minX="571" maxX="604" minY="708" maxY="741" name="star-l"/>
+  <symbol minX="604" maxX="660" minY="708" maxY="739" name="subway-minsk-l"/>
+  <symbol minX="660" maxX="691" minY="708" maxY="739" name="survey_point-l"/>
+  <symbol minX="691" maxX="722" minY="708" maxY="739" name="star-m"/>
+  <symbol minX="722" maxX="755" minY="708" maxY="739" name="peakt-l"/>
+  <symbol minX="755" maxX="784" minY="708" maxY="737" name="api-result"/>
+  <symbol minX="784" maxX="831" minY="708" maxY="737" name="subway-kiev-s"/>
+  <symbol minX="831" maxX="859" minY="708" maxY="736" name="search-result"/>
+  <symbol minX="859" maxX="886" minY="708" maxY="735" name="survey_point-m"/>
+  <symbol minX="886" maxX="913" minY="708" maxY="735" name="star-s"/>
+  <symbol minX="913" maxX="955" minY="708" maxY="735" name="railway-crossing"/>
+  <symbol minX="955" maxX="982" minY="708" maxY="735" name="subway-xs"/>
+  <symbol minX="982" maxX="1029" minY="708" maxY="735" name="subway-minsk-m"/>
+  <symbol minX="1029" maxX="1056" minY="708" maxY="735" name="subway-newyork-xs"/>
+  <symbol minX="1056" maxX="1098" minY="708" maxY="732" name="subway-minsk-s"/>
+  <symbol minX="1098" maxX="1122" minY="708" maxY="732" name="crossing-l"/>
+  <symbol minX="1122" maxX="1144" minY="708" maxY="730" name="survey_point-s"/>
+  <symbol minX="1144" maxX="1195" minY="708" maxY="730" name="arrow-m"/>
+  <symbol minX="1195" maxX="1219" minY="708" maxY="730" name="peakt-m"/>
+  <symbol minX="1219" maxX="1239" minY="708" maxY="728" name="crossing-m"/>
+  <symbol minX="1239" maxX="1259" minY="708" maxY="728" name="entrance-s"/>
+  <symbol minX="1259" maxX="1277" minY="708" maxY="726" name="dot-m"/>
+  <symbol minX="1277" maxX="1297" minY="708" maxY="726" name="peakt-s"/>
+  <symbol minX="1297" maxX="1312" minY="708" maxY="723" name="tree-l"/>
+  <symbol minX="1312" maxX="1327" minY="708" maxY="723" name="none"/>
+  <symbol minX="1327" maxX="1342" minY="708" maxY="723" name="crossing-s"/>
+  <symbol minX="1342" maxX="1380" minY="708" maxY="723" name="arrow-s"/>
+  <symbol minX="1380" maxX="1393" minY="708" maxY="721" name="entrance-xs"/>
+  <symbol minX="1393" maxX="1406" minY="708" maxY="721" name="dot-s"/>
+  <symbol minX="1406" maxX="1419" minY="708" maxY="721" name="dot-s-light"/>
+  <symbol minX="1419" maxX="1432" minY="708" maxY="721" name="tree-m"/>
+  <symbol minX="1432" maxX="1443" minY="708" maxY="719" name="zero-icon"/>
+  <symbol minX="1443" maxX="1454" minY="708" maxY="719" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-6plus_dark/symbols.png b/data/resources-6plus_dark/symbols.png
index 09d84d8939..4b67a44894 100644
--- a/data/resources-6plus_dark/symbols.png
+++ b/data/resources-6plus_dark/symbols.png
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/resources-6plus_dark/symbols.sdf
index c4f8e068b2..6ad427bd03 100644
--- a/data/resources-6plus_dark/symbols.sdf
+++ b/data/resources-6plus_dark/symbols.sdf
@@ -409,53 +409,53 @@
   <symbol minX="1780" maxX="1822" minY="666" maxY="708" name="bcontrol-s"/>
   <symbol minX="1822" maxX="1880" minY="666" maxY="707" name="subway-madrid-l"/>
   <symbol minX="1880" maxX="1938" minY="666" maxY="707" name="subway-barcelona-l"/>
-  <symbol minX="1938" maxX="1978" minY="666" maxY="706" name="route_from"/>
+  <symbol minX="1938" maxX="1978" minY="666" maxY="706" name="parking-m"/>
   <symbol minX="1978" maxX="2016" minY="666" maxY="706" name="s-arrow"/>
-  <symbol minX="0" maxX="40" minY="708" maxY="748" name="parking-m"/>
-  <symbol minX="40" maxX="78" minY="708" maxY="746" name="current-position"/>
-  <symbol minX="78" maxX="129" minY="708" maxY="746" name="metro-barcelona-s"/>
-  <symbol minX="129" maxX="185" minY="708" maxY="746" name="subway-kiev-l"/>
-  <symbol minX="185" maxX="223" minY="708" maxY="746" name="subway-paris-s"/>
-  <symbol minX="223" maxX="261" minY="708" maxY="746" name="lightrail-berlin-s"/>
-  <symbol minX="261" maxX="312" minY="708" maxY="746" name="subway-madrid-s"/>
-  <symbol minX="312" maxX="368" minY="708" maxY="746" name="subway-kiev-m"/>
-  <symbol minX="368" maxX="404" minY="708" maxY="744" name="subway-moscow-s"/>
-  <symbol minX="404" maxX="437" minY="708" maxY="741" name="speedcam-s"/>
-  <symbol minX="437" maxX="470" minY="708" maxY="741" name="parking-s"/>
-  <symbol minX="470" maxX="512" minY="708" maxY="741" name="subway-london-s"/>
-  <symbol minX="512" maxX="550" minY="708" maxY="741" name="bench"/>
-  <symbol minX="550" maxX="583" minY="708" maxY="741" name="star-l"/>
-  <symbol minX="583" maxX="616" minY="708" maxY="741" name="subway-rome-s"/>
-  <symbol minX="616" maxX="649" minY="708" maxY="741" name="subway-berlin-s"/>
-  <symbol minX="649" maxX="682" minY="708" maxY="739" name="peakt-l"/>
-  <symbol minX="682" maxX="713" minY="708" maxY="739" name="survey_point-l"/>
-  <symbol minX="713" maxX="744" minY="708" maxY="739" name="star-m"/>
-  <symbol minX="744" maxX="800" minY="708" maxY="739" name="subway-minsk-l"/>
-  <symbol minX="800" maxX="829" minY="708" maxY="737" name="api-result"/>
-  <symbol minX="829" maxX="876" minY="708" maxY="737" name="subway-kiev-s"/>
-  <symbol minX="876" maxX="904" minY="708" maxY="736" name="search-result"/>
-  <symbol minX="904" maxX="931" minY="708" maxY="735" name="subway-xs"/>
-  <symbol minX="931" maxX="973" minY="708" maxY="735" name="railway-crossing"/>
-  <symbol minX="973" maxX="1000" minY="708" maxY="735" name="star-s"/>
-  <symbol minX="1000" maxX="1027" minY="708" maxY="735" name="subway-newyork-xs"/>
-  <symbol minX="1027" maxX="1074" minY="708" maxY="735" name="subway-minsk-m"/>
-  <symbol minX="1074" maxX="1101" minY="708" maxY="735" name="survey_point-m"/>
-  <symbol minX="1101" maxX="1125" minY="708" maxY="732" name="subway-xs copy"/>
-  <symbol minX="1125" maxX="1167" minY="708" maxY="732" name="subway-minsk-s"/>
-  <symbol minX="1167" maxX="1191" minY="708" maxY="730" name="peakt-m"/>
-  <symbol minX="1191" maxX="1242" minY="708" maxY="730" name="arrow-m"/>
-  <symbol minX="1242" maxX="1264" minY="708" maxY="730" name="survey_point-s"/>
-  <symbol minX="1264" maxX="1284" minY="708" maxY="728" name="entrance-s"/>
-  <symbol minX="1284" maxX="1304" minY="708" maxY="726" name="peakt-s"/>
-  <symbol minX="1304" maxX="1322" minY="708" maxY="726" name="dot-m"/>
-  <symbol minX="1322" maxX="1337" minY="708" maxY="723" name="none"/>
-  <symbol minX="1337" maxX="1375" minY="708" maxY="723" name="arrow-s"/>
-  <symbol minX="1375" maxX="1390" minY="708" maxY="723" name="tree-l"/>
-  <symbol minX="1390" maxX="1403" minY="708" maxY="721" name="dot-s"/>
-  <symbol minX="1403" maxX="1416" minY="708" maxY="721" name="tree-m"/>
-  <symbol minX="1416" maxX="1429" minY="708" maxY="721" name="entrance-xs"/>
-  <symbol minX="1429" maxX="1442" minY="708" maxY="721" name="dot-s-light"/>
-  <symbol minX="1442" maxX="1453" minY="708" maxY="719" name="zero-icon"/>
-  <symbol minX="1453" maxX="1464" minY="708" maxY="719" name="tree-s"/>
+  <symbol minX="0" maxX="38" minY="708" maxY="746" name="lightrail-berlin-s"/>
+  <symbol minX="38" maxX="76" minY="708" maxY="746" name="current-position"/>
+  <symbol minX="76" maxX="132" minY="708" maxY="746" name="subway-kiev-l"/>
+  <symbol minX="132" maxX="188" minY="708" maxY="746" name="subway-kiev-m"/>
+  <symbol minX="188" maxX="226" minY="708" maxY="746" name="subway-paris-s"/>
+  <symbol minX="226" maxX="277" minY="708" maxY="746" name="metro-barcelona-s"/>
+  <symbol minX="277" maxX="328" minY="708" maxY="746" name="subway-madrid-s"/>
+  <symbol minX="328" maxX="364" minY="708" maxY="744" name="subway-moscow-s"/>
+  <symbol minX="364" maxX="406" minY="708" maxY="741" name="subway-london-s"/>
+  <symbol minX="406" maxX="444" minY="708" maxY="741" name="bench"/>
+  <symbol minX="444" maxX="477" minY="708" maxY="741" name="parking-s"/>
+  <symbol minX="477" maxX="510" minY="708" maxY="741" name="star-l"/>
+  <symbol minX="510" maxX="543" minY="708" maxY="741" name="route_from"/>
+  <symbol minX="543" maxX="576" minY="708" maxY="741" name="subway-rome-s"/>
+  <symbol minX="576" maxX="609" minY="708" maxY="741" name="subway-berlin-s"/>
+  <symbol minX="609" maxX="642" minY="708" maxY="741" name="speedcam-s"/>
+  <symbol minX="642" maxX="673" minY="708" maxY="739" name="survey_point-l"/>
+  <symbol minX="673" maxX="704" minY="708" maxY="739" name="star-m"/>
+  <symbol minX="704" maxX="760" minY="708" maxY="739" name="subway-minsk-l"/>
+  <symbol minX="760" maxX="793" minY="708" maxY="739" name="peakt-l"/>
+  <symbol minX="793" maxX="822" minY="708" maxY="737" name="api-result"/>
+  <symbol minX="822" maxX="869" minY="708" maxY="737" name="subway-kiev-s"/>
+  <symbol minX="869" maxX="897" minY="708" maxY="736" name="search-result"/>
+  <symbol minX="897" maxX="924" minY="708" maxY="735" name="subway-xs"/>
+  <symbol minX="924" maxX="966" minY="708" maxY="735" name="railway-crossing"/>
+  <symbol minX="966" maxX="993" minY="708" maxY="735" name="star-s"/>
+  <symbol minX="993" maxX="1020" minY="708" maxY="735" name="subway-newyork-xs"/>
+  <symbol minX="1020" maxX="1067" minY="708" maxY="735" name="subway-minsk-m"/>
+  <symbol minX="1067" maxX="1094" minY="708" maxY="735" name="survey_point-m"/>
+  <symbol minX="1094" maxX="1118" minY="708" maxY="732" name="subway-xs copy"/>
+  <symbol minX="1118" maxX="1160" minY="708" maxY="732" name="subway-minsk-s"/>
+  <symbol minX="1160" maxX="1184" minY="708" maxY="730" name="peakt-m"/>
+  <symbol minX="1184" maxX="1235" minY="708" maxY="730" name="arrow-m"/>
+  <symbol minX="1235" maxX="1257" minY="708" maxY="730" name="survey_point-s"/>
+  <symbol minX="1257" maxX="1277" minY="708" maxY="728" name="entrance-s"/>
+  <symbol minX="1277" maxX="1297" minY="708" maxY="726" name="peakt-s"/>
+  <symbol minX="1297" maxX="1315" minY="708" maxY="726" name="dot-m"/>
+  <symbol minX="1315" maxX="1330" minY="708" maxY="723" name="none"/>
+  <symbol minX="1330" maxX="1368" minY="708" maxY="723" name="arrow-s"/>
+  <symbol minX="1368" maxX="1383" minY="708" maxY="723" name="tree-l"/>
+  <symbol minX="1383" maxX="1396" minY="708" maxY="721" name="dot-s"/>
+  <symbol minX="1396" maxX="1409" minY="708" maxY="721" name="tree-m"/>
+  <symbol minX="1409" maxX="1422" minY="708" maxY="721" name="entrance-xs"/>
+  <symbol minX="1422" maxX="1435" minY="708" maxY="721" name="dot-s-light"/>
+  <symbol minX="1435" maxX="1446" minY="708" maxY="719" name="zero-icon"/>
+  <symbol minX="1446" maxX="1457" minY="708" maxY="719" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-hdpi/symbols.png b/data/resources-hdpi/symbols.png
index 91b1088d18..10f28bb4f2 100644
--- a/data/resources-hdpi/symbols.png
+++ b/data/resources-hdpi/symbols.png
diff --git a/data/resources-hdpi/symbols.sdf b/data/resources-hdpi/symbols.sdf
index 6c8ad91da7..3a78d6694b 100644
--- a/data/resources-hdpi/symbols.sdf
+++ b/data/resources-hdpi/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file width="512" height="512">
+ <file height="512" width="512">
   <symbol minX="0" maxX="105" minY="0" maxY="105" name="route_to"/>
   <symbol minX="105" maxX="309" minY="0" maxY="100" name="route-arrow"/>
   <symbol minX="309" maxX="397" minY="0" maxY="88" name="compass-image"/>
diff --git a/data/resources-hdpi_clear/symbols.png b/data/resources-hdpi_clear/symbols.png
index d214a01155..5f8564154a 100644
--- a/data/resources-hdpi_clear/symbols.png
+++ b/data/resources-hdpi_clear/symbols.png
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/resources-hdpi_clear/symbols.sdf
index 1ec5a0a276..1d0e4dbfed 100644
--- a/data/resources-hdpi_clear/symbols.sdf
+++ b/data/resources-hdpi_clear/symbols.sdf
@@ -15,449 +15,449 @@
   <symbol minX="658" maxX="682" minY="0" maxY="45" name="placemark-red"/>
   <symbol minX="682" maxX="706" minY="0" maxY="45" name="placemark-yellow"/>
   <symbol minX="706" maxX="730" minY="0" maxY="45" name="placemark-orange"/>
-  <symbol minX="730" maxX="761" minY="0" maxY="31" name="gate-l"/>
+  <symbol minX="730" maxX="761" minY="0" maxY="31" name="garden_center-l"/>
   <symbol minX="761" maxX="792" minY="0" maxY="31" name="atm-l"/>
-  <symbol minX="792" maxX="823" minY="0" maxY="31" name="shop-l"/>
-  <symbol minX="823" maxX="854" minY="0" maxY="31" name="shop-bicycle-l"/>
+  <symbol minX="792" maxX="823" minY="0" maxY="31" name="shoes-l"/>
+  <symbol minX="823" maxX="854" minY="0" maxY="31" name="archery-l"/>
   <symbol minX="854" maxX="885" minY="0" maxY="31" name="australian-football-l"/>
-  <symbol minX="885" maxX="916" minY="0" maxY="31" name="shoes-l"/>
+  <symbol minX="885" maxX="916" minY="0" maxY="31" name="ship-l"/>
   <symbol minX="916" maxX="947" minY="0" maxY="31" name="bakery-l"/>
-  <symbol minX="947" maxX="978" minY="0" maxY="31" name="ship-l"/>
+  <symbol minX="947" maxX="978" minY="0" maxY="31" name="shop-l"/>
   <symbol minX="978" maxX="1008" minY="0" maxY="31" name="bank-l"/>
   <symbol minX="0" maxX="30" minY="105" maxY="136" name="bank-m"/>
   <symbol minX="30" maxX="60" minY="105" maxY="136" name="banknote-l"/>
-  <symbol minX="60" maxX="91" minY="105" maxY="136" name="soccer-l"/>
+  <symbol minX="60" maxX="91" minY="105" maxY="136" name="school-l"/>
   <symbol minX="91" maxX="122" minY="105" maxY="136" name="bar-l"/>
-  <symbol minX="122" maxX="153" minY="105" maxY="136" name="school-l"/>
-  <symbol minX="153" maxX="184" minY="105" maxY="136" name="archery-l"/>
+  <symbol minX="122" maxX="153" minY="105" maxY="136" name="skiing-l"/>
+  <symbol minX="153" maxX="184" minY="105" maxY="136" name="restaurant-l"/>
   <symbol minX="184" maxX="215" minY="105" maxY="136" name="baseball-l"/>
-  <symbol minX="215" maxX="246" minY="105" maxY="136" name="restaurant-l"/>
-  <symbol minX="246" maxX="276" minY="105" maxY="136" name="remains-m"/>
-  <symbol minX="276" maxX="307" minY="105" maxY="136" name="basketball-l"/>
-  <symbol minX="307" maxX="337" minY="105" maxY="136" name="remains-l"/>
-  <symbol minX="337" maxX="368" minY="105" maxY="136" name="america-football-l"/>
-  <symbol minX="368" maxX="399" minY="105" maxY="136" name="bbq-l"/>
-  <symbol minX="399" maxX="430" minY="105" maxY="136" name="sports-l"/>
-  <symbol minX="430" maxX="460" minY="105" maxY="136" name="bcontrol-l"/>
-  <symbol minX="460" maxX="490" minY="105" maxY="136" name="bcontrol-m"/>
-  <symbol minX="490" maxX="521" minY="105" maxY="136" name="recycling-l"/>
-  <symbol minX="521" maxX="552" minY="105" maxY="136" name="beach-l"/>
-  <symbol minX="552" maxX="583" minY="105" maxY="136" name="pub-l"/>
-  <symbol minX="583" maxX="614" minY="105" maxY="136" name="beauty-l"/>
-  <symbol minX="614" maxX="645" minY="105" maxY="136" name="power-m"/>
-  <symbol minX="645" maxX="675" minY="105" maxY="136" name="beer-l"/>
-  <symbol minX="675" maxX="705" minY="105" maxY="136" name="beer-m"/>
-  <symbol minX="705" maxX="736" minY="105" maxY="136" name="power-l"/>
-  <symbol minX="736" maxX="767" minY="105" maxY="136" name="postbox-l"/>
-  <symbol minX="767" maxX="798" minY="105" maxY="136" name="bicycle-l"/>
-  <symbol minX="798" maxX="829" minY="105" maxY="136" name="police-l"/>
-  <symbol minX="829" maxX="860" minY="105" maxY="136" name="alpine_hut-l"/>
-  <symbol minX="860" maxX="891" minY="105" maxY="136" name="book-shop-l"/>
-  <symbol minX="891" maxX="922" minY="105" maxY="136" name="subway-entrance-l"/>
-  <symbol minX="922" maxX="953" minY="105" maxY="136" name="place-of-worship-l"/>
-  <symbol minX="953" maxX="984" minY="105" maxY="136" name="boundary_stone-l"/>
-  <symbol minX="984" maxX="1015" minY="105" maxY="136" name="pitch-l"/>
+  <symbol minX="215" maxX="246" minY="105" maxY="136" name="remains-l"/>
+  <symbol minX="246" maxX="277" minY="105" maxY="136" name="america-football-l"/>
+  <symbol minX="277" maxX="308" minY="105" maxY="136" name="basketball-l"/>
+  <symbol minX="308" maxX="339" minY="105" maxY="136" name="soccer-l"/>
+  <symbol minX="339" maxX="370" minY="105" maxY="136" name="recycling-l"/>
+  <symbol minX="370" maxX="401" minY="105" maxY="136" name="bbq-l"/>
+  <symbol minX="401" maxX="432" minY="105" maxY="136" name="pub-l"/>
+  <symbol minX="432" maxX="463" minY="105" maxY="136" name="bcontrol-l"/>
+  <symbol minX="463" maxX="494" minY="105" maxY="136" name="sports-l"/>
+  <symbol minX="494" maxX="525" minY="105" maxY="136" name="alpine_hut-l"/>
+  <symbol minX="525" maxX="556" minY="105" maxY="136" name="beach-l"/>
+  <symbol minX="556" maxX="587" minY="105" maxY="136" name="power-m"/>
+  <symbol minX="587" maxX="618" minY="105" maxY="136" name="beauty-l"/>
+  <symbol minX="618" maxX="649" minY="105" maxY="136" name="power-l"/>
+  <symbol minX="649" maxX="680" minY="105" maxY="136" name="beer-l"/>
+  <symbol minX="680" maxX="711" minY="105" maxY="136" name="postbox-l"/>
+  <symbol minX="711" maxX="742" minY="105" maxY="136" name="police-l"/>
+  <symbol minX="742" maxX="773" minY="105" maxY="136" name="place-of-worship-l"/>
+  <symbol minX="773" maxX="804" minY="105" maxY="136" name="bicycle-l"/>
+  <symbol minX="804" maxX="835" minY="105" maxY="136" name="pitch-l"/>
+  <symbol minX="835" maxX="866" minY="105" maxY="136" name="alcohol-l"/>
+  <symbol minX="866" maxX="897" minY="105" maxY="136" name="book-shop-l"/>
+  <symbol minX="897" maxX="928" minY="105" maxY="136" name="picnic-l"/>
+  <symbol minX="928" maxX="959" minY="105" maxY="136" name="subway-entrance-l"/>
+  <symbol minX="959" maxX="990" minY="105" maxY="136" name="boundary_stone-l"/>
+  <symbol minX="990" maxX="1021" minY="105" maxY="136" name="phone-l"/>
   <symbol minX="0" maxX="31" minY="136" maxY="167" name="bowls-l"/>
-  <symbol minX="31" maxX="61" minY="136" maxY="167" name="picnic-m"/>
-  <symbol minX="61" maxX="92" minY="136" maxY="167" name="bus-l"/>
-  <symbol minX="92" maxX="122" minY="136" maxY="167" name="picnic-l"/>
-  <symbol minX="122" maxX="153" minY="136" maxY="167" name="alcohol-l"/>
-  <symbol minX="153" maxX="184" minY="136" maxY="167" name="butcher-l"/>
-  <symbol minX="184" maxX="215" minY="136" maxY="167" name="subway-l"/>
-  <symbol minX="215" maxX="246" minY="136" maxY="167" name="cable-car-l"/>
-  <symbol minX="246" maxX="277" minY="136" maxY="167" name="phone-l"/>
-  <symbol minX="277" maxX="308" minY="136" maxY="167" name="pharmacy-l"/>
-  <symbol minX="308" maxX="339" minY="136" maxY="167" name="cafe-l"/>
-  <symbol minX="339" maxX="370" minY="136" maxY="167" name="subway-newyork-l"/>
-  <symbol minX="370" maxX="401" minY="136" maxY="167" name="subway-paris-l"/>
-  <symbol minX="401" maxX="432" minY="136" maxY="167" name="campsite-l"/>
-  <symbol minX="432" maxX="463" minY="136" maxY="167" name="parking-meter-l"/>
-  <symbol minX="463" maxX="494" minY="136" maxY="167" name="airport-m"/>
-  <symbol minX="494" maxX="524" minY="136" maxY="167" name="car-repair-l"/>
-  <symbol minX="524" maxX="554" minY="136" maxY="167" name="car-repair-m"/>
-  <symbol minX="554" maxX="585" minY="136" maxY="167" name="airport-l"/>
-  <symbol minX="585" maxX="616" minY="136" maxY="167" name="car_sharing-l"/>
-  <symbol minX="616" maxX="647" minY="136" maxY="167" name="park-l"/>
-  <symbol minX="647" maxX="678" minY="136" maxY="167" name="caravan_site-l"/>
-  <symbol minX="678" maxX="709" minY="136" maxY="167" name="optician-l"/>
-  <symbol minX="709" maxX="740" minY="136" maxY="167" name="casino-l"/>
-  <symbol minX="740" maxX="770" minY="136" maxY="167" name="office-m"/>
-  <symbol minX="770" maxX="800" minY="136" maxY="167" name="office-l"/>
-  <symbol minX="800" maxX="831" minY="136" maxY="167" name="cave-l"/>
-  <symbol minX="831" maxX="862" minY="136" maxY="167" name="subway-spb-l"/>
-  <symbol minX="862" maxX="893" minY="136" maxY="167" name="zoo-l"/>
-  <symbol minX="893" maxX="924" minY="136" maxY="167" name="cemetery-l"/>
-  <symbol minX="924" maxX="955" minY="136" maxY="167" name="nparkf-l"/>
-  <symbol minX="955" maxX="986" minY="136" maxY="167" name="npark-l"/>
-  <symbol minX="986" maxX="1017" minY="136" maxY="167" name="chemist-l"/>
+  <symbol minX="31" maxX="62" minY="136" maxY="167" name="pharmacy-l"/>
+  <symbol minX="62" maxX="93" minY="136" maxY="167" name="bus-l"/>
+  <symbol minX="93" maxX="124" minY="136" maxY="167" name="subway-l"/>
+  <symbol minX="124" maxX="155" minY="136" maxY="167" name="peak-l"/>
+  <symbol minX="155" maxX="186" minY="136" maxY="167" name="butcher-l"/>
+  <symbol minX="186" maxX="217" minY="136" maxY="167" name="parking-meter-l"/>
+  <symbol minX="217" maxX="248" minY="136" maxY="167" name="cable-car-l"/>
+  <symbol minX="248" maxX="279" minY="136" maxY="167" name="subway-newyork-l"/>
+  <symbol minX="279" maxX="310" minY="136" maxY="167" name="airport-m"/>
+  <symbol minX="310" maxX="341" minY="136" maxY="167" name="cafe-l"/>
+  <symbol minX="341" maxX="372" minY="136" maxY="167" name="park-l"/>
+  <symbol minX="372" maxX="403" minY="136" maxY="167" name="airport-l"/>
+  <symbol minX="403" maxX="434" minY="136" maxY="167" name="campsite-l"/>
+  <symbol minX="434" maxX="465" minY="136" maxY="167" name="optician-l"/>
+  <symbol minX="465" maxX="496" minY="136" maxY="167" name="subway-paris-l"/>
+  <symbol minX="496" maxX="527" minY="136" maxY="167" name="car-repair-l"/>
+  <symbol minX="527" maxX="558" minY="136" maxY="167" name="office-l"/>
+  <symbol minX="558" maxX="589" minY="136" maxY="167" name="zoo-l"/>
+  <symbol minX="589" maxX="620" minY="136" maxY="167" name="car_sharing-l"/>
+  <symbol minX="620" maxX="651" minY="136" maxY="167" name="nparkf-l"/>
+  <symbol minX="651" maxX="682" minY="136" maxY="167" name="caravan_site-l"/>
+  <symbol minX="682" maxX="713" minY="136" maxY="167" name="npark-l"/>
+  <symbol minX="713" maxX="744" minY="136" maxY="167" name="casino-l"/>
+  <symbol minX="744" maxX="775" minY="136" maxY="167" name="subway-spb-l"/>
+  <symbol minX="775" maxX="806" minY="136" maxY="167" name="museum-l"/>
+  <symbol minX="806" maxX="837" minY="136" maxY="167" name="cave-l"/>
+  <symbol minX="837" maxX="868" minY="136" maxY="167" name="motel-l"/>
+  <symbol minX="868" maxX="899" minY="136" maxY="167" name="windmill-l"/>
+  <symbol minX="899" maxX="930" minY="136" maxY="167" name="cemetery-l"/>
+  <symbol minX="930" maxX="961" minY="136" maxY="167" name="monument-l"/>
+  <symbol minX="961" maxX="992" minY="136" maxY="167" name="mobile_phone-l"/>
+  <symbol minX="992" maxX="1023" minY="136" maxY="167" name="chemist-l"/>
   <symbol minX="0" maxX="31" minY="167" maxY="198" name="sweets-l"/>
   <symbol minX="31" maxX="62" minY="167" maxY="198" name="cinema-l"/>
-  <symbol minX="62" maxX="93" minY="167" maxY="198" name="museum-l"/>
-  <symbol minX="93" maxX="124" minY="167" maxY="198" name="windmill-l"/>
+  <symbol minX="62" maxX="93" minY="167" maxY="198" name="military-l"/>
+  <symbol minX="93" maxX="124" minY="167" maxY="198" name="wayside_shrine-l"/>
   <symbol minX="124" maxX="155" minY="167" maxY="198" name="clothes-l"/>
-  <symbol minX="155" maxX="186" minY="167" maxY="198" name="motel-l"/>
+  <symbol minX="155" maxX="186" minY="167" maxY="198" name="swimming-l"/>
   <symbol minX="186" maxX="217" minY="167" maxY="198" name="college-l"/>
-  <symbol minX="217" maxX="248" minY="167" maxY="198" name="swimming-l"/>
-  <symbol minX="248" maxX="279" minY="167" maxY="198" name="monument-l"/>
+  <symbol minX="217" maxX="248" minY="167" maxY="198" name="marketplace-l"/>
+  <symbol minX="248" maxX="279" minY="167" maxY="198" name="mail-l"/>
   <symbol minX="279" maxX="310" minY="167" maxY="198" name="computer-l"/>
-  <symbol minX="310" maxX="341" minY="167" maxY="198" name="mobile_phone-l"/>
+  <symbol minX="310" maxX="341" minY="167" maxY="198" name="taxi-l"/>
   <symbol minX="341" maxX="372" minY="167" maxY="198" name="convenience-l"/>
-  <symbol minX="372" maxX="403" minY="167" maxY="198" name="military-l"/>
+  <symbol minX="372" maxX="403" minY="167" maxY="198" name="lightrail-berlin-l"/>
   <symbol minX="403" maxX="434" minY="167" maxY="198" name="cricket-l"/>
-  <symbol minX="434" maxX="465" minY="167" maxY="198" name="taxi-l"/>
-  <symbol minX="465" maxX="496" minY="167" maxY="198" name="wayside_shrine-l"/>
-  <symbol minX="496" maxX="527" minY="167" maxY="198" name="marketplace-l"/>
-  <symbol minX="527" maxX="558" minY="167" maxY="198" name="wayside_cross-l"/>
-  <symbol minX="558" maxX="589" minY="167" maxY="198" name="curling-l"/>
-  <symbol minX="589" maxX="620" minY="167" maxY="198" name="tennis-l"/>
-  <symbol minX="620" maxX="651" minY="167" maxY="198" name="department_store-l"/>
-  <symbol minX="651" maxX="682" minY="167" maxY="198" name="mail-l"/>
-  <symbol minX="682" maxX="713" minY="167" maxY="198" name="diving-l"/>
-  <symbol minX="713" maxX="744" minY="167" maxY="198" name="lightrail-berlin-l"/>
-  <symbol minX="744" maxX="775" minY="167" maxY="198" name="dog_park-l"/>
-  <symbol minX="775" maxX="806" minY="167" maxY="198" name="theatre-l"/>
-  <symbol minX="806" maxX="837" minY="167" maxY="198" name="doityourself-l"/>
-  <symbol minX="837" maxX="868" minY="167" maxY="198" name="lighthouse-l"/>
-  <symbol minX="868" maxX="899" minY="167" maxY="198" name="lift_gate-l"/>
-  <symbol minX="899" maxX="929" minY="167" maxY="198" name="waterfall-m"/>
-  <symbol minX="929" maxX="959" minY="167" maxY="198" name="waterfall-l"/>
+  <symbol minX="434" maxX="465" minY="167" maxY="198" name="lighthouse-l"/>
+  <symbol minX="465" maxX="496" minY="167" maxY="198" name="wayside_cross-l"/>
+  <symbol minX="496" maxX="527" minY="167" maxY="198" name="lift_gate-l"/>
+  <symbol minX="527" maxX="557" minY="167" maxY="198" name="waterfall-m"/>
+  <symbol minX="557" maxX="588" minY="167" maxY="198" name="curling-l"/>
+  <symbol minX="588" maxX="619" minY="167" maxY="198" name="tennis-l"/>
+  <symbol minX="619" maxX="650" minY="167" maxY="198" name="department_store-l"/>
+  <symbol minX="650" maxX="681" minY="167" maxY="198" name="library-l"/>
+  <symbol minX="681" maxX="712" minY="167" maxY="198" name="diving-l"/>
+  <symbol minX="712" maxX="743" minY="167" maxY="198" name="laundry-l"/>
+  <symbol minX="743" maxX="774" minY="167" maxY="198" name="dog_park-l"/>
+  <symbol minX="774" maxX="805" minY="167" maxY="198" name="kiosk-l"/>
+  <symbol minX="805" maxX="836" minY="167" maxY="198" name="doityourself-l"/>
+  <symbol minX="836" maxX="867" minY="167" maxY="198" name="kindergarten-m"/>
+  <symbol minX="867" maxX="897" minY="167" maxY="198" name="waterfall-l"/>
+  <symbol minX="897" maxX="928" minY="167" maxY="198" name="kindergarten-l"/>
+  <symbol minX="928" maxX="959" minY="167" maxY="198" name="volcano-l"/>
   <symbol minX="959" maxX="990" minY="167" maxY="198" name="drinking-water-l"/>
-  <symbol minX="990" maxX="1021" minY="167" maxY="198" name="library-l"/>
-  <symbol minX="0" maxX="30" minY="198" maxY="229" name="laundry-m"/>
-  <symbol minX="30" maxX="60" minY="198" maxY="229" name="laundry-l"/>
-  <symbol minX="60" maxX="91" minY="198" maxY="229" name="electronics-l"/>
-  <symbol minX="91" maxX="122" minY="198" maxY="229" name="kiosk-l"/>
-  <symbol minX="122" maxX="153" minY="198" maxY="229" name="embassy-l"/>
-  <symbol minX="153" maxX="184" minY="198" maxY="229" name="toilets-l"/>
-  <symbol minX="184" maxX="215" minY="198" maxY="229" name="volcano-l"/>
-  <symbol minX="215" maxX="246" minY="198" maxY="229" name="kindergarten-m"/>
-  <symbol minX="246" maxX="277" minY="198" maxY="229" name="vending-l"/>
-  <symbol minX="277" maxX="308" minY="198" maxY="229" name="equestrian-l"/>
-  <symbol minX="308" maxX="339" minY="198" maxY="229" name="equestrian-m"/>
-  <symbol minX="339" maxX="370" minY="198" maxY="229" name="kindergarten-l"/>
-  <symbol minX="370" maxX="401" minY="198" maxY="229" name="fastfood-l"/>
-  <symbol minX="401" maxX="432" minY="198" maxY="229" name="jewelry-l"/>
-  <symbol minX="432" maxX="463" minY="198" maxY="229" name="tram-l"/>
-  <symbol minX="463" maxX="494" minY="198" maxY="229" name="fire_station-l"/>
-  <symbol minX="494" maxX="525" minY="198" maxY="229" name="information-l"/>
-  <symbol minX="525" maxX="555" minY="198" maxY="229" name="hunting-tower-m"/>
-  <symbol minX="555" maxX="586" minY="198" maxY="229" name="florist-l"/>
-  <symbol minX="586" maxX="616" minY="198" maxY="229" name="hunting-tower-l"/>
-  <symbol minX="616" maxX="647" minY="198" maxY="229" name="fountain-l"/>
-  <symbol minX="647" maxX="678" minY="198" maxY="229" name="toll_booth-l"/>
-  <symbol minX="678" maxX="709" minY="198" maxY="229" name="train-l"/>
-  <symbol minX="709" maxX="740" minY="198" maxY="229" name="fuel-l"/>
-  <symbol minX="740" maxX="771" minY="198" maxY="229" name="hotel-l"/>
-  <symbol minX="771" maxX="802" minY="198" maxY="229" name="hospital-l"/>
-  <symbol minX="802" maxX="833" minY="198" maxY="229" name="funicular-l"/>
-  <symbol minX="833" maxX="864" minY="198" maxY="229" name="historic-ship-l"/>
-  <symbol minX="864" maxX="895" minY="198" maxY="229" name="toys-l"/>
-  <symbol minX="895" maxX="926" minY="198" maxY="229" name="furniture-l"/>
-  <symbol minX="926" maxX="956" minY="198" maxY="229" name="heliport-m"/>
-  <symbol minX="956" maxX="987" minY="198" maxY="229" name="gallery-l"/>
-  <symbol minX="987" maxX="1017" minY="198" maxY="229" name="heliport-l"/>
-  <symbol minX="0" maxX="31" minY="229" maxY="260" name="tomb-l"/>
+  <symbol minX="990" maxX="1021" minY="167" maxY="198" name="jewelry-l"/>
+  <symbol minX="0" maxX="31" minY="198" maxY="229" name="theatre-l"/>
+  <symbol minX="31" maxX="62" minY="198" maxY="229" name="information-l"/>
+  <symbol minX="62" maxX="93" minY="198" maxY="229" name="electronics-l"/>
+  <symbol minX="93" maxX="124" minY="198" maxY="229" name="hunting-tower-l"/>
+  <symbol minX="124" maxX="155" minY="198" maxY="229" name="embassy-l"/>
+  <symbol minX="155" maxX="186" minY="198" maxY="229" name="hotel-l"/>
+  <symbol minX="186" maxX="217" minY="198" maxY="229" name="vending-l"/>
+  <symbol minX="217" maxX="248" minY="198" maxY="229" name="toilets-l"/>
+  <symbol minX="248" maxX="279" minY="198" maxY="229" name="tram-l"/>
+  <symbol minX="279" maxX="310" minY="198" maxY="229" name="equestrian-l"/>
+  <symbol minX="310" maxX="341" minY="198" maxY="229" name="equestrian-m"/>
+  <symbol minX="341" maxX="372" minY="198" maxY="229" name="hospital-l"/>
+  <symbol minX="372" maxX="403" minY="198" maxY="229" name="fastfood-l"/>
+  <symbol minX="403" maxX="434" minY="198" maxY="229" name="historic-ship-l"/>
+  <symbol minX="434" maxX="465" minY="198" maxY="229" name="train-l"/>
+  <symbol minX="465" maxX="496" minY="198" maxY="229" name="fire_station-l"/>
+  <symbol minX="496" maxX="527" minY="198" maxY="229" name="heliport-l"/>
+  <symbol minX="527" maxX="558" minY="198" maxY="229" name="toll_booth-l"/>
+  <symbol minX="558" maxX="589" minY="198" maxY="229" name="florist-l"/>
+  <symbol minX="589" maxX="620" minY="198" maxY="229" name="helipad-l"/>
+  <symbol minX="620" maxX="651" minY="198" maxY="229" name="fountain-l"/>
+  <symbol minX="651" maxX="682" minY="198" maxY="229" name="hardware-l"/>
+  <symbol minX="682" maxX="713" minY="198" maxY="229" name="toys-l"/>
+  <symbol minX="713" maxX="744" minY="198" maxY="229" name="fuel-l"/>
+  <symbol minX="744" maxX="775" minY="198" maxY="229" name="hand-m"/>
+  <symbol minX="775" maxX="806" minY="198" maxY="229" name="hand-l"/>
+  <symbol minX="806" maxX="837" minY="198" maxY="229" name="funicular-l"/>
+  <symbol minX="837" maxX="868" minY="198" maxY="229" name="hairdresser-l"/>
+  <symbol minX="868" maxX="899" minY="198" maxY="229" name="townhall-l"/>
+  <symbol minX="899" maxX="930" minY="198" maxY="229" name="furniture-l"/>
+  <symbol minX="930" maxX="961" minY="198" maxY="229" name="tomb-l"/>
+  <symbol minX="961" maxX="992" minY="198" maxY="229" name="gallery-l"/>
+  <symbol minX="992" maxX="1023" minY="198" maxY="229" name="grocery-l"/>
+  <symbol minX="0" maxX="31" minY="229" maxY="260" name="greengrocer-l"/>
   <symbol minX="31" maxX="62" minY="229" maxY="260" name="garden-l"/>
-  <symbol minX="62" maxX="93" minY="229" maxY="260" name="helipad-l"/>
-  <symbol minX="93" maxX="124" minY="229" maxY="260" name="townhall-l"/>
-  <symbol minX="124" maxX="155" minY="229" maxY="260" name="garden_center-l"/>
-  <symbol minX="155" maxX="186" minY="229" maxY="260" name="hardware-l"/>
-  <symbol minX="186" maxX="217" minY="229" maxY="260" name="hand-m"/>
-  <symbol minX="217" maxX="248" minY="229" maxY="260" name="hand-l"/>
-  <symbol minX="248" maxX="279" minY="229" maxY="260" name="gift-l"/>
-  <symbol minX="279" maxX="310" minY="229" maxY="260" name="hairdresser-l"/>
-  <symbol minX="310" maxX="341" minY="229" maxY="260" name="golf-l"/>
-  <symbol minX="341" maxX="372" minY="229" maxY="260" name="tourism-l"/>
-  <symbol minX="372" maxX="403" minY="229" maxY="260" name="grocery-l"/>
-  <symbol minX="403" maxX="434" minY="229" maxY="260" name="greengrocer-l"/>
-  <symbol minX="434" maxX="465" minY="229" maxY="260" name="skiing-l"/>
-  <symbol minX="465" maxX="495" minY="229" maxY="259" name="tourism-m"/>
-  <symbol minX="495" maxX="525" minY="229" maxY="259" name="grocery-m"/>
-  <symbol minX="525" maxX="555" minY="229" maxY="259" name="golf-m"/>
-  <symbol minX="555" maxX="585" minY="229" maxY="259" name="gift-m"/>
-  <symbol minX="585" maxX="615" minY="229" maxY="259" name="hairdresser-m"/>
-  <symbol minX="615" maxX="645" minY="229" maxY="259" name="gate-m"/>
-  <symbol minX="645" maxX="675" minY="229" maxY="259" name="greengrocer-m"/>
-  <symbol minX="675" maxX="705" minY="229" maxY="259" name="tomb-m"/>
-  <symbol minX="705" maxX="735" minY="229" maxY="259" name="garden_center-m"/>
-  <symbol minX="735" maxX="765" minY="229" maxY="259" name="hardware-m"/>
-  <symbol minX="765" maxX="795" minY="229" maxY="259" name="garden-m"/>
-  <symbol minX="795" maxX="825" minY="229" maxY="259" name="helipad-m"/>
-  <symbol minX="825" maxX="855" minY="229" maxY="259" name="townhall-m"/>
-  <symbol minX="855" maxX="885" minY="229" maxY="259" name="gallery-m"/>
-  <symbol minX="885" maxX="915" minY="229" maxY="259" name="furniture-m"/>
-  <symbol minX="915" maxX="945" minY="229" maxY="259" name="shop-m"/>
-  <symbol minX="945" maxX="975" minY="229" maxY="259" name="funicular-m"/>
-  <symbol minX="975" maxX="1005" minY="229" maxY="259" name="historic-ship-m"/>
-  <symbol minX="0" maxX="30" minY="260" maxY="290" name="toys-m"/>
+  <symbol minX="62" maxX="93" minY="229" maxY="260" name="shop-bicycle-l"/>
+  <symbol minX="93" maxX="124" minY="229" maxY="260" name="tourism-l"/>
+  <symbol minX="124" maxX="155" minY="229" maxY="260" name="golf-l"/>
+  <symbol minX="155" maxX="186" minY="229" maxY="260" name="gift-l"/>
+  <symbol minX="186" maxX="217" minY="229" maxY="260" name="gate-l"/>
+  <symbol minX="217" maxX="247" minY="229" maxY="259" name="gate-m"/>
+  <symbol minX="247" maxX="277" minY="229" maxY="259" name="garden_center-m"/>
+  <symbol minX="277" maxX="307" minY="229" maxY="259" name="gift-m"/>
+  <symbol minX="307" maxX="337" minY="229" maxY="259" name="archery-m"/>
+  <symbol minX="337" maxX="367" minY="229" maxY="259" name="golf-m"/>
+  <symbol minX="367" maxX="397" minY="229" maxY="259" name="garden-m"/>
+  <symbol minX="397" maxX="427" minY="229" maxY="259" name="tourism-m"/>
+  <symbol minX="427" maxX="457" minY="229" maxY="259" name="greengrocer-m"/>
+  <symbol minX="457" maxX="487" minY="229" maxY="259" name="gallery-m"/>
+  <symbol minX="487" maxX="517" minY="229" maxY="259" name="grocery-m"/>
+  <symbol minX="517" maxX="547" minY="229" maxY="259" name="furniture-m"/>
+  <symbol minX="547" maxX="577" minY="229" maxY="259" name="funicular-m"/>
+  <symbol minX="577" maxX="607" minY="229" maxY="259" name="hairdresser-m"/>
+  <symbol minX="607" maxX="637" minY="229" maxY="259" name="townhall-m"/>
+  <symbol minX="637" maxX="667" minY="229" maxY="259" name="fuel-m"/>
+  <symbol minX="667" maxX="697" minY="229" maxY="259" name="toll_booth-m"/>
+  <symbol minX="697" maxX="727" minY="229" maxY="259" name="fountain-m"/>
+  <symbol minX="727" maxX="757" minY="229" maxY="259" name="hardware-m"/>
+  <symbol minX="757" maxX="787" minY="229" maxY="259" name="florist-m"/>
+  <symbol minX="787" maxX="817" minY="229" maxY="259" name="helipad-m"/>
+  <symbol minX="817" maxX="847" minY="229" maxY="259" name="toys-m"/>
+  <symbol minX="847" maxX="877" minY="229" maxY="259" name="fire_station-m"/>
+  <symbol minX="877" maxX="907" minY="229" maxY="259" name="heliport-m"/>
+  <symbol minX="907" maxX="937" minY="229" maxY="259" name="toilets-m"/>
+  <symbol minX="937" maxX="967" minY="229" maxY="259" name="fastfood-m"/>
+  <symbol minX="967" maxX="997" minY="229" maxY="259" name="historic-ship-m"/>
+  <symbol minX="0" maxX="30" minY="260" maxY="290" name="train-m"/>
   <symbol minX="30" maxX="60" minY="260" maxY="290" name="hospital-m"/>
-  <symbol minX="60" maxX="90" minY="260" maxY="290" name="toll_booth-m"/>
-  <symbol minX="90" maxX="120" minY="260" maxY="290" name="fuel-m"/>
+  <symbol minX="60" maxX="90" minY="260" maxY="290" name="tram-m"/>
+  <symbol minX="90" maxX="120" minY="260" maxY="290" name="embassy-m"/>
   <symbol minX="120" maxX="150" minY="260" maxY="290" name="hotel-m"/>
-  <symbol minX="150" maxX="180" minY="260" maxY="290" name="fountain-m"/>
-  <symbol minX="180" maxX="210" minY="260" maxY="290" name="florist-m"/>
-  <symbol minX="210" maxX="240" minY="260" maxY="290" name="train-m"/>
-  <symbol minX="240" maxX="270" minY="260" maxY="290" name="atm-m"/>
-  <symbol minX="270" maxX="300" minY="260" maxY="290" name="fire_station-m"/>
+  <symbol minX="150" maxX="180" minY="260" maxY="290" name="theatre-m"/>
+  <symbol minX="180" maxX="210" minY="260" maxY="290" name="electronics-m"/>
+  <symbol minX="210" maxX="240" minY="260" maxY="290" name="hunting-tower-m"/>
+  <symbol minX="240" maxX="270" minY="260" maxY="290" name="shoes-m"/>
+  <symbol minX="270" maxX="300" minY="260" maxY="290" name="drugs"/>
   <symbol minX="300" maxX="330" minY="260" maxY="290" name="information-m"/>
-  <symbol minX="330" maxX="360" minY="260" maxY="290" name="toilets-m"/>
-  <symbol minX="360" maxX="390" minY="260" maxY="290" name="fastfood-m"/>
+  <symbol minX="330" maxX="360" minY="260" maxY="290" name="vending-m"/>
+  <symbol minX="360" maxX="390" minY="260" maxY="290" name="drinking-water-m"/>
   <symbol minX="390" maxX="420" minY="260" maxY="290" name="jewelry-m"/>
-  <symbol minX="420" maxX="450" minY="260" maxY="290" name="tram-m"/>
-  <symbol minX="450" maxX="480" minY="260" maxY="290" name="vending-m"/>
-  <symbol minX="480" maxX="510" minY="260" maxY="290" name="embassy-m"/>
-  <symbol minX="510" maxX="540" minY="260" maxY="290" name="electronics-m"/>
+  <symbol minX="420" maxX="450" minY="260" maxY="290" name="volcano-m"/>
+  <symbol minX="450" maxX="480" minY="260" maxY="290" name="doityourself-m"/>
+  <symbol minX="480" maxX="510" minY="260" maxY="290" name="tennis-m"/>
+  <symbol minX="510" maxX="540" minY="260" maxY="290" name="dog_park-m"/>
   <symbol minX="540" maxX="570" minY="260" maxY="290" name="kiosk-m"/>
-  <symbol minX="570" maxX="600" minY="260" maxY="290" name="drugs"/>
-  <symbol minX="600" maxX="630" minY="260" maxY="290" name="volcano-m"/>
-  <symbol minX="630" maxX="660" minY="260" maxY="290" name="drinking-water-m"/>
+  <symbol minX="570" maxX="600" minY="260" maxY="290" name="diving-m"/>
+  <symbol minX="600" maxX="630" minY="260" maxY="290" name="laundry-m"/>
+  <symbol minX="630" maxX="660" minY="260" maxY="290" name="department_store-m"/>
   <symbol minX="660" maxX="690" minY="260" maxY="290" name="library-m"/>
-  <symbol minX="690" maxX="720" minY="260" maxY="290" name="theatre-m"/>
-  <symbol minX="720" maxX="750" minY="260" maxY="290" name="shop-bicycle-m"/>
+  <symbol minX="690" maxX="720" minY="260" maxY="290" name="curling-m"/>
+  <symbol minX="720" maxX="750" minY="260" maxY="290" name="atm-m"/>
   <symbol minX="750" maxX="780" minY="260" maxY="290" name="lift_gate-m"/>
-  <symbol minX="780" maxX="810" minY="260" maxY="290" name="doityourself-m"/>
+  <symbol minX="780" maxX="810" minY="260" maxY="290" name="cricket-m"/>
   <symbol minX="810" maxX="840" minY="260" maxY="290" name="lighthouse-m"/>
-  <symbol minX="840" maxX="870" minY="260" maxY="290" name="dog_park-m"/>
-  <symbol minX="870" maxX="900" minY="260" maxY="290" name="diving-m"/>
-  <symbol minX="900" maxX="930" minY="260" maxY="290" name="archery-m"/>
-  <symbol minX="930" maxX="960" minY="260" maxY="290" name="tennis-m"/>
-  <symbol minX="960" maxX="990" minY="260" maxY="290" name="department_store-m"/>
+  <symbol minX="840" maxX="870" minY="260" maxY="290" name="taxi-m"/>
+  <symbol minX="870" maxX="900" minY="260" maxY="290" name="convenience-m"/>
+  <symbol minX="900" maxX="930" minY="260" maxY="290" name="shop-bicycle-m"/>
+  <symbol minX="930" maxX="960" minY="260" maxY="290" name="computer-m"/>
+  <symbol minX="960" maxX="990" minY="260" maxY="290" name="wayside_cross-m"/>
   <symbol minX="990" maxX="1020" minY="260" maxY="290" name="mail-m"/>
-  <symbol minX="0" maxX="30" minY="290" maxY="320" name="curling-m"/>
-  <symbol minX="30" maxX="60" minY="290" maxY="320" name="wayside_cross-m"/>
+  <symbol minX="0" maxX="30" minY="290" maxY="320" name="swimming-m"/>
+  <symbol minX="30" maxX="60" minY="290" maxY="320" name="college-m"/>
   <symbol minX="60" maxX="90" minY="290" maxY="320" name="marketplace-m"/>
-  <symbol minX="90" maxX="120" minY="290" maxY="320" name="taxi-m"/>
-  <symbol minX="120" maxX="150" minY="290" maxY="320" name="cricket-m"/>
-  <symbol minX="150" maxX="180" minY="290" maxY="320" name="convenience-m"/>
+  <symbol minX="90" maxX="120" minY="290" maxY="320" name="clothes-m"/>
+  <symbol minX="120" maxX="150" minY="290" maxY="320" name="sweets-m"/>
+  <symbol minX="150" maxX="180" minY="290" maxY="320" name="cinema-m"/>
   <symbol minX="180" maxX="210" minY="290" maxY="320" name="military-m"/>
-  <symbol minX="210" maxX="240" minY="290" maxY="320" name="swimming-m"/>
-  <symbol minX="240" maxX="270" minY="290" maxY="320" name="computer-m"/>
+  <symbol minX="210" maxX="240" minY="290" maxY="320" name="chemist-m"/>
+  <symbol minX="240" maxX="270" minY="290" maxY="320" name="wayside_shrine-m"/>
   <symbol minX="270" maxX="300" minY="290" maxY="320" name="mobile_phone-m"/>
-  <symbol minX="300" maxX="330" minY="290" maxY="320" name="wayside_shrine-m"/>
+  <symbol minX="300" maxX="330" minY="290" maxY="320" name="cemetery-m"/>
   <symbol minX="330" maxX="360" minY="290" maxY="320" name="monument-m"/>
-  <symbol minX="360" maxX="390" minY="290" maxY="320" name="college-m"/>
-  <symbol minX="390" maxX="420" minY="290" maxY="320" name="clothes-m"/>
+  <symbol minX="360" maxX="390" minY="290" maxY="320" name="subway-spb-m"/>
+  <symbol minX="390" maxX="420" minY="290" maxY="320" name="cave-m"/>
   <symbol minX="420" maxX="450" minY="290" maxY="320" name="motel-m"/>
-  <symbol minX="450" maxX="480" minY="290" maxY="320" name="cinema-m"/>
+  <symbol minX="450" maxX="480" minY="290" maxY="320" name="windmill-m"/>
   <symbol minX="480" maxX="510" minY="290" maxY="320" name="museum-m"/>
-  <symbol minX="510" maxX="540" minY="290" maxY="320" name="sweets-m"/>
-  <symbol minX="540" maxX="570" minY="290" maxY="320" name="shoes-m"/>
-  <symbol minX="570" maxX="600" minY="290" maxY="320" name="australian-football-m"/>
-  <symbol minX="600" maxX="630" minY="290" maxY="320" name="skiing-m"/>
-  <symbol minX="630" maxX="660" minY="290" maxY="320" name="ship-m"/>
-  <symbol minX="660" maxX="690" minY="290" maxY="320" name="bakery-m"/>
-  <symbol minX="690" maxX="720" minY="290" maxY="320" name="chemist-m"/>
-  <symbol minX="720" maxX="750" minY="290" maxY="320" name="windmill-m"/>
+  <symbol minX="510" maxX="540" minY="290" maxY="320" name="casino-m"/>
+  <symbol minX="540" maxX="570" minY="290" maxY="320" name="tomb-m"/>
+  <symbol minX="570" maxX="600" minY="290" maxY="320" name="ship-m"/>
+  <symbol minX="600" maxX="630" minY="290" maxY="320" name="australian-football-m"/>
+  <symbol minX="630" maxX="660" minY="290" maxY="320" name="bakery-m"/>
+  <symbol minX="660" maxX="690" minY="290" maxY="320" name="school-m"/>
+  <symbol minX="690" maxX="720" minY="290" maxY="320" name="banknote-m"/>
+  <symbol minX="720" maxX="750" minY="290" maxY="320" name="caravan_site-m"/>
   <symbol minX="750" maxX="780" minY="290" maxY="320" name="npark-m"/>
-  <symbol minX="780" maxX="810" minY="290" maxY="320" name="subway-spb-m"/>
-  <symbol minX="810" maxX="840" minY="290" maxY="320" name="cemetery-m"/>
+  <symbol minX="780" maxX="810" minY="290" maxY="320" name="shop-m"/>
+  <symbol minX="810" maxX="840" minY="290" maxY="320" name="car_sharing-m"/>
   <symbol minX="840" maxX="870" minY="290" maxY="320" name="nparkf-m "/>
   <symbol minX="870" maxX="900" minY="290" maxY="320" name="nparkf-m"/>
-  <symbol minX="900" maxX="930" minY="290" maxY="320" name="cave-m"/>
-  <symbol minX="930" maxX="960" minY="290" maxY="320" name="zoo-m"/>
-  <symbol minX="960" maxX="990" minY="290" maxY="320" name="casino-m"/>
-  <symbol minX="990" maxX="1020" minY="290" maxY="320" name="banknote-m"/>
-  <symbol minX="0" maxX="30" minY="320" maxY="350" name="caravan_site-m"/>
+  <symbol minX="900" maxX="930" minY="290" maxY="320" name="bar-m"/>
+  <symbol minX="930" maxX="960" minY="290" maxY="320" name="car-repair-m"/>
+  <symbol minX="960" maxX="990" minY="290" maxY="320" name="office-m"/>
+  <symbol minX="990" maxX="1020" minY="290" maxY="320" name="zoo-m"/>
+  <symbol minX="0" maxX="30" minY="320" maxY="350" name="campsite-m"/>
   <symbol minX="30" maxX="60" minY="320" maxY="350" name="optician-m"/>
-  <symbol minX="60" maxX="90" minY="320" maxY="350" name="car_sharing-m"/>
+  <symbol minX="60" maxX="90" minY="320" maxY="350" name="cafe-m"/>
   <symbol minX="90" maxX="120" minY="320" maxY="350" name="park-m"/>
-  <symbol minX="120" maxX="150" minY="320" maxY="350" name="school-m"/>
-  <symbol minX="150" maxX="180" minY="320" maxY="350" name="bar-m"/>
-  <symbol minX="180" maxX="210" minY="320" maxY="350" name="soccer-m"/>
-  <symbol minX="210" maxX="240" minY="320" maxY="350" name="campsite-m"/>
+  <symbol minX="120" maxX="150" minY="320" maxY="350" name="subway-newyork-m"/>
+  <symbol minX="150" maxX="180" minY="320" maxY="350" name="restaurant-m"/>
+  <symbol minX="180" maxX="210" minY="320" maxY="350" name="cable-car-m"/>
+  <symbol minX="210" maxX="240" minY="320" maxY="350" name="butcher-m"/>
   <symbol minX="240" maxX="270" minY="320" maxY="350" name="parking-meter-m"/>
-  <symbol minX="270" maxX="300" minY="320" maxY="350" name="restaurant-m"/>
-  <symbol minX="300" maxX="330" minY="320" maxY="350" name="baseball-m"/>
-  <symbol minX="330" maxX="360" minY="320" maxY="350" name="subway-newyork-m"/>
-  <symbol minX="360" maxX="390" minY="320" maxY="350" name="cafe-m"/>
-  <symbol minX="390" maxX="420" minY="320" maxY="350" name="america-football-m"/>
-  <symbol minX="420" maxX="450" minY="320" maxY="350" name="basketball-m"/>
-  <symbol minX="450" maxX="480" minY="320" maxY="350" name="subway-m"/>
+  <symbol minX="270" maxX="300" minY="320" maxY="350" name="america-football-m"/>
+  <symbol minX="300" maxX="330" minY="320" maxY="350" name="skiing-m"/>
+  <symbol minX="330" maxX="360" minY="320" maxY="350" name="peak-m"/>
+  <symbol minX="360" maxX="390" minY="320" maxY="350" name="remains-m"/>
+  <symbol minX="390" maxX="420" minY="320" maxY="350" name="subway-m"/>
+  <symbol minX="420" maxX="450" minY="320" maxY="350" name="baseball-m"/>
+  <symbol minX="450" maxX="480" minY="320" maxY="350" name="bus-m"/>
   <symbol minX="480" maxX="510" minY="320" maxY="350" name="pharmacy-2-m"/>
-  <symbol minX="510" maxX="540" minY="320" maxY="350" name="bbq-m"/>
+  <symbol minX="510" maxX="540" minY="320" maxY="350" name="bowls-m"/>
   <symbol minX="540" maxX="570" minY="320" maxY="350" name="pharmacy-m"/>
-  <symbol minX="570" maxX="600" minY="320" maxY="350" name="recycling-m"/>
-  <symbol minX="600" maxX="630" minY="320" maxY="350" name="cable-car-m"/>
+  <symbol minX="570" maxX="600" minY="320" maxY="350" name="subway-entrance-m"/>
+  <symbol minX="600" maxX="630" minY="320" maxY="350" name="boundary_stone-m"/>
   <symbol minX="630" maxX="660" minY="320" maxY="350" name="phone-m"/>
-  <symbol minX="660" maxX="690" minY="320" maxY="350" name="butcher-m"/>
-  <symbol minX="690" maxX="720" minY="320" maxY="350" name="bus-m"/>
-  <symbol minX="720" maxX="750" minY="320" maxY="350" name="bowls-m"/>
-  <symbol minX="750" maxX="780" minY="320" maxY="350" name="sports-m"/>
-  <symbol minX="780" maxX="810" minY="320" maxY="350" name="boundary_stone-m"/>
+  <symbol minX="660" maxX="690" minY="320" maxY="350" name="basketball-m"/>
+  <symbol minX="690" maxX="720" minY="320" maxY="350" name="book-shop-m"/>
+  <symbol minX="720" maxX="750" minY="320" maxY="350" name="picnic-m"/>
+  <symbol minX="750" maxX="780" minY="320" maxY="350" name="subway-entrance-2-m"/>
+  <symbol minX="780" maxX="810" minY="320" maxY="350" name="bicycle-m"/>
   <symbol minX="810" maxX="840" minY="320" maxY="350" name="pitch-m"/>
-  <symbol minX="840" maxX="870" minY="320" maxY="350" name="subway-entrance-m"/>
+  <symbol minX="840" maxX="870" minY="320" maxY="350" name="recycling-m"/>
   <symbol minX="870" maxX="900" minY="320" maxY="350" name="alcohol-m"/>
   <symbol minX="900" maxX="930" minY="320" maxY="350" name="place-of-worship-m"/>
-  <symbol minX="930" maxX="960" minY="320" maxY="350" name="book-shop-m"/>
-  <symbol minX="960" maxX="990" minY="320" maxY="350" name="bicycle-m"/>
+  <symbol minX="930" maxX="960" minY="320" maxY="350" name="alpine_hut-m"/>
+  <symbol minX="960" maxX="990" minY="320" maxY="350" name="soccer-m"/>
   <symbol minX="990" maxX="1020" minY="320" maxY="350" name="police-m"/>
-  <symbol minX="0" maxX="30" minY="350" maxY="380" name="subway-entrance-2-m"/>
-  <symbol minX="30" maxX="60" minY="350" maxY="380" name="alpine_hut-m"/>
+  <symbol minX="0" maxX="30" minY="350" maxY="380" name="sports-m"/>
+  <symbol minX="30" maxX="60" minY="350" maxY="380" name="beer-m"/>
   <symbol minX="60" maxX="90" minY="350" maxY="380" name="postbox-m"/>
-  <symbol minX="90" maxX="120" minY="350" maxY="380" name="pub-m"/>
-  <symbol minX="120" maxX="150" minY="350" maxY="380" name="beauty-m"/>
-  <symbol minX="150" maxX="180" minY="350" maxY="380" name="beach-m"/>
-  <symbol minX="180" maxX="208" minY="350" maxY="378" name="subway-rome-l"/>
-  <symbol minX="208" maxX="236" minY="350" maxY="378" name="lightrail-berlin-m"/>
-  <symbol minX="236" maxX="264" minY="350" maxY="378" name="subway-berlin-l"/>
-  <symbol minX="264" maxX="292" minY="350" maxY="378" name="parking-l"/>
-  <symbol minX="292" maxX="320" minY="350" maxY="378" name="speedcam-l"/>
-  <symbol minX="320" maxX="351" minY="350" maxY="378" name="subway-moscow-l"/>
-  <symbol minX="351" maxX="378" minY="350" maxY="377" name="route_from"/>
-  <symbol minX="378" maxX="409" minY="350" maxY="375" name="subway-london-l"/>
-  <symbol minX="409" maxX="438" minY="350" maxY="375" name="subway-moscow-m"/>
-  <symbol minX="438" maxX="463" minY="350" maxY="375" name="subway-berlin-m"/>
-  <symbol minX="463" maxX="488" minY="350" maxY="375" name="current-position"/>
-  <symbol minX="488" maxX="513" minY="350" maxY="375" name="subway-paris-m"/>
-  <symbol minX="513" maxX="538" minY="350" maxY="375" name="no-icon-amenity"/>
-  <symbol minX="538" maxX="563" minY="350" maxY="375" name="no-icon-leisure"/>
-  <symbol minX="563" maxX="588" minY="350" maxY="375" name="no-icon-shop"/>
-  <symbol minX="588" maxX="613" minY="350" maxY="375" name="subway-rome-m"/>
-  <symbol minX="613" maxX="638" minY="350" maxY="375" name="no-icon-tourism"/>
-  <symbol minX="638" maxX="663" minY="350" maxY="375" name="no-icon"/>
-  <symbol minX="663" maxX="686" minY="350" maxY="374" name="office-s"/>
-  <symbol minX="686" maxX="709" minY="350" maxY="374" name="picnic-s"/>
-  <symbol minX="709" maxX="733" minY="350" maxY="374" name="airport-s"/>
-  <symbol minX="733" maxX="756" minY="350" maxY="374" name="bcontrol-s"/>
-  <symbol minX="756" maxX="779" minY="350" maxY="374" name="beer-s"/>
-  <symbol minX="779" maxX="802" minY="350" maxY="374" name="waterfall-s"/>
-  <symbol minX="802" maxX="825" minY="350" maxY="374" name="hunting-tower-s"/>
-  <symbol minX="825" maxX="848" minY="350" maxY="374" name="heliport-s"/>
-  <symbol minX="848" maxX="871" minY="350" maxY="374" name="remains-s"/>
-  <symbol minX="871" maxX="894" minY="350" maxY="373" name="shop-s"/>
-  <symbol minX="894" maxX="917" minY="350" maxY="373" name="ship-s"/>
-  <symbol minX="917" maxX="940" minY="350" maxY="373" name="skiing-s"/>
-  <symbol minX="940" maxX="963" minY="350" maxY="373" name="school-s"/>
-  <symbol minX="963" maxX="986" minY="350" maxY="373" name="alcohol-s"/>
-  <symbol minX="986" maxX="1009" minY="350" maxY="373" name="soccer-s"/>
-  <symbol minX="0" maxX="23" minY="380" maxY="403" name="restaurant-s"/>
+  <symbol minX="90" maxX="120" minY="350" maxY="380" name="beauty-m"/>
+  <symbol minX="120" maxX="150" minY="350" maxY="380" name="beach-m"/>
+  <symbol minX="150" maxX="180" minY="350" maxY="380" name="bcontrol-m"/>
+  <symbol minX="180" maxX="210" minY="350" maxY="380" name="bbq-m"/>
+  <symbol minX="210" maxX="240" minY="350" maxY="380" name="pub-m"/>
+  <symbol minX="240" maxX="268" minY="350" maxY="378" name="speedcam-l"/>
+  <symbol minX="268" maxX="296" minY="350" maxY="378" name="lightrail-berlin-m"/>
+  <symbol minX="296" maxX="324" minY="350" maxY="378" name="subway-berlin-l"/>
+  <symbol minX="324" maxX="352" minY="350" maxY="378" name="subway-rome-l"/>
+  <symbol minX="352" maxX="380" minY="350" maxY="378" name="parking-l"/>
+  <symbol minX="380" maxX="411" minY="350" maxY="378" name="subway-moscow-l"/>
+  <symbol minX="411" maxX="442" minY="350" maxY="375" name="subway-london-l"/>
+  <symbol minX="442" maxX="467" minY="350" maxY="375" name="current-position"/>
+  <symbol minX="467" maxX="496" minY="350" maxY="375" name="subway-moscow-m"/>
+  <symbol minX="496" maxX="521" minY="350" maxY="375" name="no-icon-amenity"/>
+  <symbol minX="521" maxX="546" minY="350" maxY="375" name="subway-paris-m"/>
+  <symbol minX="546" maxX="571" minY="350" maxY="375" name="subway-berlin-m"/>
+  <symbol minX="571" maxX="596" minY="350" maxY="375" name="subway-rome-m"/>
+  <symbol minX="596" maxX="621" minY="350" maxY="375" name="no-icon"/>
+  <symbol minX="621" maxX="646" minY="350" maxY="375" name="no-icon-tourism"/>
+  <symbol minX="646" maxX="671" minY="350" maxY="375" name="no-icon-shop"/>
+  <symbol minX="671" maxX="696" minY="350" maxY="375" name="no-icon-leisure"/>
+  <symbol minX="696" maxX="719" minY="350" maxY="374" name="beer-s"/>
+  <symbol minX="719" maxX="742" minY="350" maxY="374" name="waterfall-s"/>
+  <symbol minX="742" maxX="765" minY="350" maxY="374" name="hunting-tower-s"/>
+  <symbol minX="765" maxX="789" minY="350" maxY="374" name="airport-s"/>
+  <symbol minX="789" maxX="812" minY="350" maxY="373" name="ship-s"/>
+  <symbol minX="812" maxX="835" minY="350" maxY="373" name="school-s"/>
+  <symbol minX="835" maxX="858" minY="350" maxY="373" name="fountain-s"/>
+  <symbol minX="858" maxX="881" minY="350" maxY="373" name="shop-s"/>
+  <symbol minX="881" maxX="904" minY="350" maxY="373" name="restaurant-s"/>
+  <symbol minX="904" maxX="927" minY="350" maxY="373" name="remains-s"/>
+  <symbol minX="927" maxX="950" minY="350" maxY="373" name="skiing-s"/>
+  <symbol minX="950" maxX="973" minY="350" maxY="373" name="recycling-s"/>
+  <symbol minX="973" maxX="996" minY="350" maxY="373" name="alcohol-s"/>
+  <symbol minX="996" maxX="1019" minY="350" maxY="373" name="soccer-s"/>
+  <symbol minX="0" maxX="23" minY="380" maxY="403" name="pub-s"/>
   <symbol minX="23" maxX="46" minY="380" maxY="403" name="speedcam-m"/>
   <symbol minX="46" maxX="69" minY="380" maxY="403" name="america-football-s"/>
-  <symbol minX="69" maxX="92" minY="380" maxY="403" name="recycling-s"/>
-  <symbol minX="92" maxX="115" minY="380" maxY="403" name="atm-s"/>
-  <symbol minX="115" maxX="138" minY="380" maxY="403" name="bar-s"/>
-  <symbol minX="138" maxX="161" minY="380" maxY="403" name="baseball-s"/>
-  <symbol minX="161" maxX="184" minY="380" maxY="403" name="basketball-s"/>
-  <symbol minX="184" maxX="207" minY="380" maxY="403" name="bicycle-s"/>
-  <symbol minX="207" maxX="230" minY="380" maxY="403" name="book-shop-s"/>
+  <symbol minX="69" maxX="92" minY="380" maxY="403" name="power-s"/>
+  <symbol minX="92" maxX="115" minY="380" maxY="403" name="police-s"/>
+  <symbol minX="115" maxX="138" minY="380" maxY="403" name="townhall-s"/>
+  <symbol minX="138" maxX="161" minY="380" maxY="403" name="atm-s"/>
+  <symbol minX="161" maxX="184" minY="380" maxY="403" name="bar-s"/>
+  <symbol minX="184" maxX="207" minY="380" maxY="403" name="fuel-s"/>
+  <symbol minX="207" maxX="230" minY="380" maxY="403" name="funicular-s"/>
   <symbol minX="230" maxX="258" minY="380" maxY="403" name="subway-barcelona-s"/>
-  <symbol minX="258" maxX="281" minY="380" maxY="403" name="pub-s"/>
-  <symbol minX="281" maxX="304" minY="380" maxY="403" name="power-s"/>
-  <symbol minX="304" maxX="327" minY="380" maxY="403" name="bus-s"/>
-  <symbol minX="327" maxX="350" minY="380" maxY="403" name="police-s"/>
+  <symbol minX="258" maxX="281" minY="380" maxY="403" name="place-of-worship-s"/>
+  <symbol minX="281" maxX="304" minY="380" maxY="403" name="pitch-s"/>
+  <symbol minX="304" maxX="327" minY="380" maxY="403" name="baseball-s"/>
+  <symbol minX="327" maxX="350" minY="380" maxY="403" name="picnic-s"/>
   <symbol minX="350" maxX="373" minY="380" maxY="403" name="subway-entrance-2-s"/>
   <symbol minX="373" maxX="396" minY="380" maxY="403" name="subway-entrance-arrow"/>
-  <symbol minX="396" maxX="419" minY="380" maxY="403" name="place-of-worship-s"/>
-  <symbol minX="419" maxX="442" minY="380" maxY="403" name="pitch-s"/>
+  <symbol minX="396" maxX="419" minY="380" maxY="403" name="phone-s"/>
+  <symbol minX="419" maxX="442" minY="380" maxY="403" name="pharmacy-s"/>
   <symbol minX="442" maxX="465" minY="380" maxY="403" name="subway-entrance-s"/>
-  <symbol minX="465" maxX="488" minY="380" maxY="403" name="cable-car-s"/>
-  <symbol minX="488" maxX="511" minY="380" maxY="403" name="cafe-s"/>
-  <symbol minX="511" maxX="534" minY="380" maxY="403" name="campsite-s"/>
-  <symbol minX="534" maxX="557" minY="380" maxY="403" name="phone-s"/>
-  <symbol minX="557" maxX="580" minY="380" maxY="403" name="pharmacy-s"/>
+  <symbol minX="465" maxX="488" minY="380" maxY="403" name="basketball-s"/>
+  <symbol minX="488" maxX="511" minY="380" maxY="403" name="bcontrol-s"/>
+  <symbol minX="511" maxX="534" minY="380" maxY="403" name="bicycle-s"/>
+  <symbol minX="534" maxX="557" minY="380" maxY="403" name="book-shop-s"/>
+  <symbol minX="557" maxX="580" minY="380" maxY="403" name="bus-s"/>
   <symbol minX="580" maxX="610" minY="380" maxY="403" name="subway-london-m"/>
-  <symbol minX="610" maxX="633" minY="380" maxY="403" name="car-repair-s"/>
-  <symbol minX="633" maxX="656" minY="380" maxY="403" name="zoo-s"/>
-  <symbol minX="656" maxX="679" minY="380" maxY="403" name="casino-s"/>
-  <symbol minX="679" maxX="702" minY="380" maxY="403" name="cave-s"/>
-  <symbol minX="702" maxX="725" minY="380" maxY="403" name="windmill-s"/>
-  <symbol minX="725" maxX="748" minY="380" maxY="403" name="cemetery-s"/>
-  <symbol minX="748" maxX="771" minY="380" maxY="403" name="cinema-s"/>
-  <symbol minX="771" maxX="794" minY="380" maxY="403" name="college-s"/>
-  <symbol minX="794" maxX="817" minY="380" maxY="403" name="volcano-s"/>
-  <symbol minX="817" maxX="840" minY="380" maxY="403" name="drinking-water-s"/>
-  <symbol minX="840" maxX="863" minY="380" maxY="403" name="embassy-s"/>
-  <symbol minX="863" maxX="886" minY="380" maxY="403" name="tram-s"/>
-  <symbol minX="886" maxX="909" minY="380" maxY="403" name="equestrian-s"/>
+  <symbol minX="610" maxX="633" minY="380" maxY="403" name="cable-car-s"/>
+  <symbol minX="633" maxX="656" minY="380" maxY="403" name="cafe-s"/>
+  <symbol minX="656" maxX="679" minY="380" maxY="403" name="tourism-s"/>
+  <symbol minX="679" maxX="702" minY="380" maxY="403" name="gallery-s"/>
+  <symbol minX="702" maxX="725" minY="380" maxY="403" name="zoo-s"/>
+  <symbol minX="725" maxX="748" minY="380" maxY="403" name="campsite-s"/>
+  <symbol minX="748" maxX="771" minY="380" maxY="403" name="car-repair-s"/>
+  <symbol minX="771" maxX="794" minY="380" maxY="403" name="windmill-s"/>
+  <symbol minX="794" maxX="817" minY="380" maxY="403" name="peak-s"/>
+  <symbol minX="817" maxX="840" minY="380" maxY="403" name="casino-s"/>
+  <symbol minX="840" maxX="863" minY="380" maxY="403" name="cave-s"/>
+  <symbol minX="863" maxX="886" minY="380" maxY="403" name="fire_station-s"/>
+  <symbol minX="886" maxX="909" minY="380" maxY="403" name="park-s"/>
   <symbol minX="909" maxX="932" minY="380" maxY="403" name="subway-newyork-s"/>
-  <symbol minX="932" maxX="955" minY="380" maxY="403" name="fastfood-s"/>
-  <symbol minX="955" maxX="978" minY="380" maxY="403" name="train-s"/>
-  <symbol minX="978" maxX="1001" minY="380" maxY="403" name="fire_station-s"/>
-  <symbol minX="1001" maxX="1024" minY="380" maxY="403" name="fountain-s"/>
-  <symbol minX="0" maxX="23" minY="403" maxY="426" name="fuel-s"/>
-  <symbol minX="23" maxX="46" minY="403" maxY="426" name="park-s"/>
-  <symbol minX="46" maxX="69" minY="403" maxY="426" name="funicular-s"/>
+  <symbol minX="932" maxX="955" minY="380" maxY="403" name="cemetery-s"/>
+  <symbol minX="955" maxX="978" minY="380" maxY="403" name="office-s"/>
+  <symbol minX="978" maxX="1001" minY="380" maxY="403" name="nparkf-s"/>
+  <symbol minX="1001" maxX="1024" minY="380" maxY="403" name="cinema-s"/>
+  <symbol minX="0" maxX="23" minY="403" maxY="426" name="npark-s"/>
+  <symbol minX="23" maxX="46" minY="403" maxY="426" name="college-s"/>
+  <symbol minX="46" maxX="69" minY="403" maxY="426" name="volcano-s"/>
   <symbol minX="69" maxX="92" minY="403" maxY="426" name="subway-s"/>
-  <symbol minX="92" maxX="115" minY="403" maxY="426" name="nparkf-s"/>
-  <symbol minX="115" maxX="138" minY="403" maxY="426" name="npark-s"/>
+  <symbol minX="92" maxX="115" minY="403" maxY="426" name="museum-s"/>
+  <symbol minX="115" maxX="138" minY="403" maxY="426" name="monument-s"/>
   <symbol minX="138" maxX="161" minY="403" maxY="426" name="subway-spb-s"/>
-  <symbol minX="161" maxX="184" minY="403" maxY="426" name="townhall-s"/>
-  <symbol minX="184" maxX="207" minY="403" maxY="426" name="gallery-s"/>
-  <symbol minX="207" maxX="230" minY="403" maxY="426" name="garden-s"/>
-  <symbol minX="230" maxX="253" minY="403" maxY="426" name="tourism-s"/>
-  <symbol minX="253" maxX="276" minY="403" maxY="426" name="golf-s"/>
-  <symbol minX="276" maxX="299" minY="403" maxY="426" name="museum-s"/>
-  <symbol minX="299" maxX="322" minY="403" maxY="426" name="monument-s"/>
-  <symbol minX="322" maxX="345" minY="403" maxY="426" name="military-s"/>
+  <symbol minX="161" maxX="184" minY="403" maxY="426" name="drinking-water-s"/>
+  <symbol minX="184" maxX="207" minY="403" maxY="426" name="embassy-s"/>
+  <symbol minX="207" maxX="230" minY="403" maxY="426" name="tram-s"/>
+  <symbol minX="230" maxX="253" minY="403" maxY="426" name="train-s"/>
+  <symbol minX="253" maxX="276" minY="403" maxY="426" name="military-s"/>
+  <symbol minX="276" maxX="299" minY="403" maxY="426" name="equestrian-s"/>
+  <symbol minX="299" maxX="322" minY="403" maxY="426" name="garden-s"/>
+  <symbol minX="322" maxX="345" minY="403" maxY="426" name="mail-s"/>
   <symbol minX="345" maxX="368" minY="403" maxY="426" name="swimming-s"/>
-  <symbol minX="368" maxX="391" minY="403" maxY="426" name="grocery-s"/>
-  <symbol minX="391" maxX="414" minY="403" maxY="426" name="hand-s"/>
-  <symbol minX="414" maxX="437" minY="403" maxY="426" name="mail-s"/>
-  <symbol minX="437" maxX="460" minY="403" maxY="426" name="helipad-s"/>
+  <symbol minX="368" maxX="391" minY="403" maxY="426" name="fastfood-s"/>
+  <symbol minX="391" maxX="414" minY="403" maxY="426" name="lighthouse-s"/>
+  <symbol minX="414" maxX="437" minY="403" maxY="426" name="library-s"/>
+  <symbol minX="437" maxX="460" minY="403" maxY="426" name="kindergarten-s"/>
   <symbol minX="460" maxX="483" minY="403" maxY="426" name="tennis-s"/>
-  <symbol minX="483" maxX="506" minY="403" maxY="426" name="lighthouse-s"/>
-  <symbol minX="506" maxX="529" minY="403" maxY="426" name="library-s"/>
+  <symbol minX="483" maxX="506" minY="403" maxY="426" name="information-s"/>
+  <symbol minX="506" maxX="529" minY="403" maxY="426" name="hotel-s"/>
   <symbol minX="529" maxX="552" minY="403" maxY="426" name="theatre-s"/>
-  <symbol minX="552" maxX="575" minY="403" maxY="426" name="kindergarten-s"/>
-  <symbol minX="575" maxX="598" minY="403" maxY="426" name="information-s"/>
+  <symbol minX="552" maxX="575" minY="403" maxY="426" name="hospital-s"/>
+  <symbol minX="575" maxX="598" minY="403" maxY="426" name="heliport-s"/>
   <symbol minX="598" maxX="621" minY="403" maxY="426" name="toilets-s"/>
-  <symbol minX="621" maxX="644" minY="403" maxY="426" name="hotel-s"/>
-  <symbol minX="644" maxX="667" minY="403" maxY="426" name="hospital-s"/>
-  <symbol minX="667" maxX="698" minY="403" maxY="425" name="subway-madrid-m"/>
-  <symbol minX="698" maxX="729" minY="403" maxY="425" name="metro-barcelona-m"/>
-  <symbol minX="729" maxX="760" minY="403" maxY="425" name="subway-madrid-l"/>
-  <symbol minX="760" maxX="781" minY="403" maxY="425" name="s-arrow"/>
-  <symbol minX="781" maxX="812" minY="403" maxY="425" name="subway-barcelona-l"/>
-  <symbol minX="812" maxX="843" minY="403" maxY="425" name="subway-barcelona-m"/>
-  <symbol minX="843" maxX="865" minY="403" maxY="425" name="parking-m"/>
-  <symbol minX="865" maxX="886" minY="403" maxY="424" name="lightrail-berlin-s"/>
-  <symbol minX="886" maxX="914" minY="403" maxY="424" name="subway-madrid-s"/>
-  <symbol minX="914" maxX="944" minY="403" maxY="424" name="subway-kiev-l"/>
-  <symbol minX="944" maxX="965" minY="403" maxY="424" name="subway-paris-s"/>
-  <symbol minX="965" maxX="993" minY="403" maxY="424" name="metro-barcelona-s"/>
-  <symbol minX="993" maxX="1014" minY="403" maxY="424" name="peak-l"/>
+  <symbol minX="621" maxX="644" minY="403" maxY="426" name="helipad-s"/>
+  <symbol minX="644" maxX="667" minY="403" maxY="426" name="hand-s"/>
+  <symbol minX="667" maxX="690" minY="403" maxY="426" name="grocery-s"/>
+  <symbol minX="690" maxX="713" minY="403" maxY="426" name="golf-s"/>
+  <symbol minX="713" maxX="744" minY="403" maxY="425" name="metro-barcelona-m"/>
+  <symbol minX="744" maxX="775" minY="403" maxY="425" name="subway-madrid-m"/>
+  <symbol minX="775" maxX="806" minY="403" maxY="425" name="subway-madrid-l"/>
+  <symbol minX="806" maxX="837" minY="403" maxY="425" name="subway-barcelona-m"/>
+  <symbol minX="837" maxX="868" minY="403" maxY="425" name="subway-barcelona-l"/>
+  <symbol minX="868" maxX="890" minY="403" maxY="425" name="route_from"/>
+  <symbol minX="890" maxX="911" minY="403" maxY="425" name="s-arrow"/>
+  <symbol minX="911" maxX="933" minY="403" maxY="425" name="parking-m"/>
+  <symbol minX="933" maxX="954" minY="403" maxY="424" name="lightrail-berlin-s"/>
+  <symbol minX="954" maxX="982" minY="403" maxY="424" name="metro-barcelona-s"/>
+  <symbol minX="982" maxX="1012" minY="403" maxY="424" name="subway-kiev-l"/>
   <symbol minX="0" maxX="30" minY="426" maxY="447" name="subway-kiev-m"/>
-  <symbol minX="30" maxX="50" minY="426" maxY="446" name="api-result"/>
-  <symbol minX="50" maxX="70" minY="426" maxY="446" name="subway-moscow-s"/>
-  <symbol minX="70" maxX="89" minY="426" maxY="445" name="search-result"/>
-  <symbol minX="89" maxX="108" minY="426" maxY="445" name="parking-s"/>
-  <symbol minX="108" maxX="127" minY="426" maxY="445" name="speedcam-s"/>
-  <symbol minX="127" maxX="148" minY="426" maxY="445" name="bench"/>
-  <symbol minX="148" maxX="171" minY="426" maxY="445" name="subway-london-s"/>
-  <symbol minX="171" maxX="190" minY="426" maxY="445" name="subway-rome-s"/>
-  <symbol minX="190" maxX="209" minY="426" maxY="445" name="subway-berlin-s"/>
-  <symbol minX="209" maxX="227" minY="426" maxY="444" name="survey_point-l"/>
-  <symbol minX="227" maxX="245" minY="426" maxY="444" name="star-l"/>
-  <symbol minX="245" maxX="264" minY="426" maxY="444" name="peakt-l"/>
-  <symbol minX="264" maxX="294" minY="426" maxY="444" name="subway-minsk-l"/>
-  <symbol minX="294" maxX="310" minY="426" maxY="442" name="star-m"/>
-  <symbol minX="310" maxX="335" minY="426" maxY="442" name="subway-kiev-s"/>
-  <symbol minX="335" maxX="350" minY="426" maxY="441" name="subway-xs"/>
-  <symbol minX="350" maxX="373" minY="426" maxY="441" name="railway-crossing"/>
-  <symbol minX="373" maxX="398" minY="426" maxY="441" name="subway-minsk-m"/>
-  <symbol minX="398" maxX="413" minY="426" maxY="441" name="subway-newyork-xs"/>
-  <symbol minX="413" maxX="429" minY="426" maxY="441" name="peak-m"/>
-  <symbol minX="429" maxX="444" minY="426" maxY="441" name="survey_point-m"/>
-  <symbol minX="444" maxX="458" minY="426" maxY="440" name="star-s"/>
-  <symbol minX="458" maxX="481" minY="426" maxY="440" name="subway-minsk-s"/>
-  <symbol minX="481" maxX="495" minY="426" maxY="440" name="crossing-l"/>
-  <symbol minX="495" maxX="508" minY="426" maxY="439" name="survey_point-s"/>
-  <symbol minX="508" maxX="522" minY="426" maxY="439" name="peakt-m"/>
-  <symbol minX="522" maxX="536" minY="426" maxY="439" name="peak-s"/>
-  <symbol minX="536" maxX="564" minY="426" maxY="439" name="arrow-m"/>
-  <symbol minX="564" maxX="576" minY="426" maxY="438" name="crossing-m"/>
-  <symbol minX="576" maxX="588" minY="426" maxY="438" name="entrance-s"/>
-  <symbol minX="588" maxX="600" minY="426" maxY="437" name="peakt-s"/>
-  <symbol minX="600" maxX="610" minY="426" maxY="436" name="tree-l"/>
-  <symbol minX="610" maxX="620" minY="426" maxY="436" name="none"/>
-  <symbol minX="620" maxX="630" minY="426" maxY="436" name="dot-m"/>
-  <symbol minX="630" maxX="651" minY="426" maxY="436" name="arrow-s"/>
-  <symbol minX="651" maxX="661" minY="426" maxY="436" name="crossing-s"/>
-  <symbol minX="661" maxX="670" minY="426" maxY="435" name="tree-m"/>
-  <symbol minX="670" maxX="679" minY="426" maxY="435" name="entrance-xs"/>
-  <symbol minX="679" maxX="686" minY="426" maxY="433" name="dot-s-light"/>
-  <symbol minX="686" maxX="693" minY="426" maxY="433" name="tree-s"/>
-  <symbol minX="693" maxX="700" minY="426" maxY="433" name="zero-icon"/>
-  <symbol minX="700" maxX="707" minY="426" maxY="433" name="dot-s"/>
+  <symbol minX="30" maxX="51" minY="426" maxY="447" name="subway-paris-s"/>
+  <symbol minX="51" maxX="79" minY="426" maxY="447" name="subway-madrid-s"/>
+  <symbol minX="79" maxX="99" minY="426" maxY="446" name="subway-moscow-s"/>
+  <symbol minX="99" maxX="119" minY="426" maxY="446" name="api-result"/>
+  <symbol minX="119" maxX="138" minY="426" maxY="445" name="search-result"/>
+  <symbol minX="138" maxX="159" minY="426" maxY="445" name="bench"/>
+  <symbol minX="159" maxX="178" minY="426" maxY="445" name="speedcam-s"/>
+  <symbol minX="178" maxX="197" minY="426" maxY="445" name="star-l"/>
+  <symbol minX="197" maxX="220" minY="426" maxY="445" name="subway-london-s"/>
+  <symbol minX="220" maxX="239" minY="426" maxY="445" name="subway-rome-s"/>
+  <symbol minX="239" maxX="258" minY="426" maxY="445" name="subway-berlin-s"/>
+  <symbol minX="258" maxX="277" minY="426" maxY="445" name="parking-s"/>
+  <symbol minX="277" maxX="295" minY="426" maxY="444" name="star-m"/>
+  <symbol minX="295" maxX="314" minY="426" maxY="444" name="peakt-l"/>
+  <symbol minX="314" maxX="344" minY="426" maxY="444" name="subway-minsk-l"/>
+  <symbol minX="344" maxX="362" minY="426" maxY="444" name="survey_point-l"/>
+  <symbol minX="362" maxX="387" minY="426" maxY="442" name="subway-kiev-s"/>
+  <symbol minX="387" maxX="402" minY="426" maxY="441" name="survey_point-m"/>
+  <symbol minX="402" maxX="417" minY="426" maxY="441" name="subway-newyork-xs"/>
+  <symbol minX="417" maxX="440" minY="426" maxY="441" name="railway-crossing"/>
+  <symbol minX="440" maxX="455" minY="426" maxY="441" name="subway-xs"/>
+  <symbol minX="455" maxX="480" minY="426" maxY="441" name="subway-minsk-m"/>
+  <symbol minX="480" maxX="495" minY="426" maxY="441" name="star-s"/>
+  <symbol minX="495" maxX="518" minY="426" maxY="440" name="subway-minsk-s"/>
+  <symbol minX="518" maxX="532" minY="426" maxY="440" name="crossing-l"/>
+  <symbol minX="532" maxX="560" minY="426" maxY="439" name="arrow-m"/>
+  <symbol minX="560" maxX="574" minY="426" maxY="439" name="peakt-m"/>
+  <symbol minX="574" maxX="587" minY="426" maxY="439" name="survey_point-s"/>
+  <symbol minX="587" maxX="599" minY="426" maxY="438" name="entrance-s"/>
+  <symbol minX="599" maxX="611" minY="426" maxY="438" name="crossing-m"/>
+  <symbol minX="611" maxX="622" minY="426" maxY="437" name="dot-m"/>
+  <symbol minX="622" maxX="634" minY="426" maxY="437" name="peakt-s"/>
+  <symbol minX="634" maxX="655" minY="426" maxY="436" name="arrow-s"/>
+  <symbol minX="655" maxX="665" minY="426" maxY="436" name="tree-l"/>
+  <symbol minX="665" maxX="675" minY="426" maxY="436" name="none"/>
+  <symbol minX="675" maxX="685" minY="426" maxY="436" name="crossing-s"/>
+  <symbol minX="685" maxX="694" minY="426" maxY="435" name="dot-s-light"/>
+  <symbol minX="694" maxX="703" minY="426" maxY="435" name="tree-m"/>
+  <symbol minX="703" maxX="712" minY="426" maxY="435" name="dot-s"/>
+  <symbol minX="712" maxX="721" minY="426" maxY="435" name="entrance-xs"/>
+  <symbol minX="721" maxX="728" minY="426" maxY="433" name="zero-icon"/>
+  <symbol minX="728" maxX="735" minY="426" maxY="433" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-hdpi_dark/symbols.png b/data/resources-hdpi_dark/symbols.png
index 08c9166efc..e3ee4f2f15 100644
--- a/data/resources-hdpi_dark/symbols.png
+++ b/data/resources-hdpi_dark/symbols.png
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/resources-hdpi_dark/symbols.sdf
index 048bd700b2..a0de105e78 100644
--- a/data/resources-hdpi_dark/symbols.sdf
+++ b/data/resources-hdpi_dark/symbols.sdf
@@ -307,36 +307,36 @@
   <symbol minX="387" maxX="415" minY="350" maxY="378" name="subway-berlin-l"/>
   <symbol minX="415" maxX="443" minY="350" maxY="378" name="parking-l"/>
   <symbol minX="443" maxX="471" minY="350" maxY="378" name="subway-rome-l"/>
-  <symbol minX="471" maxX="498" minY="350" maxY="377" name="route_from"/>
-  <symbol minX="498" maxX="523" minY="350" maxY="375" name="no-icon"/>
-  <symbol minX="523" maxX="548" minY="350" maxY="375" name="subway-rome-m"/>
-  <symbol minX="548" maxX="573" minY="350" maxY="375" name="no-icon-amenity"/>
-  <symbol minX="573" maxX="598" minY="350" maxY="375" name="subway-paris-m"/>
-  <symbol minX="598" maxX="623" minY="350" maxY="375" name="no-icon-shop"/>
-  <symbol minX="623" maxX="652" minY="350" maxY="375" name="subway-moscow-m"/>
-  <symbol minX="652" maxX="677" minY="350" maxY="375" name="current-position"/>
-  <symbol minX="677" maxX="708" minY="350" maxY="375" name="subway-london-l"/>
-  <symbol minX="708" maxX="733" minY="350" maxY="375" name="subway-berlin-m"/>
-  <symbol minX="733" maxX="758" minY="350" maxY="375" name="no-icon-leisure"/>
-  <symbol minX="758" maxX="783" minY="350" maxY="375" name="no-icon-tourism"/>
-  <symbol minX="783" maxX="807" minY="350" maxY="374" name="airport-s"/>
-  <symbol minX="807" maxX="830" minY="350" maxY="373" name="shop-s"/>
-  <symbol minX="830" maxX="853" minY="350" maxY="373" name="picnic-s"/>
-  <symbol minX="853" maxX="876" minY="350" maxY="373" name="phone-s"/>
-  <symbol minX="876" maxX="899" minY="350" maxY="373" name="skiing-s"/>
-  <symbol minX="899" maxX="922" minY="350" maxY="373" name="cable-car-s"/>
-  <symbol minX="922" maxX="945" minY="350" maxY="373" name="pharmacy-s"/>
-  <symbol minX="945" maxX="968" minY="350" maxY="373" name="soccer-s"/>
-  <symbol minX="968" maxX="991" minY="350" maxY="373" name="shop-s copy"/>
-  <symbol minX="991" maxX="1014" minY="350" maxY="373" name="speedcam-m"/>
+  <symbol minX="471" maxX="496" minY="350" maxY="375" name="no-icon-tourism"/>
+  <symbol minX="496" maxX="521" minY="350" maxY="375" name="no-icon"/>
+  <symbol minX="521" maxX="546" minY="350" maxY="375" name="subway-rome-m"/>
+  <symbol minX="546" maxX="571" minY="350" maxY="375" name="no-icon-amenity"/>
+  <symbol minX="571" maxX="596" minY="350" maxY="375" name="subway-paris-m"/>
+  <symbol minX="596" maxX="621" minY="350" maxY="375" name="no-icon-shop"/>
+  <symbol minX="621" maxX="650" minY="350" maxY="375" name="subway-moscow-m"/>
+  <symbol minX="650" maxX="675" minY="350" maxY="375" name="current-position"/>
+  <symbol minX="675" maxX="706" minY="350" maxY="375" name="subway-london-l"/>
+  <symbol minX="706" maxX="731" minY="350" maxY="375" name="subway-berlin-m"/>
+  <symbol minX="731" maxX="756" minY="350" maxY="375" name="no-icon-leisure"/>
+  <symbol minX="756" maxX="780" minY="350" maxY="374" name="airport-s"/>
+  <symbol minX="780" maxX="803" minY="350" maxY="373" name="shop-s copy"/>
+  <symbol minX="803" maxX="826" minY="350" maxY="373" name="shop-s"/>
+  <symbol minX="826" maxX="849" minY="350" maxY="373" name="picnic-s"/>
+  <symbol minX="849" maxX="872" minY="350" maxY="373" name="phone-s"/>
+  <symbol minX="872" maxX="895" minY="350" maxY="373" name="skiing-s"/>
+  <symbol minX="895" maxX="918" minY="350" maxY="373" name="cable-car-s"/>
+  <symbol minX="918" maxX="941" minY="350" maxY="373" name="pharmacy-s"/>
+  <symbol minX="941" maxX="964" minY="350" maxY="373" name="soccer-s"/>
+  <symbol minX="964" maxX="987" minY="350" maxY="373" name="cinema-s"/>
+  <symbol minX="987" maxX="1010" minY="350" maxY="373" name="speedcam-m"/>
   <symbol minX="0" maxX="23" minY="380" maxY="403" name="golf-s"/>
   <symbol minX="23" maxX="46" minY="380" maxY="403" name="college-s"/>
-  <symbol minX="46" maxX="69" minY="380" maxY="403" name="cinema-s"/>
+  <symbol minX="46" maxX="69" minY="380" maxY="403" name="library-s"/>
   <symbol minX="69" maxX="92" minY="380" maxY="403" name="alcohol-s"/>
   <symbol minX="92" maxX="115" minY="380" maxY="403" name="garden-s"/>
   <symbol minX="115" maxX="138" minY="380" maxY="403" name="grocery-s"/>
-  <symbol minX="138" maxX="161" minY="380" maxY="403" name="embassy-s"/>
-  <symbol minX="161" maxX="184" minY="380" maxY="403" name="library-s"/>
+  <symbol minX="138" maxX="161" minY="380" maxY="403" name="baseball-s"/>
+  <symbol minX="161" maxX="184" minY="380" maxY="403" name="volcano-s"/>
   <symbol minX="184" maxX="212" minY="380" maxY="403" name="subway-barcelona-s"/>
   <symbol minX="212" maxX="235" minY="380" maxY="403" name="pitch-s"/>
   <symbol minX="235" maxX="258" minY="380" maxY="403" name="cafe-s"/>
@@ -347,30 +347,30 @@
   <symbol minX="350" maxX="373" minY="380" maxY="403" name="funicular-s"/>
   <symbol minX="373" maxX="396" minY="380" maxY="403" name="peak-s"/>
   <symbol minX="396" maxX="419" minY="380" maxY="403" name="subway-entrance-s"/>
-  <symbol minX="419" maxX="442" minY="380" maxY="403" name="baseball-s"/>
-  <symbol minX="442" maxX="465" minY="380" maxY="403" name="volcano-s"/>
+  <symbol minX="419" maxX="442" minY="380" maxY="403" name="tram-s"/>
+  <symbol minX="442" maxX="465" minY="380" maxY="403" name="lighthouse-s"/>
   <symbol minX="465" maxX="488" minY="380" maxY="403" name="atm-s copy 2"/>
   <symbol minX="488" maxX="511" minY="380" maxY="403" name="bus-s"/>
   <symbol minX="511" maxX="534" minY="380" maxY="403" name="place-of-worship-s"/>
   <symbol minX="534" maxX="564" minY="380" maxY="403" name="subway-london-m"/>
   <symbol minX="564" maxX="587" minY="380" maxY="403" name="atm-s"/>
   <symbol minX="587" maxX="610" minY="380" maxY="403" name="police-s"/>
-  <symbol minX="610" maxX="633" minY="380" maxY="403" name="tram-s"/>
-  <symbol minX="633" maxX="656" minY="380" maxY="403" name="lighthouse-s"/>
-  <symbol minX="656" maxX="679" minY="380" maxY="403" name="basketball-s"/>
+  <symbol minX="610" maxX="633" minY="380" maxY="403" name="basketball-s"/>
+  <symbol minX="633" maxX="656" minY="380" maxY="403" name="train-s"/>
+  <symbol minX="656" maxX="679" minY="380" maxY="403" name="recycling-s"/>
   <symbol minX="679" maxX="702" minY="380" maxY="403" name="helipad-s"/>
   <symbol minX="702" maxX="725" minY="380" maxY="403" name="heliport-s"/>
-  <symbol minX="725" maxX="748" minY="380" maxY="403" name="train-s"/>
+  <symbol minX="725" maxX="748" minY="380" maxY="403" name="mail-s"/>
   <symbol minX="748" maxX="771" minY="380" maxY="403" name="remains-s"/>
   <symbol minX="771" maxX="794" minY="380" maxY="403" name="campsite-s"/>
-  <symbol minX="794" maxX="817" minY="380" maxY="403" name="recycling-s"/>
-  <symbol minX="817" maxX="840" minY="380" maxY="403" name="mail-s"/>
+  <symbol minX="794" maxX="817" minY="380" maxY="403" name="drinking-water-s"/>
+  <symbol minX="817" maxX="840" minY="380" maxY="403" name="townhall-s"/>
   <symbol minX="840" maxX="863" minY="380" maxY="403" name="cemetery-s"/>
   <symbol minX="863" maxX="886" minY="380" maxY="403" name="subway-newyork-s"/>
   <symbol minX="886" maxX="909" minY="380" maxY="403" name="zoo-s"/>
   <symbol minX="909" maxX="932" minY="380" maxY="403" name="park-s"/>
   <symbol minX="932" maxX="955" minY="380" maxY="403" name="cave-s"/>
-  <symbol minX="955" maxX="978" minY="380" maxY="403" name="drinking-water-s"/>
+  <symbol minX="955" maxX="978" minY="380" maxY="403" name="embassy-s"/>
   <symbol minX="978" maxX="1001" minY="380" maxY="403" name="ship-s"/>
   <symbol minX="1001" maxX="1024" minY="380" maxY="403" name="pub-s"/>
   <symbol minX="0" maxX="23" minY="403" maxY="426" name="fuel-s"/>
@@ -391,7 +391,7 @@
   <symbol minX="345" maxX="368" minY="403" maxY="426" name="bicycle-s"/>
   <symbol minX="368" maxX="391" minY="403" maxY="426" name="school-s"/>
   <symbol minX="391" maxX="414" minY="403" maxY="426" name="casino-s"/>
-  <symbol minX="414" maxX="437" minY="403" maxY="426" name="townhall-s"/>
+  <symbol minX="414" maxX="437" minY="403" maxY="426" name="bcontrol-s"/>
   <symbol minX="437" maxX="460" minY="403" maxY="426" name="tennis-s"/>
   <symbol minX="460" maxX="483" minY="403" maxY="426" name="fastfood-s"/>
   <symbol minX="483" maxX="506" minY="403" maxY="426" name="restaurant-s"/>
@@ -404,21 +404,21 @@
   <symbol minX="644" maxX="667" minY="403" maxY="426" name="waterfall-s"/>
   <symbol minX="667" maxX="690" minY="403" maxY="426" name="kindergarten-s"/>
   <symbol minX="690" maxX="713" minY="403" maxY="426" name="military-s"/>
-  <symbol minX="713" maxX="736" minY="403" maxY="426" name="bcontrol-s"/>
-  <symbol minX="736" maxX="759" minY="403" maxY="426" name="tourism-s"/>
-  <symbol minX="759" maxX="790" minY="403" maxY="425" name="subway-barcelona-l"/>
-  <symbol minX="790" maxX="821" minY="403" maxY="425" name="metro-barcelona-m"/>
-  <symbol minX="821" maxX="842" minY="403" maxY="425" name="s-arrow"/>
-  <symbol minX="842" maxX="873" minY="403" maxY="425" name="subway-barcelona-m"/>
-  <symbol minX="873" maxX="895" minY="403" maxY="425" name="parking-m"/>
-  <symbol minX="895" maxX="926" minY="403" maxY="425" name="subway-madrid-l"/>
-  <symbol minX="926" maxX="957" minY="403" maxY="425" name="subway-madrid-m"/>
-  <symbol minX="957" maxX="985" minY="403" maxY="424" name="metro-barcelona-s"/>
-  <symbol minX="985" maxX="1013" minY="403" maxY="424" name="subway-madrid-s"/>
-  <symbol minX="0" maxX="21" minY="426" maxY="447" name="subway-paris-s"/>
-  <symbol minX="21" maxX="42" minY="426" maxY="447" name="lightrail-berlin-s"/>
-  <symbol minX="42" maxX="72" minY="426" maxY="447" name="subway-kiev-m"/>
-  <symbol minX="72" maxX="102" minY="426" maxY="447" name="subway-kiev-l"/>
+  <symbol minX="713" maxX="736" minY="403" maxY="426" name="tourism-s"/>
+  <symbol minX="736" maxX="767" minY="403" maxY="425" name="subway-madrid-m"/>
+  <symbol minX="767" maxX="788" minY="403" maxY="425" name="s-arrow"/>
+  <symbol minX="788" maxX="819" minY="403" maxY="425" name="metro-barcelona-m"/>
+  <symbol minX="819" maxX="841" minY="403" maxY="425" name="parking-m"/>
+  <symbol minX="841" maxX="863" minY="403" maxY="425" name="route_from"/>
+  <symbol minX="863" maxX="894" minY="403" maxY="425" name="subway-barcelona-l"/>
+  <symbol minX="894" maxX="925" minY="403" maxY="425" name="subway-barcelona-m"/>
+  <symbol minX="925" maxX="956" minY="403" maxY="425" name="subway-madrid-l"/>
+  <symbol minX="956" maxX="984" minY="403" maxY="424" name="metro-barcelona-s"/>
+  <symbol minX="984" maxX="1012" minY="403" maxY="424" name="subway-madrid-s"/>
+  <symbol minX="0" maxX="30" minY="426" maxY="447" name="subway-kiev-m"/>
+  <symbol minX="30" maxX="60" minY="426" maxY="447" name="subway-kiev-l"/>
+  <symbol minX="60" maxX="81" minY="426" maxY="447" name="lightrail-berlin-s"/>
+  <symbol minX="81" maxX="102" minY="426" maxY="447" name="subway-paris-s"/>
   <symbol minX="102" maxX="122" minY="426" maxY="446" name="subway-moscow-s"/>
   <symbol minX="122" maxX="142" minY="426" maxY="446" name="api-result"/>
   <symbol minX="142" maxX="161" minY="426" maxY="445" name="search-result"/>
diff --git a/data/resources-ldpi/symbols.png b/data/resources-ldpi/symbols.png
index d23e55b059..236905636b 100644
--- a/data/resources-ldpi/symbols.png
+++ b/data/resources-ldpi/symbols.png
diff --git a/data/resources-ldpi_clear/symbols.png b/data/resources-ldpi_clear/symbols.png
index ce6e509f91..d81bbbec66 100644
--- a/data/resources-ldpi_clear/symbols.png
+++ b/data/resources-ldpi_clear/symbols.png
diff --git a/data/resources-ldpi_clear/symbols.sdf b/data/resources-ldpi_clear/symbols.sdf
index b99dc184ca..2706f2186f 100644
--- a/data/resources-ldpi_clear/symbols.sdf
+++ b/data/resources-ldpi_clear/symbols.sdf
@@ -8,456 +8,456 @@
   <symbol minX="214" maxX="236" minY="0" maxY="27" name="current-routing-compas"/>
   <symbol minX="236" maxX="260" minY="0" maxY="24" name="search-result-active"/>
   <symbol minX="260" maxX="282" minY="0" maxY="22" name="alpine_hut-l"/>
-  <symbol minX="282" maxX="304" minY="0" maxY="22" name="shop-bicycle-l"/>
+  <symbol minX="282" maxX="304" minY="0" maxY="22" name="shoes-l"/>
   <symbol minX="304" maxX="326" minY="0" maxY="22" name="america-football-l"/>
-  <symbol minX="326" maxX="348" minY="0" maxY="22" name="shoes-l"/>
+  <symbol minX="326" maxX="348" minY="0" maxY="22" name="shop-bicycle-l"/>
   <symbol minX="348" maxX="370" minY="0" maxY="22" name="ship-l"/>
   <symbol minX="370" maxX="392" minY="0" maxY="22" name="archery-l"/>
-  <symbol minX="392" maxX="414" minY="0" maxY="22" name="skiing-l"/>
+  <symbol minX="392" maxX="414" minY="0" maxY="22" name="school-l"/>
   <symbol minX="414" maxX="436" minY="0" maxY="22" name="alcohol-l"/>
   <symbol minX="436" maxX="448" minY="0" maxY="22" name="placemark-yellow"/>
   <symbol minX="448" maxX="470" minY="0" maxY="22" name="atm-l"/>
-  <symbol minX="470" maxX="492" minY="0" maxY="22" name="school-l"/>
+  <symbol minX="470" maxX="492" minY="0" maxY="22" name="shop-l"/>
   <symbol minX="492" maxX="504" minY="0" maxY="22" name="placemark-red"/>
   <symbol minX="0" maxX="22" minY="52" maxY="74" name="australian-football-l"/>
-  <symbol minX="22" maxX="44" minY="52" maxY="74" name="soccer-l"/>
+  <symbol minX="22" maxX="44" minY="52" maxY="74" name="restaurant-l"/>
   <symbol minX="44" maxX="66" minY="52" maxY="74" name="bakery-l"/>
-  <symbol minX="66" maxX="88" minY="52" maxY="74" name="restaurant-l"/>
+  <symbol minX="66" maxX="88" minY="52" maxY="74" name="skiing-l"/>
   <symbol minX="88" maxX="110" minY="52" maxY="74" name="bank-l"/>
   <symbol minX="110" maxX="131" minY="52" maxY="74" name="bank-m"/>
   <symbol minX="131" maxX="153" minY="52" maxY="74" name="banknote-l"/>
-  <symbol minX="153" maxX="174" minY="52" maxY="74" name="remains-m"/>
-  <symbol minX="174" maxX="196" minY="52" maxY="74" name="bar-l"/>
-  <symbol minX="196" maxX="218" minY="52" maxY="74" name="remains-l"/>
-  <symbol minX="218" maxX="230" minY="52" maxY="74" name="placemark-purple"/>
-  <symbol minX="230" maxX="252" minY="52" maxY="74" name="baseball-l"/>
-  <symbol minX="252" maxX="274" minY="52" maxY="74" name="recycling-l"/>
-  <symbol minX="274" maxX="286" minY="52" maxY="74" name="placemark-pink"/>
-  <symbol minX="286" maxX="308" minY="52" maxY="74" name="basketball-l"/>
-  <symbol minX="308" maxX="330" minY="52" maxY="74" name="sports-l"/>
-  <symbol minX="330" maxX="342" minY="52" maxY="74" name="placemark-orange"/>
-  <symbol minX="342" maxX="364" minY="52" maxY="74" name="bbq-l"/>
-  <symbol minX="364" maxX="386" minY="52" maxY="74" name="pub-l"/>
-  <symbol minX="386" maxX="408" minY="52" maxY="74" name="bcontrol-l"/>
-  <symbol minX="408" maxX="429" minY="52" maxY="74" name="bcontrol-m"/>
-  <symbol minX="429" maxX="451" minY="52" maxY="74" name="power-m"/>
-  <symbol minX="451" maxX="473" minY="52" maxY="74" name="beach-l"/>
-  <symbol minX="473" maxX="495" minY="52" maxY="74" name="power-l"/>
-  <symbol minX="0" maxX="22" minY="74" maxY="96" name="beauty-l"/>
-  <symbol minX="22" maxX="44" minY="74" maxY="96" name="postbox-l"/>
-  <symbol minX="44" maxX="66" minY="74" maxY="96" name="beer-l"/>
-  <symbol minX="66" maxX="87" minY="74" maxY="96" name="beer-m"/>
-  <symbol minX="87" maxX="109" minY="74" maxY="96" name="police-l"/>
-  <symbol minX="109" maxX="121" minY="74" maxY="96" name="placemark-green"/>
-  <symbol minX="121" maxX="143" minY="74" maxY="96" name="bicycle-l"/>
-  <symbol minX="143" maxX="165" minY="74" maxY="96" name="place-of-worship-l"/>
-  <symbol minX="165" maxX="177" minY="74" maxY="96" name="placemark-brown"/>
-  <symbol minX="177" maxX="199" minY="74" maxY="96" name="book-shop-l"/>
-  <symbol minX="199" maxX="221" minY="74" maxY="96" name="pitch-l"/>
-  <symbol minX="221" maxX="233" minY="74" maxY="96" name="placemark-blue"/>
-  <symbol minX="233" maxX="255" minY="74" maxY="96" name="boundary_stone-l"/>
-  <symbol minX="255" maxX="276" minY="74" maxY="96" name="picnic-m"/>
-  <symbol minX="276" maxX="298" minY="74" maxY="96" name="bowls-l"/>
-  <symbol minX="298" maxX="320" minY="74" maxY="96" name="picnic-l"/>
-  <symbol minX="320" maxX="342" minY="74" maxY="96" name="bus-l"/>
-  <symbol minX="342" maxX="364" minY="74" maxY="96" name="subway-entrance-l"/>
-  <symbol minX="364" maxX="386" minY="74" maxY="96" name="phone-l"/>
-  <symbol minX="386" maxX="408" minY="74" maxY="96" name="butcher-l"/>
-  <symbol minX="408" maxX="430" minY="74" maxY="96" name="pharmacy-l"/>
-  <symbol minX="430" maxX="452" minY="74" maxY="96" name="cable-car-l"/>
-  <symbol minX="452" maxX="474" minY="74" maxY="96" name="subway-l"/>
-  <symbol minX="474" maxX="496" minY="74" maxY="96" name="airport-m"/>
-  <symbol minX="0" maxX="22" minY="96" maxY="118" name="cafe-l"/>
-  <symbol minX="22" maxX="44" minY="96" maxY="118" name="subway-newyork-l"/>
-  <symbol minX="44" maxX="66" minY="96" maxY="118" name="airport-l"/>
-  <symbol minX="66" maxX="88" minY="96" maxY="118" name="campsite-l"/>
-  <symbol minX="88" maxX="110" minY="96" maxY="118" name="parking-meter-l"/>
-  <symbol minX="110" maxX="132" minY="96" maxY="118" name="subway-paris-l"/>
-  <symbol minX="132" maxX="154" minY="96" maxY="118" name="car-repair-l"/>
-  <symbol minX="154" maxX="175" minY="96" maxY="118" name="car-repair-m"/>
-  <symbol minX="175" maxX="197" minY="96" maxY="118" name="zoo-l"/>
-  <symbol minX="197" maxX="219" minY="96" maxY="118" name="car_sharing-l"/>
-  <symbol minX="219" maxX="241" minY="96" maxY="118" name="park-l"/>
-  <symbol minX="241" maxX="263" minY="96" maxY="118" name="caravan_site-l"/>
-  <symbol minX="263" maxX="285" minY="96" maxY="118" name="optician-l"/>
-  <symbol minX="285" maxX="307" minY="96" maxY="118" name="casino-l"/>
-  <symbol minX="307" maxX="328" minY="96" maxY="118" name="office-m"/>
-  <symbol minX="328" maxX="350" minY="96" maxY="118" name="office-l"/>
-  <symbol minX="350" maxX="372" minY="96" maxY="118" name="cave-l"/>
-  <symbol minX="372" maxX="394" minY="96" maxY="118" name="nparkf-l"/>
-  <symbol minX="394" maxX="416" minY="96" maxY="118" name="windmill-l"/>
-  <symbol minX="416" maxX="438" minY="96" maxY="118" name="cemetery-l"/>
-  <symbol minX="438" maxX="460" minY="96" maxY="118" name="npark-l"/>
-  <symbol minX="460" maxX="482" minY="96" maxY="118" name="subway-spb-l"/>
-  <symbol minX="482" maxX="504" minY="96" maxY="118" name="chemist-l"/>
-  <symbol minX="0" maxX="22" minY="118" maxY="140" name="museum-l"/>
-  <symbol minX="22" maxX="44" minY="118" maxY="140" name="cinema-l"/>
-  <symbol minX="44" maxX="66" minY="118" maxY="140" name="motel-l"/>
-  <symbol minX="66" maxX="88" minY="118" maxY="140" name="wayside_shrine-l"/>
-  <symbol minX="88" maxX="110" minY="118" maxY="140" name="clothes-l"/>
-  <symbol minX="110" maxX="132" minY="118" maxY="140" name="sweets-l"/>
-  <symbol minX="132" maxX="154" minY="118" maxY="140" name="college-l"/>
-  <symbol minX="154" maxX="176" minY="118" maxY="140" name="monument-l"/>
-  <symbol minX="176" maxX="198" minY="118" maxY="140" name="mobile_phone-l"/>
-  <symbol minX="198" maxX="220" minY="118" maxY="140" name="computer-l"/>
-  <symbol minX="220" maxX="242" minY="118" maxY="140" name="military-l"/>
-  <symbol minX="242" maxX="264" minY="118" maxY="140" name="convenience-l"/>
-  <symbol minX="264" maxX="286" minY="118" maxY="140" name="swimming-l"/>
-  <symbol minX="286" maxX="308" minY="118" maxY="140" name="cricket-l"/>
-  <symbol minX="308" maxX="330" minY="118" maxY="140" name="marketplace-l"/>
-  <symbol minX="330" maxX="352" minY="118" maxY="140" name="wayside_cross-l"/>
-  <symbol minX="352" maxX="374" minY="118" maxY="140" name="taxi-l"/>
-  <symbol minX="374" maxX="395" minY="118" maxY="140" name="waterfall-m"/>
-  <symbol minX="395" maxX="417" minY="118" maxY="140" name="curling-l"/>
-  <symbol minX="417" maxX="439" minY="118" maxY="140" name="mail-l"/>
-  <symbol minX="439" maxX="461" minY="118" maxY="140" name="department_store-l"/>
-  <symbol minX="461" maxX="483" minY="118" maxY="140" name="lightrail-berlin-l"/>
-  <symbol minX="483" maxX="505" minY="118" maxY="140" name="diving-l"/>
-  <symbol minX="0" maxX="22" minY="140" maxY="162" name="tennis-l"/>
-  <symbol minX="22" maxX="44" minY="140" maxY="162" name="dog_park-l"/>
-  <symbol minX="44" maxX="66" minY="140" maxY="162" name="lighthouse-l"/>
-  <symbol minX="66" maxX="88" minY="140" maxY="162" name="doityourself-l"/>
-  <symbol minX="88" maxX="110" minY="140" maxY="162" name="lift_gate-l"/>
-  <symbol minX="110" maxX="132" minY="140" maxY="162" name="waterfall-l"/>
-  <symbol minX="132" maxX="154" minY="140" maxY="162" name="library-l"/>
-  <symbol minX="154" maxX="176" minY="140" maxY="162" name="volcano-l"/>
-  <symbol minX="176" maxX="198" minY="140" maxY="162" name="drinking-water-l"/>
-  <symbol minX="198" maxX="219" minY="140" maxY="162" name="laundry-m"/>
-  <symbol minX="219" maxX="241" minY="140" maxY="162" name="laundry-l"/>
-  <symbol minX="241" maxX="263" minY="140" maxY="162" name="kiosk-l"/>
-  <symbol minX="263" maxX="285" minY="140" maxY="162" name="electronics-l"/>
-  <symbol minX="285" maxX="307" minY="140" maxY="162" name="theatre-l"/>
-  <symbol minX="307" maxX="329" minY="140" maxY="162" name="embassy-l"/>
-  <symbol minX="329" maxX="351" minY="140" maxY="162" name="kindergarten-m"/>
-  <symbol minX="351" maxX="373" minY="140" maxY="162" name="vending-l"/>
-  <symbol minX="373" maxX="395" minY="140" maxY="162" name="kindergarten-l"/>
-  <symbol minX="395" maxX="417" minY="140" maxY="162" name="tram-l"/>
-  <symbol minX="417" maxX="439" minY="140" maxY="162" name="equestrian-l"/>
-  <symbol minX="439" maxX="461" minY="140" maxY="162" name="equestrian-m"/>
-  <symbol minX="461" maxX="483" minY="140" maxY="162" name="jewelry-l"/>
-  <symbol minX="483" maxX="505" minY="140" maxY="162" name="fastfood-l"/>
-  <symbol minX="0" maxX="22" minY="162" maxY="184" name="information-l"/>
-  <symbol minX="22" maxX="44" minY="162" maxY="184" name="train-l"/>
-  <symbol minX="44" maxX="66" minY="162" maxY="184" name="fire_station-l"/>
-  <symbol minX="66" maxX="87" minY="162" maxY="184" name="hunting-tower-m"/>
-  <symbol minX="87" maxX="109" minY="162" maxY="184" name="hunting-tower-l"/>
-  <symbol minX="109" maxX="131" minY="162" maxY="184" name="florist-l"/>
-  <symbol minX="131" maxX="153" minY="162" maxY="184" name="toilets-l"/>
-  <symbol minX="153" maxX="175" minY="162" maxY="184" name="fountain-l"/>
-  <symbol minX="175" maxX="197" minY="162" maxY="184" name="hotel-l"/>
-  <symbol minX="197" maxX="219" minY="162" maxY="184" name="toys-l"/>
-  <symbol minX="219" maxX="241" minY="162" maxY="184" name="fuel-l"/>
-  <symbol minX="241" maxX="263" minY="162" maxY="184" name="hospital-l"/>
-  <symbol minX="263" maxX="285" minY="162" maxY="184" name="historic-ship-l"/>
-  <symbol minX="285" maxX="307" minY="162" maxY="184" name="funicular-l"/>
-  <symbol minX="307" maxX="328" minY="162" maxY="184" name="heliport-m"/>
-  <symbol minX="328" maxX="350" minY="162" maxY="184" name="townhall-l"/>
-  <symbol minX="350" maxX="372" minY="162" maxY="184" name="furniture-l"/>
-  <symbol minX="372" maxX="394" minY="162" maxY="184" name="heliport-l"/>
-  <symbol minX="394" maxX="416" minY="162" maxY="184" name="gallery-l"/>
-  <symbol minX="416" maxX="438" minY="162" maxY="184" name="toll_booth-l"/>
-  <symbol minX="438" maxX="460" minY="162" maxY="184" name="helipad-l"/>
-  <symbol minX="460" maxX="482" minY="162" maxY="184" name="garden-l"/>
-  <symbol minX="482" maxX="504" minY="162" maxY="184" name="hardware-l"/>
-  <symbol minX="0" maxX="22" minY="184" maxY="206" name="tourism-l"/>
-  <symbol minX="22" maxX="44" minY="184" maxY="206" name="garden_center-l"/>
-  <symbol minX="44" maxX="66" minY="184" maxY="206" name="shop-l"/>
-  <symbol minX="66" maxX="88" minY="184" maxY="206" name="gate-l"/>
-  <symbol minX="88" maxX="110" minY="184" maxY="206" name="hand-m"/>
-  <symbol minX="110" maxX="132" minY="184" maxY="206" name="gift-l"/>
-  <symbol minX="132" maxX="154" minY="184" maxY="206" name="hand-l"/>
-  <symbol minX="154" maxX="176" minY="184" maxY="206" name="golf-l"/>
-  <symbol minX="176" maxX="198" minY="184" maxY="206" name="hairdresser-l"/>
-  <symbol minX="198" maxX="220" minY="184" maxY="206" name="tomb-l"/>
-  <symbol minX="220" maxX="242" minY="184" maxY="206" name="greengrocer-l"/>
-  <symbol minX="242" maxX="264" minY="184" maxY="206" name="grocery-l"/>
-  <symbol minX="264" maxX="285" minY="184" maxY="205" name="greengrocer-m"/>
-  <symbol minX="285" maxX="306" minY="184" maxY="205" name="grocery-m"/>
-  <symbol minX="306" maxX="327" minY="184" maxY="205" name="tomb-m"/>
-  <symbol minX="327" maxX="348" minY="184" maxY="205" name="golf-m"/>
-  <symbol minX="348" maxX="369" minY="184" maxY="205" name="hairdresser-m"/>
-  <symbol minX="369" maxX="390" minY="184" maxY="205" name="gift-m"/>
-  <symbol minX="390" maxX="411" minY="184" maxY="205" name="gate-m"/>
-  <symbol minX="411" maxX="432" minY="184" maxY="205" name="toll_booth-m"/>
-  <symbol minX="432" maxX="453" minY="184" maxY="205" name="garden-m"/>
-  <symbol minX="453" maxX="474" minY="184" maxY="205" name="hardware-m"/>
-  <symbol minX="474" maxX="495" minY="184" maxY="205" name="tourism-m"/>
-  <symbol minX="0" maxX="21" minY="206" maxY="227" name="helipad-m"/>
-  <symbol minX="21" maxX="42" minY="206" maxY="227" name="gallery-m"/>
-  <symbol minX="42" maxX="63" minY="206" maxY="227" name="furniture-m"/>
-  <symbol minX="63" maxX="84" minY="206" maxY="227" name="funicular-m"/>
-  <symbol minX="84" maxX="105" minY="206" maxY="227" name="garden_center-m"/>
-  <symbol minX="105" maxX="126" minY="206" maxY="227" name="townhall-m"/>
-  <symbol minX="126" maxX="147" minY="206" maxY="227" name="historic-ship-m"/>
-  <symbol minX="147" maxX="168" minY="206" maxY="227" name="fuel-m"/>
-  <symbol minX="168" maxX="189" minY="206" maxY="227" name="hospital-m"/>
-  <symbol minX="189" maxX="210" minY="206" maxY="227" name="toilets-m"/>
-  <symbol minX="210" maxX="231" minY="206" maxY="227" name="fountain-m"/>
-  <symbol minX="231" maxX="252" minY="206" maxY="227" name="hotel-m"/>
-  <symbol minX="252" maxX="273" minY="206" maxY="227" name="florist-m"/>
-  <symbol minX="273" maxX="294" minY="206" maxY="227" name="toys-m"/>
-  <symbol minX="294" maxX="315" minY="206" maxY="227" name="fire_station-m"/>
-  <symbol minX="315" maxX="336" minY="206" maxY="227" name="shop-bicycle-m"/>
-  <symbol minX="336" maxX="357" minY="206" maxY="227" name="fastfood-m"/>
-  <symbol minX="357" maxX="378" minY="206" maxY="227" name="information-m"/>
-  <symbol minX="378" maxX="399" minY="206" maxY="227" name="theatre-m"/>
-  <symbol minX="399" maxX="420" minY="206" maxY="227" name="train-m"/>
-  <symbol minX="420" maxX="441" minY="206" maxY="227" name="jewelry-m"/>
-  <symbol minX="441" maxX="462" minY="206" maxY="227" name="tram-m"/>
-  <symbol minX="462" maxX="483" minY="206" maxY="227" name="embassy-m"/>
-  <symbol minX="483" maxX="504" minY="206" maxY="227" name="electronics-m"/>
-  <symbol minX="0" maxX="21" minY="227" maxY="248" name="drugs"/>
-  <symbol minX="21" maxX="42" minY="227" maxY="248" name="kiosk-m"/>
-  <symbol minX="42" maxX="63" minY="227" maxY="248" name="vending-m"/>
-  <symbol minX="63" maxX="84" minY="227" maxY="248" name="drinking-water-m"/>
-  <symbol minX="84" maxX="105" minY="227" maxY="248" name="volcano-m"/>
-  <symbol minX="105" maxX="126" minY="227" maxY="248" name="library-m"/>
-  <symbol minX="126" maxX="147" minY="227" maxY="248" name="tennis-m"/>
-  <symbol minX="147" maxX="168" minY="227" maxY="248" name="doityourself-m"/>
-  <symbol minX="168" maxX="189" minY="227" maxY="248" name="lift_gate-m"/>
-  <symbol minX="189" maxX="210" minY="227" maxY="248" name="dog_park-m"/>
-  <symbol minX="210" maxX="231" minY="227" maxY="248" name="lighthouse-m"/>
-  <symbol minX="231" maxX="252" minY="227" maxY="248" name="diving-m"/>
-  <symbol minX="252" maxX="273" minY="227" maxY="248" name="department_store-m"/>
-  <symbol minX="273" maxX="294" minY="227" maxY="248" name="alpine_hut-m"/>
-  <symbol minX="294" maxX="315" minY="227" maxY="248" name="taxi-m"/>
-  <symbol minX="315" maxX="336" minY="227" maxY="248" name="curling-m"/>
-  <symbol minX="336" maxX="357" minY="227" maxY="248" name="mail-m"/>
-  <symbol minX="357" maxX="378" minY="227" maxY="248" name="shoes-m"/>
-  <symbol minX="378" maxX="399" minY="227" maxY="248" name="cricket-m"/>
-  <symbol minX="399" maxX="420" minY="227" maxY="248" name="marketplace-m"/>
-  <symbol minX="420" maxX="441" minY="227" maxY="248" name="swimming-m"/>
-  <symbol minX="441" maxX="462" minY="227" maxY="248" name="convenience-m"/>
-  <symbol minX="462" maxX="483" minY="227" maxY="248" name="computer-m"/>
-  <symbol minX="483" maxX="504" minY="227" maxY="248" name="military-m"/>
-  <symbol minX="0" maxX="21" minY="248" maxY="269" name="sweets-m"/>
-  <symbol minX="21" maxX="42" minY="248" maxY="269" name="wayside_cross-m"/>
-  <symbol minX="42" maxX="63" minY="248" maxY="269" name="mobile_phone-m"/>
-  <symbol minX="63" maxX="84" minY="248" maxY="269" name="college-m"/>
-  <symbol minX="84" maxX="105" minY="248" maxY="269" name="monument-m"/>
-  <symbol minX="105" maxX="126" minY="248" maxY="269" name="clothes-m"/>
-  <symbol minX="126" maxX="147" minY="248" maxY="269" name="cinema-m"/>
-  <symbol minX="147" maxX="168" minY="248" maxY="269" name="motel-m"/>
-  <symbol minX="168" maxX="189" minY="248" maxY="269" name="chemist-m"/>
-  <symbol minX="189" maxX="210" minY="248" maxY="269" name="museum-m"/>
-  <symbol minX="210" maxX="231" minY="248" maxY="269" name="subway-spb-m"/>
-  <symbol minX="231" maxX="252" minY="248" maxY="269" name="america-football-m"/>
-  <symbol minX="252" maxX="273" minY="248" maxY="269" name="shop-m"/>
-  <symbol minX="273" maxX="294" minY="248" maxY="269" name="ship-m"/>
-  <symbol minX="294" maxX="315" minY="248" maxY="269" name="alcohol-m"/>
-  <symbol minX="315" maxX="336" minY="248" maxY="269" name="archery-m"/>
-  <symbol minX="336" maxX="357" minY="248" maxY="269" name="wayside_shrine-m"/>
-  <symbol minX="357" maxX="378" minY="248" maxY="269" name="cemetery-m"/>
-  <symbol minX="378" maxX="399" minY="248" maxY="269" name="npark-m"/>
-  <symbol minX="399" maxX="420" minY="248" maxY="269" name="school-m"/>
-  <symbol minX="420" maxX="441" minY="248" maxY="269" name="cave-m"/>
-  <symbol minX="441" maxX="462" minY="248" maxY="269" name="nparkf-m "/>
-  <symbol minX="462" maxX="483" minY="248" maxY="269" name="nparkf-m"/>
-  <symbol minX="483" maxX="504" minY="248" maxY="269" name="atm-m"/>
-  <symbol minX="0" maxX="21" minY="269" maxY="290" name="windmill-m"/>
-  <symbol minX="21" maxX="42" minY="269" maxY="290" name="casino-m"/>
-  <symbol minX="42" maxX="63" minY="269" maxY="290" name="skiing-m"/>
-  <symbol minX="63" maxX="84" minY="269" maxY="290" name="caravan_site-m"/>
-  <symbol minX="84" maxX="105" minY="269" maxY="290" name="optician-m"/>
-  <symbol minX="105" maxX="126" minY="269" maxY="290" name="car_sharing-m"/>
-  <symbol minX="126" maxX="147" minY="269" maxY="290" name="park-m"/>
-  <symbol minX="147" maxX="168" minY="269" maxY="290" name="australian-football-m"/>
-  <symbol minX="168" maxX="189" minY="269" maxY="290" name="restaurant-m"/>
-  <symbol minX="189" maxX="210" minY="269" maxY="290" name="zoo-m"/>
-  <symbol minX="210" maxX="231" minY="269" maxY="290" name="campsite-m"/>
-  <symbol minX="231" maxX="252" minY="269" maxY="290" name="parking-meter-m"/>
-  <symbol minX="252" maxX="273" minY="269" maxY="290" name="subway-newyork-m"/>
-  <symbol minX="273" maxX="294" minY="269" maxY="290" name="cafe-m"/>
-  <symbol minX="294" maxX="315" minY="269" maxY="290" name="bakery-m"/>
-  <symbol minX="315" maxX="336" minY="269" maxY="290" name="banknote-m"/>
-  <symbol minX="336" maxX="357" minY="269" maxY="290" name="subway-m"/>
-  <symbol minX="357" maxX="378" minY="269" maxY="290" name="bar-m"/>
-  <symbol minX="378" maxX="399" minY="269" maxY="290" name="cable-car-m"/>
-  <symbol minX="399" maxX="420" minY="269" maxY="290" name="pharmacy-2-m"/>
-  <symbol minX="420" maxX="441" minY="269" maxY="290" name="butcher-m"/>
-  <symbol minX="441" maxX="462" minY="269" maxY="290" name="pharmacy-m"/>
-  <symbol minX="462" maxX="483" minY="269" maxY="290" name="subway-entrance-m"/>
-  <symbol minX="483" maxX="504" minY="269" maxY="290" name="soccer-m"/>
-  <symbol minX="0" maxX="21" minY="290" maxY="311" name="phone-m"/>
-  <symbol minX="21" maxX="42" minY="290" maxY="311" name="bus-m"/>
-  <symbol minX="42" maxX="63" minY="290" maxY="311" name="bowls-m"/>
-  <symbol minX="63" maxX="84" minY="290" maxY="311" name="boundary_stone-m"/>
-  <symbol minX="84" maxX="105" minY="290" maxY="311" name="recycling-m"/>
-  <symbol minX="105" maxX="126" minY="290" maxY="311" name="book-shop-m"/>
-  <symbol minX="126" maxX="147" minY="290" maxY="311" name="pitch-m"/>
-  <symbol minX="147" maxX="168" minY="290" maxY="311" name="subway-entrance-2-m"/>
-  <symbol minX="168" maxX="189" minY="290" maxY="311" name="bicycle-m"/>
-  <symbol minX="189" maxX="210" minY="290" maxY="311" name="place-of-worship-m"/>
-  <symbol minX="210" maxX="231" minY="290" maxY="311" name="baseball-m"/>
-  <symbol minX="231" maxX="252" minY="290" maxY="311" name="basketball-m"/>
-  <symbol minX="252" maxX="273" minY="290" maxY="311" name="police-m"/>
-  <symbol minX="273" maxX="294" minY="290" maxY="311" name="pub-m"/>
-  <symbol minX="294" maxX="315" minY="290" maxY="311" name="beauty-m"/>
-  <symbol minX="315" maxX="336" minY="290" maxY="311" name="postbox-m"/>
-  <symbol minX="336" maxX="357" minY="290" maxY="311" name="beach-m"/>
-  <symbol minX="357" maxX="378" minY="290" maxY="311" name="bbq-m"/>
-  <symbol minX="378" maxX="399" minY="290" maxY="311" name="sports-m"/>
-  <symbol minX="399" maxX="419" minY="290" maxY="310" name="lightrail-berlin-m"/>
-  <symbol minX="419" maxX="439" minY="290" maxY="310" name="subway-berlin-l"/>
-  <symbol minX="439" maxX="459" minY="290" maxY="310" name="subway-rome-l"/>
-  <symbol minX="459" maxX="479" minY="290" maxY="310" name="speedcam-l"/>
+  <symbol minX="153" maxX="175" minY="52" maxY="74" name="remains-l"/>
+  <symbol minX="175" maxX="197" minY="52" maxY="74" name="bar-l"/>
+  <symbol minX="197" maxX="219" minY="52" maxY="74" name="recycling-l"/>
+  <symbol minX="219" maxX="231" minY="52" maxY="74" name="placemark-purple"/>
+  <symbol minX="231" maxX="253" minY="52" maxY="74" name="baseball-l"/>
+  <symbol minX="253" maxX="275" minY="52" maxY="74" name="soccer-l"/>
+  <symbol minX="275" maxX="287" minY="52" maxY="74" name="placemark-pink"/>
+  <symbol minX="287" maxX="309" minY="52" maxY="74" name="basketball-l"/>
+  <symbol minX="309" maxX="331" minY="52" maxY="74" name="pub-l"/>
+  <symbol minX="331" maxX="343" minY="52" maxY="74" name="placemark-orange"/>
+  <symbol minX="343" maxX="365" minY="52" maxY="74" name="bbq-l"/>
+  <symbol minX="365" maxX="387" minY="52" maxY="74" name="power-m"/>
+  <symbol minX="387" maxX="409" minY="52" maxY="74" name="bcontrol-l"/>
+  <symbol minX="409" maxX="431" minY="52" maxY="74" name="power-l"/>
+  <symbol minX="431" maxX="443" minY="52" maxY="74" name="placemark-green"/>
+  <symbol minX="443" maxX="465" minY="52" maxY="74" name="beach-l"/>
+  <symbol minX="465" maxX="487" minY="52" maxY="74" name="postbox-l"/>
+  <symbol minX="487" maxX="509" minY="52" maxY="74" name="beauty-l"/>
+  <symbol minX="0" maxX="22" minY="74" maxY="96" name="sports-l"/>
+  <symbol minX="22" maxX="44" minY="74" maxY="96" name="beer-l"/>
+  <symbol minX="44" maxX="66" minY="74" maxY="96" name="police-l"/>
+  <symbol minX="66" maxX="88" minY="74" maxY="96" name="place-of-worship-l"/>
+  <symbol minX="88" maxX="100" minY="74" maxY="96" name="placemark-brown"/>
+  <symbol minX="100" maxX="122" minY="74" maxY="96" name="bicycle-l"/>
+  <symbol minX="122" maxX="144" minY="74" maxY="96" name="pitch-l"/>
+  <symbol minX="144" maxX="156" minY="74" maxY="96" name="placemark-blue"/>
+  <symbol minX="156" maxX="178" minY="74" maxY="96" name="book-shop-l"/>
+  <symbol minX="178" maxX="200" minY="74" maxY="96" name="picnic-l"/>
+  <symbol minX="200" maxX="222" minY="74" maxY="96" name="phone-l"/>
+  <symbol minX="222" maxX="244" minY="74" maxY="96" name="boundary_stone-l"/>
+  <symbol minX="244" maxX="266" minY="74" maxY="96" name="subway-entrance-l"/>
+  <symbol minX="266" maxX="288" minY="74" maxY="96" name="bowls-l"/>
+  <symbol minX="288" maxX="310" minY="74" maxY="96" name="pharmacy-l"/>
+  <symbol minX="310" maxX="332" minY="74" maxY="96" name="bus-l"/>
+  <symbol minX="332" maxX="354" minY="74" maxY="96" name="subway-l"/>
+  <symbol minX="354" maxX="376" minY="74" maxY="96" name="airport-m"/>
+  <symbol minX="376" maxX="398" minY="74" maxY="96" name="butcher-l"/>
+  <symbol minX="398" maxX="420" minY="74" maxY="96" name="peak-l"/>
+  <symbol minX="420" maxX="442" minY="74" maxY="96" name="cable-car-l"/>
+  <symbol minX="442" maxX="464" minY="74" maxY="96" name="parking-meter-l"/>
+  <symbol minX="464" maxX="486" minY="74" maxY="96" name="airport-l"/>
+  <symbol minX="486" maxX="508" minY="74" maxY="96" name="cafe-l"/>
+  <symbol minX="0" maxX="22" minY="96" maxY="118" name="subway-newyork-l"/>
+  <symbol minX="22" maxX="44" minY="96" maxY="118" name="park-l"/>
+  <symbol minX="44" maxX="66" minY="96" maxY="118" name="campsite-l"/>
+  <symbol minX="66" maxX="88" minY="96" maxY="118" name="optician-l"/>
+  <symbol minX="88" maxX="110" minY="96" maxY="118" name="zoo-l"/>
+  <symbol minX="110" maxX="132" minY="96" maxY="118" name="car-repair-l"/>
+  <symbol minX="132" maxX="154" minY="96" maxY="118" name="office-l"/>
+  <symbol minX="154" maxX="176" minY="96" maxY="118" name="subway-paris-l"/>
+  <symbol minX="176" maxX="198" minY="96" maxY="118" name="car_sharing-l"/>
+  <symbol minX="198" maxX="220" minY="96" maxY="118" name="nparkf-l"/>
+  <symbol minX="220" maxX="242" minY="96" maxY="118" name="caravan_site-l"/>
+  <symbol minX="242" maxX="264" minY="96" maxY="118" name="npark-l"/>
+  <symbol minX="264" maxX="286" minY="96" maxY="118" name="casino-l"/>
+  <symbol minX="286" maxX="308" minY="96" maxY="118" name="museum-l"/>
+  <symbol minX="308" maxX="330" minY="96" maxY="118" name="windmill-l"/>
+  <symbol minX="330" maxX="352" minY="96" maxY="118" name="cave-l"/>
+  <symbol minX="352" maxX="374" minY="96" maxY="118" name="motel-l"/>
+  <symbol minX="374" maxX="396" minY="96" maxY="118" name="subway-spb-l"/>
+  <symbol minX="396" maxX="418" minY="96" maxY="118" name="cemetery-l"/>
+  <symbol minX="418" maxX="440" minY="96" maxY="118" name="monument-l"/>
+  <symbol minX="440" maxX="462" minY="96" maxY="118" name="wayside_shrine-l"/>
+  <symbol minX="462" maxX="484" minY="96" maxY="118" name="chemist-l"/>
+  <symbol minX="484" maxX="506" minY="96" maxY="118" name="mobile_phone-l"/>
+  <symbol minX="0" maxX="22" minY="118" maxY="140" name="cinema-l"/>
+  <symbol minX="22" maxX="44" minY="118" maxY="140" name="military-l"/>
+  <symbol minX="44" maxX="66" minY="118" maxY="140" name="sweets-l"/>
+  <symbol minX="66" maxX="88" minY="118" maxY="140" name="clothes-l"/>
+  <symbol minX="88" maxX="110" minY="118" maxY="140" name="marketplace-l"/>
+  <symbol minX="110" maxX="132" minY="118" maxY="140" name="college-l"/>
+  <symbol minX="132" maxX="154" minY="118" maxY="140" name="swimming-l"/>
+  <symbol minX="154" maxX="176" minY="118" maxY="140" name="wayside_cross-l"/>
+  <symbol minX="176" maxX="198" minY="118" maxY="140" name="computer-l"/>
+  <symbol minX="198" maxX="220" minY="118" maxY="140" name="mail-l"/>
+  <symbol minX="220" maxX="242" minY="118" maxY="140" name="convenience-l"/>
+  <symbol minX="242" maxX="264" minY="118" maxY="140" name="lightrail-berlin-l"/>
+  <symbol minX="264" maxX="286" minY="118" maxY="140" name="cricket-l"/>
+  <symbol minX="286" maxX="308" minY="118" maxY="140" name="taxi-l"/>
+  <symbol minX="308" maxX="330" minY="118" maxY="140" name="lighthouse-l"/>
+  <symbol minX="330" maxX="351" minY="118" maxY="140" name="waterfall-m"/>
+  <symbol minX="351" maxX="373" minY="118" maxY="140" name="waterfall-l"/>
+  <symbol minX="373" maxX="395" minY="118" maxY="140" name="curling-l"/>
+  <symbol minX="395" maxX="417" minY="118" maxY="140" name="lift_gate-l"/>
+  <symbol minX="417" maxX="439" minY="118" maxY="140" name="department_store-l"/>
+  <symbol minX="439" maxX="461" minY="118" maxY="140" name="library-l"/>
+  <symbol minX="461" maxX="483" minY="118" maxY="140" name="diving-l"/>
+  <symbol minX="483" maxX="505" minY="118" maxY="140" name="laundry-l"/>
+  <symbol minX="0" maxX="22" minY="140" maxY="162" name="dog_park-l"/>
+  <symbol minX="22" maxX="44" minY="140" maxY="162" name="kiosk-l"/>
+  <symbol minX="44" maxX="66" minY="140" maxY="162" name="doityourself-l"/>
+  <symbol minX="66" maxX="88" minY="140" maxY="162" name="tennis-l"/>
+  <symbol minX="88" maxX="110" minY="140" maxY="162" name="kindergarten-m"/>
+  <symbol minX="110" maxX="132" minY="140" maxY="162" name="volcano-l"/>
+  <symbol minX="132" maxX="154" minY="140" maxY="162" name="kindergarten-l"/>
+  <symbol minX="154" maxX="176" minY="140" maxY="162" name="drinking-water-l"/>
+  <symbol minX="176" maxX="198" minY="140" maxY="162" name="jewelry-l"/>
+  <symbol minX="198" maxX="220" minY="140" maxY="162" name="vending-l"/>
+  <symbol minX="220" maxX="242" minY="140" maxY="162" name="information-l"/>
+  <symbol minX="242" maxX="264" minY="140" maxY="162" name="electronics-l"/>
+  <symbol minX="264" maxX="286" minY="140" maxY="162" name="hunting-tower-l"/>
+  <symbol minX="286" maxX="308" minY="140" maxY="162" name="embassy-l"/>
+  <symbol minX="308" maxX="330" minY="140" maxY="162" name="theatre-l"/>
+  <symbol minX="330" maxX="352" minY="140" maxY="162" name="hotel-l"/>
+  <symbol minX="352" maxX="374" minY="140" maxY="162" name="tram-l"/>
+  <symbol minX="374" maxX="396" minY="140" maxY="162" name="hospital-l"/>
+  <symbol minX="396" maxX="418" minY="140" maxY="162" name="equestrian-l"/>
+  <symbol minX="418" maxX="440" minY="140" maxY="162" name="equestrian-m"/>
+  <symbol minX="440" maxX="462" minY="140" maxY="162" name="train-l"/>
+  <symbol minX="462" maxX="484" minY="140" maxY="162" name="fastfood-l"/>
+  <symbol minX="484" maxX="506" minY="140" maxY="162" name="historic-ship-l"/>
+  <symbol minX="0" maxX="22" minY="162" maxY="184" name="toilets-l"/>
+  <symbol minX="22" maxX="44" minY="162" maxY="184" name="fire_station-l"/>
+  <symbol minX="44" maxX="66" minY="162" maxY="184" name="heliport-l"/>
+  <symbol minX="66" maxX="88" minY="162" maxY="184" name="toys-l"/>
+  <symbol minX="88" maxX="110" minY="162" maxY="184" name="florist-l"/>
+  <symbol minX="110" maxX="132" minY="162" maxY="184" name="helipad-l"/>
+  <symbol minX="132" maxX="154" minY="162" maxY="184" name="fountain-l"/>
+  <symbol minX="154" maxX="176" minY="162" maxY="184" name="hardware-l"/>
+  <symbol minX="176" maxX="198" minY="162" maxY="184" name="toll_booth-l"/>
+  <symbol minX="198" maxX="220" minY="162" maxY="184" name="fuel-l"/>
+  <symbol minX="220" maxX="242" minY="162" maxY="184" name="hand-m"/>
+  <symbol minX="242" maxX="264" minY="162" maxY="184" name="townhall-l"/>
+  <symbol minX="264" maxX="286" minY="162" maxY="184" name="funicular-l"/>
+  <symbol minX="286" maxX="308" minY="162" maxY="184" name="hand-l"/>
+  <symbol minX="308" maxX="330" minY="162" maxY="184" name="hairdresser-l"/>
+  <symbol minX="330" maxX="352" minY="162" maxY="184" name="furniture-l"/>
+  <symbol minX="352" maxX="374" minY="162" maxY="184" name="grocery-l"/>
+  <symbol minX="374" maxX="396" minY="162" maxY="184" name="gallery-l"/>
+  <symbol minX="396" maxX="418" minY="162" maxY="184" name="greengrocer-l"/>
+  <symbol minX="418" maxX="440" minY="162" maxY="184" name="tourism-l"/>
+  <symbol minX="440" maxX="462" minY="162" maxY="184" name="garden-l"/>
+  <symbol minX="462" maxX="484" minY="162" maxY="184" name="tomb-l"/>
+  <symbol minX="484" maxX="506" minY="162" maxY="184" name="golf-l"/>
+  <symbol minX="0" maxX="22" minY="184" maxY="206" name="garden_center-l"/>
+  <symbol minX="22" maxX="44" minY="184" maxY="206" name="gift-l"/>
+  <symbol minX="44" maxX="66" minY="184" maxY="206" name="gate-l"/>
+  <symbol minX="66" maxX="87" minY="184" maxY="205" name="gate-m"/>
+  <symbol minX="87" maxX="108" minY="184" maxY="205" name="garden_center-m"/>
+  <symbol minX="108" maxX="129" minY="184" maxY="205" name="gift-m"/>
+  <symbol minX="129" maxX="150" minY="184" maxY="205" name="tomb-m"/>
+  <symbol minX="150" maxX="171" minY="184" maxY="205" name="golf-m"/>
+  <symbol minX="171" maxX="192" minY="184" maxY="205" name="garden-m"/>
+  <symbol minX="192" maxX="213" minY="184" maxY="205" name="gallery-m"/>
+  <symbol minX="213" maxX="234" minY="184" maxY="205" name="greengrocer-m"/>
+  <symbol minX="234" maxX="255" minY="184" maxY="205" name="furniture-m"/>
+  <symbol minX="255" maxX="276" minY="184" maxY="205" name="grocery-m"/>
+  <symbol minX="276" maxX="297" minY="184" maxY="205" name="toll_booth-m"/>
+  <symbol minX="297" maxX="318" minY="184" maxY="205" name="tourism-m"/>
+  <symbol minX="318" maxX="339" minY="184" maxY="205" name="hairdresser-m"/>
+  <symbol minX="339" maxX="360" minY="184" maxY="205" name="funicular-m"/>
+  <symbol minX="360" maxX="381" minY="184" maxY="205" name="fuel-m"/>
+  <symbol minX="381" maxX="402" minY="184" maxY="205" name="townhall-m"/>
+  <symbol minX="402" maxX="423" minY="184" maxY="205" name="fountain-m"/>
+  <symbol minX="423" maxX="444" minY="184" maxY="205" name="hardware-m"/>
+  <symbol minX="444" maxX="465" minY="184" maxY="205" name="florist-m"/>
+  <symbol minX="465" maxX="486" minY="184" maxY="205" name="helipad-m"/>
+  <symbol minX="486" maxX="507" minY="184" maxY="205" name="toilets-m"/>
+  <symbol minX="0" maxX="21" minY="206" maxY="227" name="fire_station-m"/>
+  <symbol minX="21" maxX="42" minY="206" maxY="227" name="heliport-m"/>
+  <symbol minX="42" maxX="63" minY="206" maxY="227" name="toys-m"/>
+  <symbol minX="63" maxX="84" minY="206" maxY="227" name="fastfood-m"/>
+  <symbol minX="84" maxX="105" minY="206" maxY="227" name="historic-ship-m"/>
+  <symbol minX="105" maxX="126" minY="206" maxY="227" name="train-m"/>
+  <symbol minX="126" maxX="147" minY="206" maxY="227" name="hospital-m"/>
+  <symbol minX="147" maxX="168" minY="206" maxY="227" name="theatre-m"/>
+  <symbol minX="168" maxX="189" minY="206" maxY="227" name="tram-m"/>
+  <symbol minX="189" maxX="210" minY="206" maxY="227" name="hotel-m"/>
+  <symbol minX="210" maxX="231" minY="206" maxY="227" name="embassy-m"/>
+  <symbol minX="231" maxX="252" minY="206" maxY="227" name="electronics-m"/>
+  <symbol minX="252" maxX="273" minY="206" maxY="227" name="hunting-tower-m"/>
+  <symbol minX="273" maxX="294" minY="206" maxY="227" name="alpine_hut-m"/>
+  <symbol minX="294" maxX="315" minY="206" maxY="227" name="drugs"/>
+  <symbol minX="315" maxX="336" minY="206" maxY="227" name="information-m"/>
+  <symbol minX="336" maxX="357" minY="206" maxY="227" name="tennis-m"/>
+  <symbol minX="357" maxX="378" minY="206" maxY="227" name="drinking-water-m"/>
+  <symbol minX="378" maxX="399" minY="206" maxY="227" name="jewelry-m"/>
+  <symbol minX="399" maxX="420" minY="206" maxY="227" name="vending-m"/>
+  <symbol minX="420" maxX="441" minY="206" maxY="227" name="volcano-m"/>
+  <symbol minX="441" maxX="462" minY="206" maxY="227" name="doityourself-m"/>
+  <symbol minX="462" maxX="483" minY="206" maxY="227" name="dog_park-m"/>
+  <symbol minX="483" maxX="504" minY="206" maxY="227" name="kiosk-m"/>
+  <symbol minX="0" maxX="21" minY="227" maxY="248" name="diving-m"/>
+  <symbol minX="21" maxX="42" minY="227" maxY="248" name="laundry-m"/>
+  <symbol minX="42" maxX="63" minY="227" maxY="248" name="department_store-m"/>
+  <symbol minX="63" maxX="84" minY="227" maxY="248" name="library-m"/>
+  <symbol minX="84" maxX="105" minY="227" maxY="248" name="taxi-m"/>
+  <symbol minX="105" maxX="126" minY="227" maxY="248" name="curling-m"/>
+  <symbol minX="126" maxX="147" minY="227" maxY="248" name="lift_gate-m"/>
+  <symbol minX="147" maxX="168" minY="227" maxY="248" name="america-football-m"/>
+  <symbol minX="168" maxX="189" minY="227" maxY="248" name="lighthouse-m"/>
+  <symbol minX="189" maxX="210" minY="227" maxY="248" name="cricket-m"/>
+  <symbol minX="210" maxX="231" minY="227" maxY="248" name="convenience-m"/>
+  <symbol minX="231" maxX="252" minY="227" maxY="248" name="ship-m"/>
+  <symbol minX="252" maxX="273" minY="227" maxY="248" name="swimming-m"/>
+  <symbol minX="273" maxX="294" minY="227" maxY="248" name="computer-m"/>
+  <symbol minX="294" maxX="315" minY="227" maxY="248" name="mail-m"/>
+  <symbol minX="315" maxX="336" minY="227" maxY="248" name="college-m"/>
+  <symbol minX="336" maxX="357" minY="227" maxY="248" name="clothes-m"/>
+  <symbol minX="357" maxX="378" minY="227" maxY="248" name="marketplace-m"/>
+  <symbol minX="378" maxX="399" minY="227" maxY="248" name="sweets-m"/>
+  <symbol minX="399" maxX="420" minY="227" maxY="248" name="wayside_cross-m"/>
+  <symbol minX="420" maxX="441" minY="227" maxY="248" name="cinema-m"/>
+  <symbol minX="441" maxX="462" minY="227" maxY="248" name="military-m"/>
+  <symbol minX="462" maxX="483" minY="227" maxY="248" name="subway-spb-m"/>
+  <symbol minX="483" maxX="504" minY="227" maxY="248" name="chemist-m"/>
+  <symbol minX="0" maxX="21" minY="248" maxY="269" name="mobile_phone-m"/>
+  <symbol minX="21" maxX="42" minY="248" maxY="269" name="cemetery-m"/>
+  <symbol minX="42" maxX="63" minY="248" maxY="269" name="monument-m"/>
+  <symbol minX="63" maxX="84" minY="248" maxY="269" name="wayside_shrine-m"/>
+  <symbol minX="84" maxX="105" minY="248" maxY="269" name="cave-m"/>
+  <symbol minX="105" maxX="126" minY="248" maxY="269" name="motel-m"/>
+  <symbol minX="126" maxX="147" minY="248" maxY="269" name="casino-m"/>
+  <symbol minX="147" maxX="168" minY="248" maxY="269" name="museum-m"/>
+  <symbol minX="168" maxX="189" minY="248" maxY="269" name="alcohol-m"/>
+  <symbol minX="189" maxX="210" minY="248" maxY="269" name="shoes-m"/>
+  <symbol minX="210" maxX="231" minY="248" maxY="269" name="shop-bicycle-m"/>
+  <symbol minX="231" maxX="252" minY="248" maxY="269" name="school-m"/>
+  <symbol minX="252" maxX="273" minY="248" maxY="269" name="archery-m"/>
+  <symbol minX="273" maxX="294" minY="248" maxY="269" name="atm-m"/>
+  <symbol minX="294" maxX="315" minY="248" maxY="269" name="shop-m"/>
+  <symbol minX="315" maxX="336" minY="248" maxY="269" name="caravan_site-m"/>
+  <symbol minX="336" maxX="357" minY="248" maxY="269" name="npark-m"/>
+  <symbol minX="357" maxX="378" minY="248" maxY="269" name="restaurant-m"/>
+  <symbol minX="378" maxX="399" minY="248" maxY="269" name="car_sharing-m"/>
+  <symbol minX="399" maxX="420" minY="248" maxY="269" name="nparkf-m "/>
+  <symbol minX="420" maxX="441" minY="248" maxY="269" name="nparkf-m"/>
+  <symbol minX="441" maxX="462" minY="248" maxY="269" name="windmill-m"/>
+  <symbol minX="462" maxX="483" minY="248" maxY="269" name="car-repair-m"/>
+  <symbol minX="483" maxX="504" minY="248" maxY="269" name="office-m"/>
+  <symbol minX="0" maxX="21" minY="269" maxY="290" name="subway-newyork-m"/>
+  <symbol minX="21" maxX="42" minY="269" maxY="290" name="campsite-m"/>
+  <symbol minX="42" maxX="63" minY="269" maxY="290" name="optician-m"/>
+  <symbol minX="63" maxX="84" minY="269" maxY="290" name="zoo-m"/>
+  <symbol minX="84" maxX="105" minY="269" maxY="290" name="park-m"/>
+  <symbol minX="105" maxX="126" minY="269" maxY="290" name="cafe-m"/>
+  <symbol minX="126" maxX="147" minY="269" maxY="290" name="australian-football-m"/>
+  <symbol minX="147" maxX="168" minY="269" maxY="290" name="bakery-m"/>
+  <symbol minX="168" maxX="189" minY="269" maxY="290" name="cable-car-m"/>
+  <symbol minX="189" maxX="210" minY="269" maxY="290" name="parking-meter-m"/>
+  <symbol minX="210" maxX="231" minY="269" maxY="290" name="remains-m"/>
+  <symbol minX="231" maxX="252" minY="269" maxY="290" name="butcher-m"/>
+  <symbol minX="252" maxX="273" minY="269" maxY="290" name="peak-m"/>
+  <symbol minX="273" maxX="294" minY="269" maxY="290" name="subway-m"/>
+  <symbol minX="294" maxX="315" minY="269" maxY="290" name="banknote-m"/>
+  <symbol minX="315" maxX="336" minY="269" maxY="290" name="bus-m"/>
+  <symbol minX="336" maxX="357" minY="269" maxY="290" name="subway-entrance-m"/>
+  <symbol minX="357" maxX="378" minY="269" maxY="290" name="pharmacy-2-m"/>
+  <symbol minX="378" maxX="399" minY="269" maxY="290" name="bowls-m"/>
+  <symbol minX="399" maxX="420" minY="269" maxY="290" name="pharmacy-m"/>
+  <symbol minX="420" maxX="441" minY="269" maxY="290" name="boundary_stone-m"/>
+  <symbol minX="441" maxX="462" minY="269" maxY="290" name="skiing-m"/>
+  <symbol minX="462" maxX="483" minY="269" maxY="290" name="phone-m"/>
+  <symbol minX="483" maxX="504" minY="269" maxY="290" name="subway-entrance-2-m"/>
+  <symbol minX="0" maxX="21" minY="290" maxY="311" name="book-shop-m"/>
+  <symbol minX="21" maxX="42" minY="290" maxY="311" name="picnic-m"/>
+  <symbol minX="42" maxX="63" minY="290" maxY="311" name="recycling-m"/>
+  <symbol minX="63" maxX="84" minY="290" maxY="311" name="bicycle-m"/>
+  <symbol minX="84" maxX="105" minY="290" maxY="311" name="pitch-m"/>
+  <symbol minX="105" maxX="126" minY="290" maxY="311" name="bar-m"/>
+  <symbol minX="126" maxX="147" minY="290" maxY="311" name="baseball-m"/>
+  <symbol minX="147" maxX="168" minY="290" maxY="311" name="place-of-worship-m"/>
+  <symbol minX="168" maxX="189" minY="290" maxY="311" name="sports-m"/>
+  <symbol minX="189" maxX="210" minY="290" maxY="311" name="beer-m"/>
+  <symbol minX="210" maxX="231" minY="290" maxY="311" name="police-m"/>
+  <symbol minX="231" maxX="252" minY="290" maxY="311" name="beauty-m"/>
+  <symbol minX="252" maxX="273" minY="290" maxY="311" name="beach-m"/>
+  <symbol minX="273" maxX="294" minY="290" maxY="311" name="postbox-m"/>
+  <symbol minX="294" maxX="315" minY="290" maxY="311" name="bcontrol-m"/>
+  <symbol minX="315" maxX="336" minY="290" maxY="311" name="bbq-m"/>
+  <symbol minX="336" maxX="357" minY="290" maxY="311" name="soccer-m"/>
+  <symbol minX="357" maxX="378" minY="290" maxY="311" name="basketball-m"/>
+  <symbol minX="378" maxX="399" minY="290" maxY="311" name="pub-m"/>
+  <symbol minX="399" maxX="419" minY="290" maxY="310" name="speedcam-l"/>
+  <symbol minX="419" maxX="439" minY="290" maxY="310" name="lightrail-berlin-m"/>
+  <symbol minX="439" maxX="459" minY="290" maxY="310" name="subway-berlin-l"/>
+  <symbol minX="459" maxX="479" minY="290" maxY="310" name="subway-rome-l"/>
   <symbol minX="479" maxX="499" minY="290" maxY="310" name="parking-l"/>
   <symbol minX="0" maxX="22" minY="311" maxY="330" name="subway-moscow-l"/>
-  <symbol minX="22" maxX="40" minY="311" maxY="329" name="airport-s"/>
-  <symbol minX="40" maxX="62" minY="311" maxY="329" name="subway-london-l"/>
-  <symbol minX="62" maxX="79" minY="311" maxY="329" name="picnic-s"/>
-  <symbol minX="79" maxX="96" minY="311" maxY="329" name="remains-s"/>
-  <symbol minX="96" maxX="117" minY="311" maxY="329" name="subway-moscow-m"/>
-  <symbol minX="117" maxX="135" minY="311" maxY="329" name="subway-berlin-m"/>
-  <symbol minX="135" maxX="153" minY="311" maxY="329" name="subway-paris-m"/>
-  <symbol minX="153" maxX="170" minY="311" maxY="329" name="office-s"/>
-  <symbol minX="170" maxX="187" minY="311" maxY="329" name="beer-s"/>
-  <symbol minX="187" maxX="205" minY="311" maxY="329" name="subway-rome-m"/>
-  <symbol minX="205" maxX="223" minY="311" maxY="329" name="no-icon"/>
-  <symbol minX="223" maxX="241" minY="311" maxY="329" name="no-icon-tourism"/>
-  <symbol minX="241" maxX="259" minY="311" maxY="329" name="no-icon-shop"/>
-  <symbol minX="259" maxX="277" minY="311" maxY="329" name="no-icon-leisure"/>
-  <symbol minX="277" maxX="295" minY="311" maxY="329" name="no-icon-amenity"/>
-  <symbol minX="295" maxX="312" minY="311" maxY="329" name="waterfall-s"/>
-  <symbol minX="312" maxX="329" minY="311" maxY="329" name="bcontrol-s"/>
-  <symbol minX="329" maxX="346" minY="311" maxY="329" name="hunting-tower-s"/>
-  <symbol minX="346" maxX="363" minY="311" maxY="329" name="heliport-s"/>
-  <symbol minX="363" maxX="380" minY="311" maxY="328" name="ship-s"/>
-  <symbol minX="380" maxX="397" minY="311" maxY="328" name="shop-s"/>
-  <symbol minX="397" maxX="414" minY="311" maxY="328" name="school-s"/>
-  <symbol minX="414" maxX="431" minY="311" maxY="328" name="tourism-s"/>
-  <symbol minX="431" maxX="448" minY="311" maxY="328" name="skiing-s"/>
-  <symbol minX="448" maxX="465" minY="311" maxY="328" name="restaurant-s"/>
-  <symbol minX="465" maxX="482" minY="311" maxY="328" name="recycling-s"/>
-  <symbol minX="482" maxX="499" minY="311" maxY="328" name="soccer-s"/>
-  <symbol minX="0" maxX="17" minY="330" maxY="347" name="alcohol-s"/>
-  <symbol minX="17" maxX="34" minY="330" maxY="347" name="speedcam-m"/>
-  <symbol minX="34" maxX="51" minY="330" maxY="347" name="america-football-s"/>
-  <symbol minX="51" maxX="68" minY="330" maxY="347" name="pub-s"/>
-  <symbol minX="68" maxX="85" minY="330" maxY="347" name="power-s"/>
-  <symbol minX="85" maxX="102" minY="330" maxY="347" name="atm-s"/>
-  <symbol minX="102" maxX="119" minY="330" maxY="347" name="bar-s"/>
-  <symbol minX="119" maxX="136" minY="330" maxY="347" name="baseball-s"/>
-  <symbol minX="136" maxX="153" minY="330" maxY="347" name="gallery-s"/>
-  <symbol minX="153" maxX="170" minY="330" maxY="347" name="garden-s"/>
-  <symbol minX="170" maxX="190" minY="330" maxY="347" name="subway-barcelona-s"/>
-  <symbol minX="190" maxX="207" minY="330" maxY="347" name="police-s"/>
-  <symbol minX="207" maxX="224" minY="330" maxY="347" name="place-of-worship-s"/>
-  <symbol minX="224" maxX="241" minY="330" maxY="347" name="basketball-s"/>
-  <symbol minX="241" maxX="258" minY="330" maxY="347" name="pitch-s"/>
-  <symbol minX="258" maxX="275" minY="330" maxY="347" name="subway-entrance-2-s"/>
-  <symbol minX="275" maxX="292" minY="330" maxY="347" name="subway-entrance-arrow"/>
-  <symbol minX="292" maxX="309" minY="330" maxY="347" name="phone-s"/>
-  <symbol minX="309" maxX="326" minY="330" maxY="347" name="pharmacy-s"/>
-  <symbol minX="326" maxX="343" minY="330" maxY="347" name="subway-entrance-s"/>
-  <symbol minX="343" maxX="360" minY="330" maxY="347" name="bicycle-s"/>
-  <symbol minX="360" maxX="377" minY="330" maxY="347" name="book-shop-s"/>
-  <symbol minX="377" maxX="394" minY="330" maxY="347" name="bus-s"/>
-  <symbol minX="394" maxX="411" minY="330" maxY="347" name="cable-car-s"/>
-  <symbol minX="411" maxX="428" minY="330" maxY="347" name="cafe-s"/>
-  <symbol minX="428" maxX="449" minY="330" maxY="347" name="subway-london-m"/>
-  <symbol minX="449" maxX="466" minY="330" maxY="347" name="zoo-s"/>
-  <symbol minX="466" maxX="483" minY="330" maxY="347" name="campsite-s"/>
-  <symbol minX="483" maxX="500" minY="330" maxY="347" name="golf-s"/>
-  <symbol minX="0" maxX="17" minY="347" maxY="364" name="grocery-s"/>
-  <symbol minX="17" maxX="34" minY="347" maxY="364" name="car-repair-s"/>
-  <symbol minX="34" maxX="51" minY="347" maxY="364" name="windmill-s"/>
-  <symbol minX="51" maxX="68" minY="347" maxY="364" name="casino-s"/>
-  <symbol minX="68" maxX="85" minY="347" maxY="364" name="cave-s"/>
-  <symbol minX="85" maxX="102" minY="347" maxY="364" name="cemetery-s"/>
-  <symbol minX="102" maxX="119" minY="347" maxY="364" name="cinema-s"/>
-  <symbol minX="119" maxX="136" minY="347" maxY="364" name="college-s"/>
-  <symbol minX="136" maxX="153" minY="347" maxY="364" name="volcano-s"/>
-  <symbol minX="153" maxX="170" minY="347" maxY="364" name="drinking-water-s"/>
-  <symbol minX="170" maxX="187" minY="347" maxY="364" name="subway-newyork-s"/>
-  <symbol minX="187" maxX="204" minY="347" maxY="364" name="embassy-s"/>
-  <symbol minX="204" maxX="221" minY="347" maxY="364" name="hand-s"/>
-  <symbol minX="221" maxX="238" minY="347" maxY="364" name="park-s"/>
-  <symbol minX="238" maxX="255" minY="347" maxY="364" name="tram-s"/>
-  <symbol minX="255" maxX="272" minY="347" maxY="364" name="nparkf-s"/>
-  <symbol minX="272" maxX="289" minY="347" maxY="364" name="npark-s"/>
-  <symbol minX="289" maxX="306" minY="347" maxY="364" name="train-s"/>
-  <symbol minX="306" maxX="323" minY="347" maxY="364" name="subway-s"/>
-  <symbol minX="323" maxX="340" minY="347" maxY="364" name="equestrian-s"/>
-  <symbol minX="340" maxX="357" minY="347" maxY="364" name="museum-s"/>
-  <symbol minX="357" maxX="374" minY="347" maxY="364" name="subway-spb-s"/>
-  <symbol minX="374" maxX="391" minY="347" maxY="364" name="fastfood-s"/>
-  <symbol minX="391" maxX="408" minY="347" maxY="364" name="fire_station-s"/>
-  <symbol minX="408" maxX="425" minY="347" maxY="364" name="fountain-s"/>
-  <symbol minX="425" maxX="442" minY="347" maxY="364" name="townhall-s"/>
-  <symbol minX="442" maxX="459" minY="347" maxY="364" name="monument-s"/>
-  <symbol minX="459" maxX="476" minY="347" maxY="364" name="military-s"/>
-  <symbol minX="476" maxX="493" minY="347" maxY="364" name="fuel-s"/>
-  <symbol minX="493" maxX="510" minY="347" maxY="364" name="helipad-s"/>
-  <symbol minX="0" maxX="17" minY="364" maxY="381" name="swimming-s"/>
-  <symbol minX="17" maxX="34" minY="364" maxY="381" name="mail-s"/>
-  <symbol minX="34" maxX="51" minY="364" maxY="381" name="funicular-s"/>
-  <symbol minX="51" maxX="68" minY="364" maxY="381" name="lighthouse-s"/>
-  <symbol minX="68" maxX="85" minY="364" maxY="381" name="library-s"/>
-  <symbol minX="85" maxX="102" minY="364" maxY="381" name="tennis-s"/>
-  <symbol minX="102" maxX="119" minY="364" maxY="381" name="kindergarten-s"/>
-  <symbol minX="119" maxX="136" minY="364" maxY="381" name="information-s"/>
-  <symbol minX="136" maxX="153" minY="364" maxY="381" name="theatre-s"/>
-  <symbol minX="153" maxX="170" minY="364" maxY="381" name="hotel-s"/>
-  <symbol minX="170" maxX="187" minY="364" maxY="381" name="hospital-s"/>
-  <symbol minX="187" maxX="204" minY="364" maxY="381" name="toilets-s"/>
-  <symbol minX="204" maxX="226" minY="364" maxY="380" name="metro-barcelona-m"/>
-  <symbol minX="226" maxX="242" minY="364" maxY="380" name="parking-m"/>
-  <symbol minX="242" maxX="264" minY="364" maxY="380" name="subway-madrid-m"/>
-  <symbol minX="264" maxX="286" minY="364" maxY="380" name="subway-madrid-l"/>
-  <symbol minX="286" maxX="308" minY="364" maxY="380" name="subway-barcelona-m"/>
-  <symbol minX="308" maxX="330" minY="364" maxY="380" name="subway-barcelona-l"/>
-  <symbol minX="330" maxX="345" minY="364" maxY="380" name="s-arrow"/>
-  <symbol minX="345" maxX="360" minY="364" maxY="379" name="lightrail-berlin-s"/>
-  <symbol minX="360" maxX="380" minY="364" maxY="379" name="metro-barcelona-s"/>
-  <symbol minX="380" maxX="395" minY="364" maxY="379" name="peak-l"/>
-  <symbol minX="395" maxX="415" minY="364" maxY="379" name="subway-madrid-s"/>
-  <symbol minX="415" maxX="436" minY="364" maxY="379" name="subway-kiev-m"/>
-  <symbol minX="436" maxX="451" minY="364" maxY="379" name="subway-moscow-s"/>
-  <symbol minX="451" maxX="472" minY="364" maxY="379" name="subway-kiev-l"/>
-  <symbol minX="472" maxX="487" minY="364" maxY="379" name="subway-paris-s"/>
-  <symbol minX="487" maxX="501" minY="364" maxY="378" name="route_from"/>
-  <symbol minX="0" maxX="14" minY="381" maxY="395" name="speedcam-s"/>
-  <symbol minX="14" maxX="28" minY="381" maxY="395" name="subway-rome-s"/>
-  <symbol minX="28" maxX="42" minY="381" maxY="395" name="parking-s"/>
-  <symbol minX="42" maxX="56" minY="381" maxY="395" name="subway-berlin-s"/>
-  <symbol minX="56" maxX="71" minY="381" maxY="395" name="bench"/>
-  <symbol minX="71" maxX="88" minY="381" maxY="395" name="subway-london-s"/>
-  <symbol minX="88" maxX="102" minY="381" maxY="394" name="peakt-l"/>
-  <symbol minX="102" maxX="115" minY="381" maxY="394" name="star-l"/>
-  <symbol minX="115" maxX="128" minY="381" maxY="394" name="survey_point-l"/>
-  <symbol minX="128" maxX="149" minY="381" maxY="394" name="subway-minsk-l"/>
-  <symbol minX="149" maxX="162" minY="381" maxY="394" name="current-position"/>
-  <symbol minX="162" maxX="180" minY="381" maxY="393" name="subway-kiev-s"/>
-  <symbol minX="180" maxX="192" minY="381" maxY="393" name="subway-newyork-xs"/>
-  <symbol minX="192" maxX="204" minY="381" maxY="393" name="star-m"/>
-  <symbol minX="204" maxX="216" minY="381" maxY="393" name="subway-xs"/>
-  <symbol minX="216" maxX="228" minY="381" maxY="393" name="peak-m"/>
-  <symbol minX="228" maxX="240" minY="381" maxY="393" name="survey_point-m"/>
-  <symbol minX="240" maxX="257" minY="381" maxY="393" name="railway-crossing"/>
-  <symbol minX="257" maxX="275" minY="381" maxY="393" name="subway-minsk-m"/>
-  <symbol minX="275" maxX="292" minY="381" maxY="392" name="subway-minsk-s"/>
-  <symbol minX="292" maxX="303" minY="381" maxY="392" name="star-s"/>
-  <symbol minX="303" maxX="314" minY="381" maxY="392" name="api-result"/>
-  <symbol minX="314" maxX="325" minY="381" maxY="392" name="crossing-l"/>
-  <symbol minX="325" maxX="335" minY="381" maxY="391" name="survey_point-s"/>
-  <symbol minX="335" maxX="346" minY="381" maxY="391" name="peak-s"/>
-  <symbol minX="346" maxX="357" minY="381" maxY="391" name="peakt-m"/>
-  <symbol minX="357" maxX="367" minY="381" maxY="391" name="search-result"/>
-  <symbol minX="367" maxX="387" minY="381" maxY="391" name="arrow-m"/>
-  <symbol minX="387" maxX="396" minY="381" maxY="390" name="peakt-s"/>
-  <symbol minX="396" maxX="405" minY="381" maxY="390" name="crossing-m"/>
-  <symbol minX="405" maxX="414" minY="381" maxY="390" name="entrance-s"/>
-  <symbol minX="414" maxX="422" minY="381" maxY="389" name="crossing-s"/>
-  <symbol minX="422" maxX="430" minY="381" maxY="389" name="dot-m"/>
-  <symbol minX="430" maxX="438" minY="381" maxY="389" name="tree-l"/>
-  <symbol minX="438" maxX="446" minY="381" maxY="389" name="none"/>
-  <symbol minX="446" maxX="461" minY="381" maxY="389" name="arrow-s"/>
-  <symbol minX="461" maxX="468" minY="381" maxY="388" name="tree-m"/>
-  <symbol minX="468" maxX="475" minY="381" maxY="388" name="entrance-xs"/>
-  <symbol minX="475" maxX="481" minY="381" maxY="387" name="zero-icon"/>
-  <symbol minX="481" maxX="487" minY="381" maxY="387" name="dot-s"/>
-  <symbol minX="487" maxX="493" minY="381" maxY="387" name="dot-s-light"/>
-  <symbol minX="493" maxX="499" minY="381" maxY="387" name="tree-s"/>
+  <symbol minX="22" maxX="44" minY="311" maxY="329" name="subway-london-l"/>
+  <symbol minX="44" maxX="65" minY="311" maxY="329" name="subway-moscow-m"/>
+  <symbol minX="65" maxX="83" minY="311" maxY="329" name="airport-s"/>
+  <symbol minX="83" maxX="101" minY="311" maxY="329" name="subway-paris-m"/>
+  <symbol minX="101" maxX="119" minY="311" maxY="329" name="subway-berlin-m"/>
+  <symbol minX="119" maxX="137" minY="311" maxY="329" name="no-icon"/>
+  <symbol minX="137" maxX="155" minY="311" maxY="329" name="no-icon-tourism"/>
+  <symbol minX="155" maxX="173" minY="311" maxY="329" name="no-icon-shop"/>
+  <symbol minX="173" maxX="191" minY="311" maxY="329" name="no-icon-leisure"/>
+  <symbol minX="191" maxX="209" minY="311" maxY="329" name="subway-rome-m"/>
+  <symbol minX="209" maxX="226" minY="311" maxY="329" name="beer-s"/>
+  <symbol minX="226" maxX="243" minY="311" maxY="329" name="waterfall-s"/>
+  <symbol minX="243" maxX="260" minY="311" maxY="329" name="hunting-tower-s"/>
+  <symbol minX="260" maxX="278" minY="311" maxY="329" name="no-icon-amenity"/>
+  <symbol minX="278" maxX="295" minY="311" maxY="328" name="ship-s"/>
+  <symbol minX="295" maxX="312" minY="311" maxY="328" name="school-s"/>
+  <symbol minX="312" maxX="329" minY="311" maxY="328" name="alcohol-s"/>
+  <symbol minX="329" maxX="346" minY="311" maxY="328" name="restaurant-s"/>
+  <symbol minX="346" maxX="363" minY="311" maxY="328" name="shop-s"/>
+  <symbol minX="363" maxX="380" minY="311" maxY="328" name="remains-s"/>
+  <symbol minX="380" maxX="397" minY="311" maxY="328" name="recycling-s"/>
+  <symbol minX="397" maxX="414" minY="311" maxY="328" name="skiing-s"/>
+  <symbol minX="414" maxX="431" minY="311" maxY="328" name="america-football-s"/>
+  <symbol minX="431" maxX="448" minY="311" maxY="328" name="pub-s"/>
+  <symbol minX="448" maxX="465" minY="311" maxY="328" name="soccer-s"/>
+  <symbol minX="465" maxX="482" minY="311" maxY="328" name="power-s"/>
+  <symbol minX="482" maxX="499" minY="311" maxY="328" name="speedcam-m"/>
+  <symbol minX="0" maxX="17" minY="330" maxY="347" name="atm-s"/>
+  <symbol minX="17" maxX="34" minY="330" maxY="347" name="police-s"/>
+  <symbol minX="34" maxX="51" minY="330" maxY="347" name="place-of-worship-s"/>
+  <symbol minX="51" maxX="68" minY="330" maxY="347" name="bar-s"/>
+  <symbol minX="68" maxX="85" minY="330" maxY="347" name="baseball-s"/>
+  <symbol minX="85" maxX="102" minY="330" maxY="347" name="basketball-s"/>
+  <symbol minX="102" maxX="119" minY="330" maxY="347" name="bcontrol-s"/>
+  <symbol minX="119" maxX="136" minY="330" maxY="347" name="bicycle-s"/>
+  <symbol minX="136" maxX="156" minY="330" maxY="347" name="subway-barcelona-s"/>
+  <symbol minX="156" maxX="173" minY="330" maxY="347" name="pitch-s"/>
+  <symbol minX="173" maxX="190" minY="330" maxY="347" name="picnic-s"/>
+  <symbol minX="190" maxX="207" minY="330" maxY="347" name="book-shop-s"/>
+  <symbol minX="207" maxX="224" minY="330" maxY="347" name="phone-s"/>
+  <symbol minX="224" maxX="241" minY="330" maxY="347" name="subway-entrance-2-s"/>
+  <symbol minX="241" maxX="258" minY="330" maxY="347" name="subway-entrance-arrow"/>
+  <symbol minX="258" maxX="275" minY="330" maxY="347" name="pharmacy-s"/>
+  <symbol minX="275" maxX="292" minY="330" maxY="347" name="bus-s"/>
+  <symbol minX="292" maxX="309" minY="330" maxY="347" name="subway-entrance-s"/>
+  <symbol minX="309" maxX="326" minY="330" maxY="347" name="cable-car-s"/>
+  <symbol minX="326" maxX="343" minY="330" maxY="347" name="zoo-s"/>
+  <symbol minX="343" maxX="360" minY="330" maxY="347" name="cafe-s"/>
+  <symbol minX="360" maxX="377" minY="330" maxY="347" name="campsite-s"/>
+  <symbol minX="377" maxX="394" minY="330" maxY="347" name="windmill-s"/>
+  <symbol minX="394" maxX="415" minY="330" maxY="347" name="subway-london-m"/>
+  <symbol minX="415" maxX="432" minY="330" maxY="347" name="car-repair-s"/>
+  <symbol minX="432" maxX="449" minY="330" maxY="347" name="peak-s"/>
+  <symbol minX="449" maxX="466" minY="330" maxY="347" name="casino-s"/>
+  <symbol minX="466" maxX="483" minY="330" maxY="347" name="cave-s"/>
+  <symbol minX="483" maxX="500" minY="330" maxY="347" name="cemetery-s"/>
+  <symbol minX="0" maxX="17" minY="347" maxY="364" name="cinema-s"/>
+  <symbol minX="17" maxX="34" minY="347" maxY="364" name="college-s"/>
+  <symbol minX="34" maxX="51" minY="347" maxY="364" name="volcano-s"/>
+  <symbol minX="51" maxX="68" minY="347" maxY="364" name="drinking-water-s"/>
+  <symbol minX="68" maxX="85" minY="347" maxY="364" name="tram-s"/>
+  <symbol minX="85" maxX="102" minY="347" maxY="364" name="embassy-s"/>
+  <symbol minX="102" maxX="119" minY="347" maxY="364" name="park-s"/>
+  <symbol minX="119" maxX="136" minY="347" maxY="364" name="office-s"/>
+  <symbol minX="136" maxX="153" minY="347" maxY="364" name="subway-newyork-s"/>
+  <symbol minX="153" maxX="170" minY="347" maxY="364" name="train-s"/>
+  <symbol minX="170" maxX="187" minY="347" maxY="364" name="nparkf-s"/>
+  <symbol minX="187" maxX="204" minY="347" maxY="364" name="npark-s"/>
+  <symbol minX="204" maxX="221" minY="347" maxY="364" name="equestrian-s"/>
+  <symbol minX="221" maxX="238" minY="347" maxY="364" name="fastfood-s"/>
+  <symbol minX="238" maxX="255" minY="347" maxY="364" name="museum-s"/>
+  <symbol minX="255" maxX="272" minY="347" maxY="364" name="fire_station-s"/>
+  <symbol minX="272" maxX="289" minY="347" maxY="364" name="subway-s"/>
+  <symbol minX="289" maxX="306" minY="347" maxY="364" name="monument-s"/>
+  <symbol minX="306" maxX="323" minY="347" maxY="364" name="military-s"/>
+  <symbol minX="323" maxX="340" minY="347" maxY="364" name="subway-spb-s"/>
+  <symbol minX="340" maxX="357" minY="347" maxY="364" name="townhall-s"/>
+  <symbol minX="357" maxX="374" minY="347" maxY="364" name="fountain-s"/>
+  <symbol minX="374" maxX="391" minY="347" maxY="364" name="fuel-s"/>
+  <symbol minX="391" maxX="408" minY="347" maxY="364" name="tourism-s"/>
+  <symbol minX="408" maxX="425" minY="347" maxY="364" name="funicular-s"/>
+  <symbol minX="425" maxX="442" minY="347" maxY="364" name="gallery-s"/>
+  <symbol minX="442" maxX="459" minY="347" maxY="364" name="mail-s"/>
+  <symbol minX="459" maxX="476" minY="347" maxY="364" name="garden-s"/>
+  <symbol minX="476" maxX="493" minY="347" maxY="364" name="swimming-s"/>
+  <symbol minX="493" maxX="510" minY="347" maxY="364" name="lighthouse-s"/>
+  <symbol minX="0" maxX="17" minY="364" maxY="381" name="library-s"/>
+  <symbol minX="17" maxX="34" minY="364" maxY="381" name="kindergarten-s"/>
+  <symbol minX="34" maxX="51" minY="364" maxY="381" name="information-s"/>
+  <symbol minX="51" maxX="68" minY="364" maxY="381" name="tennis-s"/>
+  <symbol minX="68" maxX="85" minY="364" maxY="381" name="hotel-s"/>
+  <symbol minX="85" maxX="102" minY="364" maxY="381" name="hospital-s"/>
+  <symbol minX="102" maxX="119" minY="364" maxY="381" name="theatre-s"/>
+  <symbol minX="119" maxX="136" minY="364" maxY="381" name="heliport-s"/>
+  <symbol minX="136" maxX="153" minY="364" maxY="381" name="helipad-s"/>
+  <symbol minX="153" maxX="170" minY="364" maxY="381" name="toilets-s"/>
+  <symbol minX="170" maxX="187" minY="364" maxY="381" name="hand-s"/>
+  <symbol minX="187" maxX="204" minY="364" maxY="381" name="grocery-s"/>
+  <symbol minX="204" maxX="221" minY="364" maxY="381" name="golf-s"/>
+  <symbol minX="221" maxX="243" minY="364" maxY="380" name="subway-barcelona-m"/>
+  <symbol minX="243" maxX="265" minY="364" maxY="380" name="metro-barcelona-m"/>
+  <symbol minX="265" maxX="287" minY="364" maxY="380" name="subway-madrid-m"/>
+  <symbol minX="287" maxX="302" minY="364" maxY="380" name="s-arrow"/>
+  <symbol minX="302" maxX="324" minY="364" maxY="380" name="subway-madrid-l"/>
+  <symbol minX="324" maxX="340" minY="364" maxY="380" name="parking-m"/>
+  <symbol minX="340" maxX="362" minY="364" maxY="380" name="subway-barcelona-l"/>
+  <symbol minX="362" maxX="377" minY="364" maxY="379" name="lightrail-berlin-s"/>
+  <symbol minX="377" maxX="397" minY="364" maxY="379" name="subway-madrid-s"/>
+  <symbol minX="397" maxX="412" minY="364" maxY="379" name="subway-paris-s"/>
+  <symbol minX="412" maxX="432" minY="364" maxY="379" name="metro-barcelona-s"/>
+  <symbol minX="432" maxX="453" minY="364" maxY="379" name="subway-kiev-m"/>
+  <symbol minX="453" maxX="474" minY="364" maxY="379" name="subway-kiev-l"/>
+  <symbol minX="474" maxX="489" minY="364" maxY="379" name="subway-moscow-s"/>
+  <symbol minX="489" maxX="504" minY="364" maxY="378" name="bench"/>
+  <symbol minX="0" maxX="14" minY="381" maxY="395" name="subway-berlin-s"/>
+  <symbol minX="14" maxX="31" minY="381" maxY="395" name="subway-london-s"/>
+  <symbol minX="31" maxX="45" minY="381" maxY="395" name="speedcam-s"/>
+  <symbol minX="45" maxX="59" minY="381" maxY="395" name="parking-s"/>
+  <symbol minX="59" maxX="73" minY="381" maxY="395" name="subway-rome-s"/>
+  <symbol minX="73" maxX="87" minY="381" maxY="395" name="star-l"/>
+  <symbol minX="87" maxX="108" minY="381" maxY="394" name="subway-minsk-l"/>
+  <symbol minX="108" maxX="121" minY="381" maxY="394" name="star-m"/>
+  <symbol minX="121" maxX="135" minY="381" maxY="394" name="peakt-l"/>
+  <symbol minX="135" maxX="148" minY="381" maxY="394" name="current-position"/>
+  <symbol minX="148" maxX="161" minY="381" maxY="394" name="survey_point-l"/>
+  <symbol minX="161" maxX="179" minY="381" maxY="393" name="subway-minsk-m"/>
+  <symbol minX="179" maxX="191" minY="381" maxY="393" name="survey_point-m"/>
+  <symbol minX="191" maxX="209" minY="381" maxY="393" name="subway-kiev-s"/>
+  <symbol minX="209" maxX="221" minY="381" maxY="393" name="route_from"/>
+  <symbol minX="221" maxX="233" minY="381" maxY="393" name="star-s"/>
+  <symbol minX="233" maxX="245" minY="381" maxY="393" name="subway-xs"/>
+  <symbol minX="245" maxX="262" minY="381" maxY="393" name="railway-crossing"/>
+  <symbol minX="262" maxX="274" minY="381" maxY="393" name="subway-newyork-xs"/>
+  <symbol minX="274" maxX="291" minY="381" maxY="392" name="subway-minsk-s"/>
+  <symbol minX="291" maxX="302" minY="381" maxY="392" name="crossing-l"/>
+  <symbol minX="302" maxX="313" minY="381" maxY="392" name="api-result"/>
+  <symbol minX="313" maxX="323" minY="381" maxY="391" name="search-result"/>
+  <symbol minX="323" maxX="333" minY="381" maxY="391" name="survey_point-s"/>
+  <symbol minX="333" maxX="353" minY="381" maxY="391" name="arrow-m"/>
+  <symbol minX="353" maxX="364" minY="381" maxY="391" name="peakt-m"/>
+  <symbol minX="364" maxX="373" minY="381" maxY="390" name="entrance-s"/>
+  <symbol minX="373" maxX="382" minY="381" maxY="390" name="crossing-m"/>
+  <symbol minX="382" maxX="391" minY="381" maxY="390" name="peakt-s"/>
+  <symbol minX="391" maxX="400" minY="381" maxY="390" name="dot-m"/>
+  <symbol minX="400" maxX="408" minY="381" maxY="389" name="tree-l"/>
+  <symbol minX="408" maxX="416" minY="381" maxY="389" name="none"/>
+  <symbol minX="416" maxX="424" minY="381" maxY="389" name="crossing-s"/>
+  <symbol minX="424" maxX="439" minY="381" maxY="389" name="arrow-s"/>
+  <symbol minX="439" maxX="446" minY="381" maxY="388" name="tree-m"/>
+  <symbol minX="446" maxX="453" minY="381" maxY="388" name="dot-s"/>
+  <symbol minX="453" maxX="460" minY="381" maxY="388" name="entrance-xs"/>
+  <symbol minX="460" maxX="467" minY="381" maxY="388" name="dot-s-light"/>
+  <symbol minX="467" maxX="473" minY="381" maxY="387" name="zero-icon"/>
+  <symbol minX="473" maxX="479" minY="381" maxY="387" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-ldpi_dark/symbols.png b/data/resources-ldpi_dark/symbols.png
index 3666642339..ad968fd4cd 100644
--- a/data/resources-ldpi_dark/symbols.png
+++ b/data/resources-ldpi_dark/symbols.png
diff --git a/data/resources-ldpi_dark/symbols.sdf b/data/resources-ldpi_dark/symbols.sdf
index 70b6585c5f..782d0d4045 100644
--- a/data/resources-ldpi_dark/symbols.sdf
+++ b/data/resources-ldpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="512" width="512">
+ <file width="512" height="512">
   <symbol minX="0" maxX="104" minY="0" maxY="52" name="route-arrow"/>
   <symbol minX="104" maxX="152" minY="0" maxY="48" name="route_to"/>
   <symbol minX="152" maxX="192" minY="0" maxY="40" name="compass-image"/>
@@ -301,23 +301,23 @@
   <symbol minX="378" maxX="399" minY="290" maxY="311" name="casino-m"/>
   <symbol minX="399" maxX="420" minY="290" maxY="311" name="remains-m"/>
   <symbol minX="420" maxX="441" minY="290" maxY="311" name="caravan_site-m"/>
-  <symbol minX="441" maxX="461" minY="290" maxY="310" name="lightrail-berlin-m"/>
-  <symbol minX="461" maxX="481" minY="290" maxY="310" name="speedcam-l"/>
+  <symbol minX="441" maxX="461" minY="290" maxY="310" name="parking-l"/>
+  <symbol minX="461" maxX="481" minY="290" maxY="310" name="lightrail-berlin-m"/>
   <symbol minX="481" maxX="501" minY="290" maxY="310" name="subway-berlin-l"/>
-  <symbol minX="0" maxX="20" minY="311" maxY="331" name="parking-l"/>
-  <symbol minX="20" maxX="40" minY="311" maxY="331" name="subway-rome-l"/>
+  <symbol minX="0" maxX="20" minY="311" maxY="331" name="subway-rome-l"/>
+  <symbol minX="20" maxX="40" minY="311" maxY="331" name="speedcam-l"/>
   <symbol minX="40" maxX="62" minY="311" maxY="330" name="subway-moscow-l"/>
-  <symbol minX="62" maxX="80" minY="311" maxY="329" name="no-icon"/>
-  <symbol minX="80" maxX="98" minY="311" maxY="329" name="subway-rome-m"/>
-  <symbol minX="98" maxX="116" minY="311" maxY="329" name="no-icon-tourism"/>
-  <symbol minX="116" maxX="134" minY="311" maxY="329" name="subway-paris-m"/>
-  <symbol minX="134" maxX="152" minY="311" maxY="329" name="no-icon-shop"/>
+  <symbol minX="62" maxX="80" minY="311" maxY="329" name="no-icon-tourism"/>
+  <symbol minX="80" maxX="98" minY="311" maxY="329" name="no-icon"/>
+  <symbol minX="98" maxX="116" minY="311" maxY="329" name="no-icon-shop"/>
+  <symbol minX="116" maxX="134" minY="311" maxY="329" name="no-icon-leisure"/>
+  <symbol minX="134" maxX="152" minY="311" maxY="329" name="subway-paris-m"/>
   <symbol minX="152" maxX="173" minY="311" maxY="329" name="subway-moscow-m"/>
   <symbol minX="173" maxX="191" minY="311" maxY="329" name="airport-s"/>
   <symbol minX="191" maxX="213" minY="311" maxY="329" name="subway-london-l"/>
   <symbol minX="213" maxX="231" minY="311" maxY="329" name="subway-berlin-m"/>
-  <symbol minX="231" maxX="249" minY="311" maxY="329" name="no-icon-leisure"/>
-  <symbol minX="249" maxX="267" minY="311" maxY="329" name="no-icon-amenity"/>
+  <symbol minX="231" maxX="249" minY="311" maxY="329" name="no-icon-amenity"/>
+  <symbol minX="249" maxX="267" minY="311" maxY="329" name="subway-rome-m"/>
   <symbol minX="267" maxX="284" minY="311" maxY="328" name="cinema-s"/>
   <symbol minX="284" maxX="301" minY="311" maxY="328" name="shop-s copy"/>
   <symbol minX="301" maxX="318" minY="311" maxY="328" name="shop-s"/>
@@ -329,80 +329,80 @@
   <symbol minX="403" maxX="420" minY="311" maxY="328" name="soccer-s"/>
   <symbol minX="420" maxX="437" minY="311" maxY="328" name="pitch-s"/>
   <symbol minX="437" maxX="454" minY="311" maxY="328" name="speedcam-m"/>
-  <symbol minX="454" maxX="471" minY="311" maxY="328" name="fire_station-s"/>
+  <symbol minX="454" maxX="471" minY="311" maxY="328" name="fastfood-s"/>
   <symbol minX="471" maxX="488" minY="311" maxY="328" name="college-s"/>
   <symbol minX="488" maxX="505" minY="311" maxY="328" name="golf-s"/>
-  <symbol minX="0" maxX="17" minY="331" maxY="348" name="fastfood-s"/>
-  <symbol minX="17" maxX="34" minY="331" maxY="348" name="bar-s"/>
-  <symbol minX="34" maxX="51" minY="331" maxY="348" name="waterfall-s"/>
+  <symbol minX="0" maxX="17" minY="331" maxY="348" name="bar-s"/>
+  <symbol minX="17" maxX="34" minY="331" maxY="348" name="waterfall-s"/>
+  <symbol minX="34" maxX="51" minY="331" maxY="348" name="alcohol-s"/>
   <symbol minX="51" maxX="68" minY="331" maxY="348" name="kindergarten-s"/>
-  <symbol minX="68" maxX="85" minY="331" maxY="348" name="information-s"/>
+  <symbol minX="68" maxX="85" minY="331" maxY="348" name="fire_station-s"/>
   <symbol minX="85" maxX="105" minY="331" maxY="348" name="subway-barcelona-s"/>
   <symbol minX="105" maxX="122" minY="331" maxY="348" name="cafe-s"/>
   <symbol minX="122" maxX="139" minY="331" maxY="348" name="place-of-worship-s"/>
   <symbol minX="139" maxX="156" minY="331" maxY="348" name="volcano-s"/>
-  <symbol minX="156" maxX="173" minY="331" maxY="348" name="alcohol-s"/>
+  <symbol minX="156" maxX="173" minY="331" maxY="348" name="garden-s"/>
   <symbol minX="173" maxX="190" minY="331" maxY="348" name="subway-entrance-2-s"/>
   <symbol minX="190" maxX="207" minY="331" maxY="348" name="subway-entrance-arrow"/>
-  <symbol minX="207" maxX="224" minY="331" maxY="348" name="hotel-s"/>
+  <symbol minX="207" maxX="224" minY="331" maxY="348" name="information-s"/>
   <symbol minX="224" maxX="241" minY="331" maxY="348" name="peak-s"/>
   <symbol minX="241" maxX="258" minY="331" maxY="348" name="subway-entrance-s"/>
   <symbol minX="258" maxX="275" minY="331" maxY="348" name="baseball-s"/>
   <symbol minX="275" maxX="292" minY="331" maxY="348" name="library-s"/>
-  <symbol minX="292" maxX="309" minY="331" maxY="348" name="garden-s"/>
+  <symbol minX="292" maxX="309" minY="331" maxY="348" name="grocery-s"/>
   <symbol minX="309" maxX="326" minY="331" maxY="348" name="bus-s"/>
   <symbol minX="326" maxX="343" minY="331" maxY="348" name="police-s"/>
   <symbol minX="343" maxX="364" minY="331" maxY="348" name="subway-london-m"/>
   <symbol minX="364" maxX="381" minY="331" maxY="348" name="embassy-s"/>
-  <symbol minX="381" maxX="398" minY="331" maxY="348" name="fountain-s"/>
-  <symbol minX="398" maxX="415" minY="331" maxY="348" name="windmill-s"/>
-  <symbol minX="415" maxX="432" minY="331" maxY="348" name="hospital-s"/>
+  <symbol minX="381" maxX="398" minY="331" maxY="348" name="hotel-s"/>
+  <symbol minX="398" maxX="415" minY="331" maxY="348" name="fountain-s"/>
+  <symbol minX="415" maxX="432" minY="331" maxY="348" name="windmill-s"/>
   <symbol minX="432" maxX="449" minY="331" maxY="348" name="tram-s"/>
   <symbol minX="449" maxX="466" minY="331" maxY="348" name="lighthouse-s"/>
-  <symbol minX="466" maxX="483" minY="331" maxY="348" name="grocery-s"/>
-  <symbol minX="483" maxX="500" minY="331" maxY="348" name="america-football-s"/>
+  <symbol minX="466" maxX="483" minY="331" maxY="348" name="america-football-s"/>
+  <symbol minX="483" maxX="500" minY="331" maxY="348" name="gallery-s"/>
   <symbol minX="0" maxX="17" minY="348" maxY="365" name="campsite-s"/>
   <symbol minX="17" maxX="34" minY="348" maxY="365" name="cemetery-s"/>
   <symbol minX="34" maxX="51" minY="348" maxY="365" name="basketball-s"/>
   <symbol minX="51" maxX="68" minY="348" maxY="365" name="train-s"/>
-  <symbol minX="68" maxX="85" minY="348" maxY="365" name="cave-s"/>
+  <symbol minX="68" maxX="85" minY="348" maxY="365" name="remains-s"/>
   <symbol minX="85" maxX="102" minY="348" maxY="365" name="subway-newyork-s"/>
-  <symbol minX="102" maxX="119" minY="348" maxY="365" name="gallery-s"/>
+  <symbol minX="102" maxX="119" minY="348" maxY="365" name="funicular-s"/>
   <symbol minX="119" maxX="136" minY="348" maxY="365" name="park-s"/>
-  <symbol minX="136" maxX="153" minY="348" maxY="365" name="ship-s"/>
-  <symbol minX="153" maxX="170" minY="348" maxY="365" name="remains-s"/>
-  <symbol minX="170" maxX="187" minY="348" maxY="365" name="pub-s"/>
-  <symbol minX="187" maxX="204" minY="348" maxY="365" name="car-repair-s"/>
+  <symbol minX="136" maxX="153" minY="348" maxY="365" name="cave-s"/>
+  <symbol minX="153" maxX="170" minY="348" maxY="365" name="recycling-s"/>
+  <symbol minX="170" maxX="187" minY="348" maxY="365" name="ship-s"/>
+  <symbol minX="187" maxX="204" minY="348" maxY="365" name="pub-s"/>
   <symbol minX="204" maxX="221" minY="348" maxY="365" name="mail-s"/>
   <symbol minX="221" maxX="238" minY="348" maxY="365" name="subway-s"/>
   <symbol minX="238" maxX="255" minY="348" maxY="365" name="office-s"/>
   <symbol minX="255" maxX="272" minY="348" maxY="365" name="nparkf-s"/>
   <symbol minX="272" maxX="289" minY="348" maxY="365" name="subway-spb-s"/>
-  <symbol minX="289" maxX="306" minY="348" maxY="365" name="funicular-s"/>
-  <symbol minX="306" maxX="323" minY="348" maxY="365" name="atm-s copy 2"/>
+  <symbol minX="289" maxX="306" minY="348" maxY="365" name="atm-s copy 2"/>
+  <symbol minX="306" maxX="323" minY="348" maxY="365" name="atm-s"/>
   <symbol minX="323" maxX="340" minY="348" maxY="365" name="drinking-water-s"/>
-  <symbol minX="340" maxX="357" minY="348" maxY="365" name="atm-s"/>
-  <symbol minX="357" maxX="374" minY="348" maxY="365" name="townhall-s"/>
+  <symbol minX="340" maxX="357" minY="348" maxY="365" name="townhall-s"/>
+  <symbol minX="357" maxX="374" minY="348" maxY="365" name="helipad-s"/>
   <symbol minX="374" maxX="391" minY="348" maxY="365" name="book-shop-s"/>
   <symbol minX="391" maxX="408" minY="348" maxY="365" name="npark-s"/>
-  <symbol minX="408" maxX="425" minY="348" maxY="365" name="helipad-s"/>
-  <symbol minX="425" maxX="442" minY="348" maxY="365" name="school-s"/>
+  <symbol minX="408" maxX="425" minY="348" maxY="365" name="heliport-s"/>
+  <symbol minX="425" maxX="442" minY="348" maxY="365" name="car-repair-s"/>
   <symbol minX="442" maxX="459" minY="348" maxY="365" name="swimming-s"/>
   <symbol minX="459" maxX="476" minY="348" maxY="365" name="bicycle-s"/>
-  <symbol minX="476" maxX="493" minY="348" maxY="365" name="casino-s"/>
-  <symbol minX="493" maxX="510" minY="348" maxY="365" name="bcontrol-s"/>
-  <symbol minX="0" maxX="17" minY="365" maxY="382" name="restaurant-s"/>
+  <symbol minX="476" maxX="493" minY="348" maxY="365" name="school-s"/>
+  <symbol minX="493" maxX="510" minY="348" maxY="365" name="casino-s"/>
+  <symbol minX="0" maxX="17" minY="365" maxY="382" name="bcontrol-s"/>
   <symbol minX="17" maxX="34" minY="365" maxY="382" name="tennis-s"/>
   <symbol minX="34" maxX="51" minY="365" maxY="382" name="tourism-s"/>
-  <symbol minX="51" maxX="68" minY="365" maxY="382" name="recycling-s"/>
+  <symbol minX="51" maxX="68" minY="365" maxY="382" name="restaurant-s"/>
   <symbol minX="68" maxX="85" minY="365" maxY="382" name="theatre-s"/>
   <symbol minX="85" maxX="102" minY="365" maxY="382" name="beer-s"/>
   <symbol minX="102" maxX="119" minY="365" maxY="382" name="museum-s"/>
   <symbol minX="119" maxX="136" minY="365" maxY="382" name="toilets-s"/>
-  <symbol minX="136" maxX="153" minY="365" maxY="382" name="heliport-s"/>
+  <symbol minX="136" maxX="153" minY="365" maxY="382" name="zoo-s"/>
   <symbol minX="153" maxX="170" minY="365" maxY="382" name="monument-s"/>
-  <symbol minX="170" maxX="187" minY="365" maxY="382" name="zoo-s"/>
-  <symbol minX="187" maxX="204" minY="365" maxY="382" name="fuel-s"/>
+  <symbol minX="170" maxX="187" minY="365" maxY="382" name="fuel-s"/>
+  <symbol minX="187" maxX="204" minY="365" maxY="382" name="hospital-s"/>
   <symbol minX="204" maxX="221" minY="365" maxY="382" name="military-s"/>
   <symbol minX="221" maxX="243" minY="365" maxY="381" name="subway-madrid-m"/>
   <symbol minX="243" maxX="265" minY="365" maxY="381" name="subway-barcelona-l"/>
@@ -423,39 +423,39 @@
   <symbol minX="14" maxX="31" minY="382" maxY="396" name="subway-london-s"/>
   <symbol minX="31" maxX="45" minY="382" maxY="396" name="star-l"/>
   <symbol minX="45" maxX="59" minY="382" maxY="396" name="subway-rome-s"/>
-  <symbol minX="59" maxX="73" minY="382" maxY="396" name="route_from"/>
-  <symbol minX="73" maxX="87" minY="382" maxY="396" name="speedcam-s"/>
-  <symbol minX="87" maxX="102" minY="382" maxY="396" name="bench"/>
-  <symbol minX="102" maxX="115" minY="382" maxY="395" name="current-position"/>
-  <symbol minX="115" maxX="129" minY="382" maxY="395" name="peakt-l"/>
-  <symbol minX="129" maxX="142" minY="382" maxY="395" name="star-m"/>
-  <symbol minX="142" maxX="163" minY="382" maxY="395" name="subway-minsk-l"/>
-  <symbol minX="163" maxX="176" minY="382" maxY="395" name="survey_point-l"/>
-  <symbol minX="176" maxX="188" minY="382" maxY="394" name="subway-xs"/>
-  <symbol minX="188" maxX="200" minY="382" maxY="394" name="survey_point-m"/>
-  <symbol minX="200" maxX="217" minY="382" maxY="394" name="railway-crossing"/>
-  <symbol minX="217" maxX="229" minY="382" maxY="394" name="star-s"/>
-  <symbol minX="229" maxX="241" minY="382" maxY="394" name="subway-newyork-xs"/>
-  <symbol minX="241" maxX="259" minY="382" maxY="394" name="subway-kiev-s"/>
-  <symbol minX="259" maxX="277" minY="382" maxY="394" name="subway-minsk-m"/>
-  <symbol minX="277" maxX="288" minY="382" maxY="393" name="subway-xs copy"/>
-  <symbol minX="288" maxX="299" minY="382" maxY="393" name="api-result"/>
-  <symbol minX="299" maxX="316" minY="382" maxY="393" name="subway-minsk-s"/>
-  <symbol minX="316" maxX="327" minY="382" maxY="392" name="peakt-m"/>
-  <symbol minX="327" maxX="347" minY="382" maxY="392" name="arrow-m"/>
-  <symbol minX="347" maxX="357" minY="382" maxY="392" name="survey_point-s"/>
-  <symbol minX="357" maxX="367" minY="382" maxY="392" name="search-result"/>
-  <symbol minX="367" maxX="376" minY="382" maxY="391" name="entrance-s"/>
-  <symbol minX="376" maxX="385" minY="382" maxY="391" name="peakt-s"/>
-  <symbol minX="385" maxX="394" minY="382" maxY="391" name="dot-m"/>
-  <symbol minX="394" maxX="402" minY="382" maxY="390" name="none"/>
-  <symbol minX="402" maxX="417" minY="382" maxY="390" name="arrow-s"/>
-  <symbol minX="417" maxX="425" minY="382" maxY="390" name="tree-l"/>
-  <symbol minX="425" maxX="432" minY="382" maxY="389" name="dot-s"/>
-  <symbol minX="432" maxX="439" minY="382" maxY="389" name="tree-m"/>
-  <symbol minX="439" maxX="446" minY="382" maxY="389" name="dot-s-light"/>
-  <symbol minX="446" maxX="453" minY="382" maxY="389" name="entrance-xs"/>
-  <symbol minX="453" maxX="459" minY="382" maxY="388" name="zero-icon"/>
-  <symbol minX="459" maxX="465" minY="382" maxY="388" name="tree-s"/>
+  <symbol minX="59" maxX="74" minY="382" maxY="396" name="bench"/>
+  <symbol minX="74" maxX="88" minY="382" maxY="396" name="speedcam-s"/>
+  <symbol minX="88" maxX="101" minY="382" maxY="395" name="current-position"/>
+  <symbol minX="101" maxX="115" minY="382" maxY="395" name="peakt-l"/>
+  <symbol minX="115" maxX="128" minY="382" maxY="395" name="star-m"/>
+  <symbol minX="128" maxX="149" minY="382" maxY="395" name="subway-minsk-l"/>
+  <symbol minX="149" maxX="162" minY="382" maxY="395" name="survey_point-l"/>
+  <symbol minX="162" maxX="174" minY="382" maxY="394" name="subway-xs"/>
+  <symbol minX="174" maxX="192" minY="382" maxY="394" name="subway-minsk-m"/>
+  <symbol minX="192" maxX="209" minY="382" maxY="394" name="railway-crossing"/>
+  <symbol minX="209" maxX="221" minY="382" maxY="394" name="route_from"/>
+  <symbol minX="221" maxX="233" minY="382" maxY="394" name="star-s"/>
+  <symbol minX="233" maxX="251" minY="382" maxY="394" name="subway-kiev-s"/>
+  <symbol minX="251" maxX="263" minY="382" maxY="394" name="survey_point-m"/>
+  <symbol minX="263" maxX="275" minY="382" maxY="394" name="subway-newyork-xs"/>
+  <symbol minX="275" maxX="292" minY="382" maxY="393" name="subway-minsk-s"/>
+  <symbol minX="292" maxX="303" minY="382" maxY="393" name="api-result"/>
+  <symbol minX="303" maxX="314" minY="382" maxY="393" name="subway-xs copy"/>
+  <symbol minX="314" maxX="324" minY="382" maxY="392" name="survey_point-s"/>
+  <symbol minX="324" maxX="334" minY="382" maxY="392" name="search-result"/>
+  <symbol minX="334" maxX="345" minY="382" maxY="392" name="peakt-m"/>
+  <symbol minX="345" maxX="365" minY="382" maxY="392" name="arrow-m"/>
+  <symbol minX="365" maxX="374" minY="382" maxY="391" name="entrance-s"/>
+  <symbol minX="374" maxX="383" minY="382" maxY="391" name="peakt-s"/>
+  <symbol minX="383" maxX="392" minY="382" maxY="391" name="dot-m"/>
+  <symbol minX="392" maxX="400" minY="382" maxY="390" name="none"/>
+  <symbol minX="400" maxX="408" minY="382" maxY="390" name="tree-l"/>
+  <symbol minX="408" maxX="423" minY="382" maxY="390" name="arrow-s"/>
+  <symbol minX="423" maxX="430" minY="382" maxY="389" name="tree-m"/>
+  <symbol minX="430" maxX="437" minY="382" maxY="389" name="dot-s-light"/>
+  <symbol minX="437" maxX="444" minY="382" maxY="389" name="entrance-xs"/>
+  <symbol minX="444" maxX="451" minY="382" maxY="389" name="dot-s"/>
+  <symbol minX="451" maxX="457" minY="382" maxY="388" name="zero-icon"/>
+  <symbol minX="457" maxX="463" minY="382" maxY="388" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-mdpi/symbols.png b/data/resources-mdpi/symbols.png
index 2c678d5c5a..ef4711bf74 100644
--- a/data/resources-mdpi/symbols.png
+++ b/data/resources-mdpi/symbols.png
diff --git a/data/resources-mdpi/symbols.sdf b/data/resources-mdpi/symbols.sdf
index 945cbd543f..b26775d5fb 100644
--- a/data/resources-mdpi/symbols.sdf
+++ b/data/resources-mdpi/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file width="512" height="256">
+ <file height="256" width="512">
   <symbol minX="0" maxX="71" minY="0" maxY="71" name="route_to"/>
   <symbol minX="71" maxX="208" minY="0" maxY="68" name="route-arrow"/>
   <symbol minX="208" maxX="268" minY="0" maxY="60" name="compass-image"/>
diff --git a/data/resources-mdpi_clear/symbols.png b/data/resources-mdpi_clear/symbols.png
index 160de65bbe..8c81c79e80 100644
--- a/data/resources-mdpi_clear/symbols.png
+++ b/data/resources-mdpi_clear/symbols.png
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/resources-mdpi_clear/symbols.sdf
index 93374ac22e..93293bf93f 100644
--- a/data/resources-mdpi_clear/symbols.sdf
+++ b/data/resources-mdpi_clear/symbols.sdf
@@ -20,447 +20,447 @@
   <symbol minX="46" maxX="68" minY="71" maxY="93" name="airport-l"/>
   <symbol minX="68" maxX="90" minY="71" maxY="93" name="mobile_phone-l"/>
   <symbol minX="90" maxX="112" minY="71" maxY="93" name="australian-football-l"/>
-  <symbol minX="112" maxX="134" minY="71" maxY="93" name="skiing-l"/>
+  <symbol minX="112" maxX="134" minY="71" maxY="93" name="shop-l"/>
   <symbol minX="134" maxX="156" minY="71" maxY="93" name="bakery-l"/>
-  <symbol minX="156" maxX="178" minY="71" maxY="93" name="shop-l"/>
+  <symbol minX="156" maxX="178" minY="71" maxY="93" name="shop-bicycle-l"/>
   <symbol minX="178" maxX="200" minY="71" maxY="93" name="bank-l"/>
   <symbol minX="200" maxX="221" minY="71" maxY="93" name="bank-m"/>
   <symbol minX="221" maxX="243" minY="71" maxY="93" name="banknote-l"/>
-  <symbol minX="243" maxX="265" minY="71" maxY="93" name="shop-bicycle-l"/>
+  <symbol minX="243" maxX="265" minY="71" maxY="93" name="shoes-l"/>
   <symbol minX="265" maxX="287" minY="71" maxY="93" name="bar-l"/>
-  <symbol minX="287" maxX="309" minY="71" maxY="93" name="shoes-l"/>
+  <symbol minX="287" maxX="309" minY="71" maxY="93" name="skiing-l"/>
   <symbol minX="309" maxX="331" minY="71" maxY="93" name="ship-l"/>
   <symbol minX="331" maxX="353" minY="71" maxY="93" name="baseball-l"/>
-  <symbol minX="353" maxX="375" minY="71" maxY="93" name="sports-l"/>
+  <symbol minX="353" maxX="375" minY="71" maxY="93" name="school-l"/>
   <symbol minX="375" maxX="397" minY="71" maxY="93" name="airport-m"/>
   <symbol minX="397" maxX="419" minY="71" maxY="93" name="basketball-l"/>
-  <symbol minX="419" maxX="441" minY="71" maxY="93" name="school-l"/>
+  <symbol minX="419" maxX="441" minY="71" maxY="93" name="soccer-l"/>
   <symbol minX="441" maxX="463" minY="71" maxY="93" name="restaurant-l"/>
   <symbol minX="463" maxX="485" minY="71" maxY="93" name="bbq-l"/>
-  <symbol minX="485" maxX="506" minY="71" maxY="93" name="remains-m"/>
+  <symbol minX="485" maxX="507" minY="71" maxY="93" name="remains-l"/>
   <symbol minX="0" maxX="22" minY="100" maxY="122" name="bcontrol-l"/>
-  <symbol minX="22" maxX="43" minY="100" maxY="122" name="bcontrol-m"/>
-  <symbol minX="43" maxX="65" minY="100" maxY="122" name="remains-l"/>
-  <symbol minX="65" maxX="87" minY="100" maxY="122" name="beach-l"/>
-  <symbol minX="87" maxX="109" minY="100" maxY="122" name="recycling-l"/>
-  <symbol minX="109" maxX="131" minY="100" maxY="122" name="beauty-l"/>
-  <symbol minX="131" maxX="153" minY="100" maxY="122" name="subway-entrance-l"/>
-  <symbol minX="153" maxX="175" minY="100" maxY="122" name="beer-l"/>
-  <symbol minX="175" maxX="196" minY="100" maxY="122" name="beer-m"/>
-  <symbol minX="196" maxX="218" minY="100" maxY="122" name="pub-l"/>
-  <symbol minX="218" maxX="240" minY="100" maxY="122" name="alcohol-l"/>
-  <symbol minX="240" maxX="262" minY="100" maxY="122" name="bicycle-l"/>
-  <symbol minX="262" maxX="284" minY="100" maxY="122" name="power-m"/>
-  <symbol minX="284" maxX="306" minY="100" maxY="122" name="power-l"/>
-  <symbol minX="306" maxX="328" minY="100" maxY="122" name="book-shop-l"/>
-  <symbol minX="328" maxX="350" minY="100" maxY="122" name="postbox-l"/>
-  <symbol minX="350" maxX="372" minY="100" maxY="122" name="subway-l"/>
-  <symbol minX="372" maxX="394" minY="100" maxY="122" name="boundary_stone-l"/>
-  <symbol minX="394" maxX="416" minY="100" maxY="122" name="police-l"/>
-  <symbol minX="416" maxX="438" minY="100" maxY="122" name="bowls-l"/>
-  <symbol minX="438" maxX="460" minY="100" maxY="122" name="place-of-worship-l"/>
-  <symbol minX="460" maxX="482" minY="100" maxY="122" name="bus-l"/>
-  <symbol minX="482" maxX="504" minY="100" maxY="122" name="pitch-l"/>
-  <symbol minX="0" maxX="22" minY="122" maxY="144" name="alpine_hut-l"/>
+  <symbol minX="22" maxX="44" minY="100" maxY="122" name="sports-l"/>
+  <symbol minX="44" maxX="66" minY="100" maxY="122" name="alcohol-l"/>
+  <symbol minX="66" maxX="88" minY="100" maxY="122" name="beach-l"/>
+  <symbol minX="88" maxX="110" minY="100" maxY="122" name="recycling-l"/>
+  <symbol minX="110" maxX="132" minY="100" maxY="122" name="beauty-l"/>
+  <symbol minX="132" maxX="154" minY="100" maxY="122" name="pub-l"/>
+  <symbol minX="154" maxX="176" minY="100" maxY="122" name="beer-l"/>
+  <symbol minX="176" maxX="198" minY="100" maxY="122" name="power-m"/>
+  <symbol minX="198" maxX="220" minY="100" maxY="122" name="power-l"/>
+  <symbol minX="220" maxX="242" minY="100" maxY="122" name="postbox-l"/>
+  <symbol minX="242" maxX="264" minY="100" maxY="122" name="bicycle-l"/>
+  <symbol minX="264" maxX="286" minY="100" maxY="122" name="police-l"/>
+  <symbol minX="286" maxX="308" minY="100" maxY="122" name="alpine_hut-l"/>
+  <symbol minX="308" maxX="330" minY="100" maxY="122" name="book-shop-l"/>
+  <symbol minX="330" maxX="352" minY="100" maxY="122" name="subway-entrance-l"/>
+  <symbol minX="352" maxX="374" minY="100" maxY="122" name="place-of-worship-l"/>
+  <symbol minX="374" maxX="396" minY="100" maxY="122" name="boundary_stone-l"/>
+  <symbol minX="396" maxX="418" minY="100" maxY="122" name="pitch-l"/>
+  <symbol minX="418" maxX="440" minY="100" maxY="122" name="bowls-l"/>
+  <symbol minX="440" maxX="462" minY="100" maxY="122" name="subway-l"/>
+  <symbol minX="462" maxX="484" minY="100" maxY="122" name="bus-l"/>
+  <symbol minX="484" maxX="506" minY="100" maxY="122" name="picnic-l"/>
+  <symbol minX="0" maxX="22" minY="122" maxY="144" name="america-football-l"/>
   <symbol minX="22" maxX="44" minY="122" maxY="144" name="butcher-l"/>
-  <symbol minX="44" maxX="65" minY="122" maxY="144" name="picnic-m"/>
-  <symbol minX="65" maxX="87" minY="122" maxY="144" name="cable-car-l"/>
-  <symbol minX="87" maxX="109" minY="122" maxY="144" name="picnic-l"/>
-  <symbol minX="109" maxX="131" minY="122" maxY="144" name="phone-l"/>
-  <symbol minX="131" maxX="153" minY="122" maxY="144" name="cafe-l"/>
-  <symbol minX="153" maxX="175" minY="122" maxY="144" name="pharmacy-l"/>
-  <symbol minX="175" maxX="197" minY="122" maxY="144" name="america-football-l"/>
-  <symbol minX="197" maxX="219" minY="122" maxY="144" name="campsite-l"/>
-  <symbol minX="219" maxX="241" minY="122" maxY="144" name="subway-newyork-l"/>
-  <symbol minX="241" maxX="263" minY="122" maxY="144" name="subway-paris-l"/>
-  <symbol minX="263" maxX="285" minY="122" maxY="144" name="car-repair-l"/>
-  <symbol minX="285" maxX="306" minY="122" maxY="144" name="car-repair-m"/>
-  <symbol minX="306" maxX="328" minY="122" maxY="144" name="archery-l"/>
-  <symbol minX="328" maxX="350" minY="122" maxY="144" name="car_sharing-l"/>
-  <symbol minX="350" maxX="372" minY="122" maxY="144" name="subway-spb-l"/>
-  <symbol minX="372" maxX="394" minY="122" maxY="144" name="caravan_site-l"/>
-  <symbol minX="394" maxX="416" minY="122" maxY="144" name="parking-meter-l"/>
-  <symbol minX="416" maxX="438" minY="122" maxY="144" name="casino-l"/>
-  <symbol minX="438" maxX="460" minY="122" maxY="144" name="sweets-l"/>
-  <symbol minX="460" maxX="482" minY="122" maxY="144" name="park-l"/>
-  <symbol minX="482" maxX="504" minY="122" maxY="144" name="cave-l"/>
-  <symbol minX="0" maxX="22" minY="144" maxY="166" name="optician-l"/>
-  <symbol minX="22" maxX="43" minY="144" maxY="166" name="office-m"/>
-  <symbol minX="43" maxX="65" minY="144" maxY="166" name="cemetery-l"/>
-  <symbol minX="65" maxX="87" minY="144" maxY="166" name="office-l"/>
-  <symbol minX="87" maxX="109" minY="144" maxY="166" name="atm-l"/>
-  <symbol minX="109" maxX="131" minY="144" maxY="166" name="chemist-l"/>
-  <symbol minX="131" maxX="153" minY="144" maxY="166" name="nparkf-l"/>
-  <symbol minX="153" maxX="175" minY="144" maxY="166" name="cinema-l"/>
-  <symbol minX="175" maxX="197" minY="144" maxY="166" name="swimming-l"/>
-  <symbol minX="197" maxX="219" minY="144" maxY="166" name="npark-l"/>
-  <symbol minX="219" maxX="241" minY="144" maxY="166" name="clothes-l"/>
-  <symbol minX="241" maxX="263" minY="144" maxY="166" name="taxi-l"/>
-  <symbol minX="263" maxX="285" minY="144" maxY="166" name="college-l"/>
-  <symbol minX="285" maxX="307" minY="144" maxY="166" name="museum-l"/>
-  <symbol minX="307" maxX="329" minY="144" maxY="166" name="zoo-l"/>
-  <symbol minX="329" maxX="351" minY="144" maxY="166" name="computer-l"/>
-  <symbol minX="351" maxX="373" minY="144" maxY="166" name="motel-l"/>
-  <symbol minX="373" maxX="395" minY="144" maxY="166" name="convenience-l"/>
-  <symbol minX="395" maxX="417" minY="144" maxY="166" name="monument-l"/>
-  <symbol minX="417" maxX="439" minY="144" maxY="166" name="cricket-l"/>
-  <symbol minX="439" maxX="461" minY="144" maxY="166" name="tennis-l"/>
-  <symbol minX="461" maxX="483" minY="144" maxY="166" name="military-l"/>
-  <symbol minX="483" maxX="505" minY="144" maxY="166" name="windmill-l"/>
+  <symbol minX="44" maxX="66" minY="122" maxY="144" name="phone-l"/>
+  <symbol minX="66" maxX="88" minY="122" maxY="144" name="cable-car-l"/>
+  <symbol minX="88" maxX="110" minY="122" maxY="144" name="pharmacy-l"/>
+  <symbol minX="110" maxX="132" minY="122" maxY="144" name="subway-newyork-l"/>
+  <symbol minX="132" maxX="154" minY="122" maxY="144" name="cafe-l"/>
+  <symbol minX="154" maxX="176" minY="122" maxY="144" name="peak-l"/>
+  <symbol minX="176" maxX="198" minY="122" maxY="144" name="archery-l"/>
+  <symbol minX="198" maxX="220" minY="122" maxY="144" name="campsite-l"/>
+  <symbol minX="220" maxX="242" minY="122" maxY="144" name="subway-paris-l"/>
+  <symbol minX="242" maxX="264" minY="122" maxY="144" name="parking-meter-l"/>
+  <symbol minX="264" maxX="286" minY="122" maxY="144" name="car-repair-l"/>
+  <symbol minX="286" maxX="308" minY="122" maxY="144" name="park-l"/>
+  <symbol minX="308" maxX="330" minY="122" maxY="144" name="optician-l"/>
+  <symbol minX="330" maxX="352" minY="122" maxY="144" name="car_sharing-l"/>
+  <symbol minX="352" maxX="374" minY="122" maxY="144" name="office-l"/>
+  <symbol minX="374" maxX="396" minY="122" maxY="144" name="caravan_site-l"/>
+  <symbol minX="396" maxX="418" minY="122" maxY="144" name="subway-spb-l"/>
+  <symbol minX="418" maxX="440" minY="122" maxY="144" name="casino-l"/>
+  <symbol minX="440" maxX="462" minY="122" maxY="144" name="nparkf-l"/>
+  <symbol minX="462" maxX="484" minY="122" maxY="144" name="atm-l"/>
+  <symbol minX="484" maxX="506" minY="122" maxY="144" name="cave-l"/>
+  <symbol minX="0" maxX="22" minY="144" maxY="166" name="npark-l"/>
+  <symbol minX="22" maxX="44" minY="144" maxY="166" name="sweets-l"/>
+  <symbol minX="44" maxX="66" minY="144" maxY="166" name="cemetery-l"/>
+  <symbol minX="66" maxX="88" minY="144" maxY="166" name="museum-l"/>
+  <symbol minX="88" maxX="110" minY="144" maxY="166" name="zoo-l"/>
+  <symbol minX="110" maxX="132" minY="144" maxY="166" name="chemist-l"/>
+  <symbol minX="132" maxX="154" minY="144" maxY="166" name="motel-l"/>
+  <symbol minX="154" maxX="176" minY="144" maxY="166" name="cinema-l"/>
+  <symbol minX="176" maxX="198" minY="144" maxY="166" name="swimming-l"/>
+  <symbol minX="198" maxX="220" minY="144" maxY="166" name="monument-l"/>
+  <symbol minX="220" maxX="242" minY="144" maxY="166" name="clothes-l"/>
+  <symbol minX="242" maxX="264" minY="144" maxY="166" name="military-l"/>
+  <symbol minX="264" maxX="286" minY="144" maxY="166" name="college-l"/>
+  <symbol minX="286" maxX="308" minY="144" maxY="166" name="taxi-l"/>
+  <symbol minX="308" maxX="330" minY="144" maxY="166" name="windmill-l"/>
+  <symbol minX="330" maxX="352" minY="144" maxY="166" name="computer-l"/>
+  <symbol minX="352" maxX="374" minY="144" maxY="166" name="marketplace-l"/>
+  <symbol minX="374" maxX="396" minY="144" maxY="166" name="convenience-l"/>
+  <symbol minX="396" maxX="418" minY="144" maxY="166" name="tennis-l"/>
+  <symbol minX="418" maxX="440" minY="144" maxY="166" name="cricket-l"/>
+  <symbol minX="440" maxX="462" minY="144" maxY="166" name="mail-l"/>
+  <symbol minX="462" maxX="484" minY="144" maxY="166" name="lightrail-berlin-l"/>
+  <symbol minX="484" maxX="506" minY="144" maxY="166" name="wayside_shrine-l"/>
   <symbol minX="0" maxX="22" minY="166" maxY="188" name="theatre-l"/>
   <symbol minX="22" maxX="44" minY="166" maxY="188" name="curling-l"/>
-  <symbol minX="44" maxX="66" minY="166" maxY="188" name="marketplace-l"/>
+  <symbol minX="44" maxX="66" minY="166" maxY="188" name="lighthouse-l"/>
   <symbol minX="66" maxX="88" minY="166" maxY="188" name="department_store-l"/>
-  <symbol minX="88" maxX="110" minY="166" maxY="188" name="mail-l"/>
+  <symbol minX="88" maxX="110" minY="166" maxY="188" name="lift_gate-l"/>
   <symbol minX="110" maxX="132" minY="166" maxY="188" name="diving-l"/>
-  <symbol minX="132" maxX="154" minY="166" maxY="188" name="toilets-l"/>
+  <symbol minX="132" maxX="154" minY="166" maxY="188" name="library-l"/>
   <symbol minX="154" maxX="176" minY="166" maxY="188" name="dog_park-l"/>
-  <symbol minX="176" maxX="198" minY="166" maxY="188" name="lightrail-berlin-l"/>
+  <symbol minX="176" maxX="198" minY="166" maxY="188" name="laundry-l"/>
   <symbol minX="198" maxX="220" minY="166" maxY="188" name="doityourself-l"/>
-  <symbol minX="220" maxX="242" minY="166" maxY="188" name="lighthouse-l"/>
-  <symbol minX="242" maxX="264" minY="166" maxY="188" name="wayside_shrine-l"/>
-  <symbol minX="264" maxX="286" minY="166" maxY="188" name="lift_gate-l"/>
-  <symbol minX="286" maxX="308" minY="166" maxY="188" name="wayside_cross-l"/>
-  <symbol minX="308" maxX="330" minY="166" maxY="188" name="drinking-water-l"/>
-  <symbol minX="330" maxX="352" minY="166" maxY="188" name="toll_booth-l"/>
-  <symbol minX="352" maxX="374" minY="166" maxY="188" name="library-l"/>
-  <symbol minX="374" maxX="395" minY="166" maxY="188" name="laundry-m"/>
+  <symbol minX="220" maxX="242" minY="166" maxY="188" name="kiosk-l"/>
+  <symbol minX="242" maxX="264" minY="166" maxY="188" name="wayside_cross-l"/>
+  <symbol minX="264" maxX="286" minY="166" maxY="188" name="toilets-l"/>
+  <symbol minX="286" maxX="307" minY="166" maxY="188" name="waterfall-m"/>
+  <symbol minX="307" maxX="329" minY="166" maxY="188" name="drinking-water-l"/>
+  <symbol minX="329" maxX="351" minY="166" maxY="188" name="kindergarten-m"/>
+  <symbol minX="351" maxX="373" minY="166" maxY="188" name="waterfall-l"/>
+  <symbol minX="373" maxX="395" minY="166" maxY="188" name="kindergarten-l"/>
   <symbol minX="395" maxX="417" minY="166" maxY="188" name="electronics-l"/>
-  <symbol minX="417" maxX="439" minY="166" maxY="188" name="laundry-l"/>
+  <symbol minX="417" maxX="439" minY="166" maxY="188" name="jewelry-l"/>
   <symbol minX="439" maxX="461" minY="166" maxY="188" name="embassy-l"/>
-  <symbol minX="461" maxX="483" minY="166" maxY="188" name="kiosk-l"/>
-  <symbol minX="483" maxX="504" minY="166" maxY="188" name="waterfall-m"/>
-  <symbol minX="0" maxX="22" minY="188" maxY="210" name="waterfall-l"/>
-  <symbol minX="22" maxX="44" minY="188" maxY="210" name="kindergarten-m"/>
+  <symbol minX="461" maxX="483" minY="166" maxY="188" name="information-l"/>
+  <symbol minX="483" maxX="505" minY="166" maxY="188" name="hunting-tower-l"/>
+  <symbol minX="0" maxX="22" minY="188" maxY="210" name="volcano-l"/>
+  <symbol minX="22" maxX="44" minY="188" maxY="210" name="toll_booth-l"/>
   <symbol minX="44" maxX="66" minY="188" maxY="210" name="equestrian-l"/>
   <symbol minX="66" maxX="88" minY="188" maxY="210" name="equestrian-m"/>
-  <symbol minX="88" maxX="110" minY="188" maxY="210" name="volcano-l"/>
+  <symbol minX="88" maxX="110" minY="188" maxY="210" name="vending-l"/>
   <symbol minX="110" maxX="132" minY="188" maxY="210" name="fastfood-l"/>
-  <symbol minX="132" maxX="154" minY="188" maxY="210" name="kindergarten-l"/>
-  <symbol minX="154" maxX="176" minY="188" maxY="210" name="jewelry-l"/>
+  <symbol minX="132" maxX="154" minY="188" maxY="210" name="hotel-l"/>
+  <symbol minX="154" maxX="176" minY="188" maxY="210" name="hospital-l"/>
   <symbol minX="176" maxX="198" minY="188" maxY="210" name="fire_station-l"/>
-  <symbol minX="198" maxX="220" minY="188" maxY="210" name="tomb-l"/>
-  <symbol minX="220" maxX="242" minY="188" maxY="210" name="vending-l"/>
+  <symbol minX="198" maxX="220" minY="188" maxY="210" name="historic-ship-l"/>
+  <symbol minX="220" maxX="242" minY="188" maxY="210" name="tram-l"/>
   <symbol minX="242" maxX="264" minY="188" maxY="210" name="florist-l"/>
-  <symbol minX="264" maxX="286" minY="188" maxY="210" name="information-l"/>
+  <symbol minX="264" maxX="286" minY="188" maxY="210" name="tomb-l"/>
   <symbol minX="286" maxX="308" minY="188" maxY="210" name="fountain-l"/>
-  <symbol minX="308" maxX="329" minY="188" maxY="210" name="hunting-tower-m"/>
-  <symbol minX="329" maxX="351" minY="188" maxY="210" name="hunting-tower-l"/>
-  <symbol minX="351" maxX="373" minY="188" maxY="210" name="fuel-l"/>
-  <symbol minX="373" maxX="395" minY="188" maxY="210" name="hotel-l"/>
-  <symbol minX="395" maxX="417" minY="188" maxY="210" name="tram-l"/>
-  <symbol minX="417" maxX="439" minY="188" maxY="210" name="funicular-l"/>
-  <symbol minX="439" maxX="461" minY="188" maxY="210" name="tourism-l"/>
-  <symbol minX="461" maxX="483" minY="188" maxY="210" name="hospital-l"/>
-  <symbol minX="483" maxX="505" minY="188" maxY="210" name="furniture-l"/>
-  <symbol minX="0" maxX="22" minY="210" maxY="232" name="historic-ship-l"/>
+  <symbol minX="308" maxX="330" minY="188" maxY="210" name="heliport-l"/>
+  <symbol minX="330" maxX="352" minY="188" maxY="210" name="helipad-l"/>
+  <symbol minX="352" maxX="374" minY="188" maxY="210" name="fuel-l"/>
+  <symbol minX="374" maxX="396" minY="188" maxY="210" name="hardware-l"/>
+  <symbol minX="396" maxX="418" minY="188" maxY="210" name="train-l"/>
+  <symbol minX="418" maxX="440" minY="188" maxY="210" name="funicular-l"/>
+  <symbol minX="440" maxX="462" minY="188" maxY="210" name="tourism-l"/>
+  <symbol minX="462" maxX="484" minY="188" maxY="210" name="hand-m"/>
+  <symbol minX="484" maxX="506" minY="188" maxY="210" name="furniture-l"/>
+  <symbol minX="0" maxX="22" minY="210" maxY="232" name="hand-l"/>
   <symbol minX="22" maxX="44" minY="210" maxY="232" name="gallery-l"/>
-  <symbol minX="44" maxX="65" minY="210" maxY="232" name="heliport-m"/>
-  <symbol minX="65" maxX="87" minY="210" maxY="232" name="train-l"/>
-  <symbol minX="87" maxX="109" minY="210" maxY="232" name="garden-l"/>
-  <symbol minX="109" maxX="131" minY="210" maxY="232" name="heliport-l"/>
-  <symbol minX="131" maxX="153" minY="210" maxY="232" name="helipad-l"/>
-  <symbol minX="153" maxX="175" minY="210" maxY="232" name="garden_center-l"/>
-  <symbol minX="175" maxX="197" minY="210" maxY="232" name="hardware-l"/>
-  <symbol minX="197" maxX="219" minY="210" maxY="232" name="gate-l"/>
-  <symbol minX="219" maxX="241" minY="210" maxY="232" name="townhall-l"/>
-  <symbol minX="241" maxX="263" minY="210" maxY="232" name="gift-l"/>
-  <symbol minX="263" maxX="285" minY="210" maxY="232" name="hand-m"/>
-  <symbol minX="285" maxX="307" minY="210" maxY="232" name="golf-l"/>
-  <symbol minX="307" maxX="329" minY="210" maxY="232" name="hand-l"/>
-  <symbol minX="329" maxX="351" minY="210" maxY="232" name="toys-l"/>
-  <symbol minX="351" maxX="373" minY="210" maxY="232" name="greengrocer-l"/>
-  <symbol minX="373" maxX="395" minY="210" maxY="232" name="hairdresser-l"/>
-  <symbol minX="395" maxX="417" minY="210" maxY="232" name="grocery-l"/>
-  <symbol minX="417" maxX="439" minY="210" maxY="232" name="soccer-l"/>
-  <symbol minX="439" maxX="460" minY="210" maxY="231" name="townhall-m"/>
-  <symbol minX="460" maxX="481" minY="210" maxY="231" name="greengrocer-m"/>
-  <symbol minX="481" maxX="502" minY="210" maxY="231" name="hairdresser-m"/>
-  <symbol minX="0" maxX="21" minY="232" maxY="253" name="golf-m"/>
-  <symbol minX="21" maxX="42" minY="232" maxY="253" name="gift-m"/>
-  <symbol minX="42" maxX="63" minY="232" maxY="253" name="gate-m"/>
-  <symbol minX="63" maxX="84" minY="232" maxY="253" name="garden_center-m"/>
+  <symbol minX="44" maxX="66" minY="210" maxY="232" name="hairdresser-l"/>
+  <symbol minX="66" maxX="88" minY="210" maxY="232" name="toys-l"/>
+  <symbol minX="88" maxX="110" minY="210" maxY="232" name="garden-l"/>
+  <symbol minX="110" maxX="132" minY="210" maxY="232" name="grocery-l"/>
+  <symbol minX="132" maxX="154" minY="210" maxY="232" name="greengrocer-l"/>
+  <symbol minX="154" maxX="176" minY="210" maxY="232" name="garden_center-l"/>
+  <symbol minX="176" maxX="198" minY="210" maxY="232" name="townhall-l"/>
+  <symbol minX="198" maxX="220" minY="210" maxY="232" name="gate-l"/>
+  <symbol minX="220" maxX="242" minY="210" maxY="232" name="golf-l"/>
+  <symbol minX="242" maxX="264" minY="210" maxY="232" name="gift-l"/>
+  <symbol minX="264" maxX="285" minY="210" maxY="231" name="gift-m"/>
+  <symbol minX="285" maxX="306" minY="210" maxY="231" name="gate-m"/>
+  <symbol minX="306" maxX="327" minY="210" maxY="231" name="golf-m"/>
+  <symbol minX="327" maxX="348" minY="210" maxY="231" name="garden_center-m"/>
+  <symbol minX="348" maxX="369" minY="210" maxY="231" name="townhall-m"/>
+  <symbol minX="369" maxX="390" minY="210" maxY="231" name="greengrocer-m"/>
+  <symbol minX="390" maxX="411" minY="210" maxY="231" name="garden-m"/>
+  <symbol minX="411" maxX="432" minY="210" maxY="231" name="grocery-m"/>
+  <symbol minX="432" maxX="453" minY="210" maxY="231" name="tourism-m"/>
+  <symbol minX="453" maxX="474" minY="210" maxY="231" name="gallery-m"/>
+  <symbol minX="474" maxX="495" minY="210" maxY="231" name="hairdresser-m"/>
+  <symbol minX="0" maxX="21" minY="232" maxY="253" name="furniture-m"/>
+  <symbol minX="21" maxX="42" minY="232" maxY="253" name="toys-m"/>
+  <symbol minX="42" maxX="63" minY="232" maxY="253" name="funicular-m"/>
+  <symbol minX="63" maxX="84" minY="232" maxY="253" name="fuel-m"/>
   <symbol minX="84" maxX="105" minY="232" maxY="253" name="hardware-m"/>
-  <symbol minX="105" maxX="126" minY="232" maxY="253" name="toys-m"/>
+  <symbol minX="105" maxX="126" minY="232" maxY="253" name="train-m"/>
   <symbol minX="126" maxX="147" minY="232" maxY="253" name="helipad-m"/>
-  <symbol minX="147" maxX="168" minY="232" maxY="253" name="tourism-m"/>
-  <symbol minX="168" maxX="189" minY="232" maxY="253" name="garden-m"/>
-  <symbol minX="189" maxX="210" minY="232" maxY="253" name="gallery-m"/>
-  <symbol minX="210" maxX="231" minY="232" maxY="253" name="grocery-m"/>
-  <symbol minX="231" maxX="252" minY="232" maxY="253" name="furniture-m"/>
+  <symbol minX="147" maxX="168" minY="232" maxY="253" name="tomb-m"/>
+  <symbol minX="168" maxX="189" minY="232" maxY="253" name="fountain-m"/>
+  <symbol minX="189" maxX="210" minY="232" maxY="253" name="heliport-m"/>
+  <symbol minX="210" maxX="231" minY="232" maxY="253" name="florist-m"/>
+  <symbol minX="231" maxX="252" minY="232" maxY="253" name="fire_station-m"/>
   <symbol minX="252" maxX="273" minY="232" maxY="253" name="historic-ship-m"/>
-  <symbol minX="273" maxX="294" minY="232" maxY="253" name="train-m"/>
+  <symbol minX="273" maxX="294" minY="232" maxY="253" name="tram-m"/>
   <symbol minX="294" maxX="315" minY="232" maxY="253" name="hospital-m"/>
-  <symbol minX="315" maxX="336" minY="232" maxY="253" name="funicular-m"/>
-  <symbol minX="336" maxX="357" minY="232" maxY="253" name="fuel-m"/>
+  <symbol minX="315" maxX="336" minY="232" maxY="253" name="toll_booth-m"/>
+  <symbol minX="336" maxX="357" minY="232" maxY="253" name="fastfood-m"/>
   <symbol minX="357" maxX="378" minY="232" maxY="253" name="hotel-m"/>
-  <symbol minX="378" maxX="399" minY="232" maxY="253" name="tomb-m"/>
-  <symbol minX="399" maxX="420" minY="232" maxY="253" name="tram-m"/>
-  <symbol minX="420" maxX="441" minY="232" maxY="253" name="fountain-m"/>
-  <symbol minX="441" maxX="462" minY="232" maxY="253" name="skiing-m"/>
-  <symbol minX="462" maxX="483" minY="232" maxY="253" name="florist-m"/>
+  <symbol minX="378" maxX="399" minY="232" maxY="253" name="vending-m"/>
+  <symbol minX="399" maxX="420" minY="232" maxY="253" name="volcano-m"/>
+  <symbol minX="420" maxX="441" minY="232" maxY="253" name="hunting-tower-m"/>
+  <symbol minX="441" maxX="462" minY="232" maxY="253" name="australian-football-m"/>
+  <symbol minX="462" maxX="483" minY="232" maxY="253" name="embassy-m"/>
   <symbol minX="483" maxX="504" minY="232" maxY="253" name="information-m"/>
-  <symbol minX="0" maxX="21" minY="253" maxY="274" name="fire_station-m"/>
-  <symbol minX="21" maxX="42" minY="253" maxY="274" name="vending-m"/>
+  <symbol minX="0" maxX="21" minY="253" maxY="274" name="toilets-m"/>
+  <symbol minX="21" maxX="42" minY="253" maxY="274" name="electronics-m"/>
   <symbol minX="42" maxX="63" minY="253" maxY="274" name="jewelry-m"/>
-  <symbol minX="63" maxX="84" minY="253" maxY="274" name="fastfood-m"/>
-  <symbol minX="84" maxX="105" minY="253" maxY="274" name="volcano-m"/>
-  <symbol minX="105" maxX="126" minY="253" maxY="274" name="toll_booth-m"/>
-  <symbol minX="126" maxX="147" minY="253" maxY="274" name="embassy-m"/>
+  <symbol minX="63" maxX="84" minY="253" maxY="274" name="drugs"/>
+  <symbol minX="84" maxX="105" minY="253" maxY="274" name="drinking-water-m"/>
+  <symbol minX="105" maxX="126" minY="253" maxY="274" name="shop-bicycle-m"/>
+  <symbol minX="126" maxX="147" minY="253" maxY="274" name="doityourself-m"/>
   <symbol minX="147" maxX="168" minY="253" maxY="274" name="kiosk-m"/>
-  <symbol minX="168" maxX="189" minY="253" maxY="274" name="electronics-m"/>
-  <symbol minX="189" maxX="210" minY="253" maxY="274" name="drugs"/>
-  <symbol minX="210" maxX="231" minY="253" maxY="274" name="australian-football-m"/>
+  <symbol minX="168" maxX="189" minY="253" maxY="274" name="dog_park-m"/>
+  <symbol minX="189" maxX="210" minY="253" maxY="274" name="laundry-m"/>
+  <symbol minX="210" maxX="231" minY="253" maxY="274" name="diving-m"/>
   <symbol minX="231" maxX="252" minY="253" maxY="274" name="library-m"/>
-  <symbol minX="252" maxX="273" minY="253" maxY="274" name="drinking-water-m"/>
-  <symbol minX="273" maxX="294" minY="253" maxY="274" name="wayside_cross-m"/>
+  <symbol minX="252" maxX="273" minY="253" maxY="274" name="theatre-m"/>
+  <symbol minX="273" maxX="294" minY="253" maxY="274" name="department_store-m"/>
   <symbol minX="294" maxX="315" minY="253" maxY="274" name="lift_gate-m"/>
-  <symbol minX="315" maxX="336" minY="253" maxY="274" name="doityourself-m"/>
+  <symbol minX="315" maxX="336" minY="253" maxY="274" name="curling-m"/>
   <symbol minX="336" maxX="357" minY="253" maxY="274" name="lighthouse-m"/>
-  <symbol minX="357" maxX="378" minY="253" maxY="274" name="toilets-m"/>
-  <symbol minX="378" maxX="399" minY="253" maxY="274" name="dog_park-m"/>
-  <symbol minX="399" maxX="420" minY="253" maxY="274" name="soccer-m"/>
-  <symbol minX="420" maxX="441" minY="253" maxY="274" name="diving-m"/>
-  <symbol minX="441" maxX="462" minY="253" maxY="274" name="department_store-m"/>
+  <symbol minX="357" maxX="378" minY="253" maxY="274" name="wayside_cross-m"/>
+  <symbol minX="378" maxX="399" minY="253" maxY="274" name="wayside_shrine-m"/>
+  <symbol minX="399" maxX="420" minY="253" maxY="274" name="bakery-m"/>
+  <symbol minX="420" maxX="441" minY="253" maxY="274" name="tennis-m"/>
+  <symbol minX="441" maxX="462" minY="253" maxY="274" name="cricket-m"/>
   <symbol minX="462" maxX="483" minY="253" maxY="274" name="mail-m"/>
-  <symbol minX="483" maxX="504" minY="253" maxY="274" name="theatre-m"/>
-  <symbol minX="0" maxX="21" minY="274" maxY="295" name="curling-m"/>
+  <symbol minX="483" maxX="504" minY="253" maxY="274" name="convenience-m"/>
+  <symbol minX="0" maxX="21" minY="274" maxY="295" name="computer-m"/>
   <symbol minX="21" maxX="42" minY="274" maxY="295" name="marketplace-m"/>
-  <symbol minX="42" maxX="63" minY="274" maxY="295" name="wayside_shrine-m"/>
-  <symbol minX="63" maxX="84" minY="274" maxY="295" name="tennis-m"/>
-  <symbol minX="84" maxX="105" minY="274" maxY="295" name="windmill-m"/>
+  <symbol minX="42" maxX="63" minY="274" maxY="295" name="taxi-m"/>
+  <symbol minX="63" maxX="84" minY="274" maxY="295" name="college-m"/>
+  <symbol minX="84" maxX="105" minY="274" maxY="295" name="clothes-m"/>
   <symbol minX="105" maxX="126" minY="274" maxY="295" name="military-m"/>
-  <symbol minX="126" maxX="147" minY="274" maxY="295" name="cricket-m"/>
+  <symbol minX="126" maxX="147" minY="274" maxY="295" name="swimming-m"/>
   <symbol minX="147" maxX="168" minY="274" maxY="295" name="atm-m"/>
   <symbol minX="168" maxX="189" minY="274" maxY="295" name="mobile_phone-m"/>
-  <symbol minX="189" maxX="210" minY="274" maxY="295" name="convenience-m"/>
+  <symbol minX="189" maxX="210" minY="274" maxY="295" name="windmill-m"/>
   <symbol minX="210" maxX="231" minY="274" maxY="295" name="monument-m"/>
-  <symbol minX="231" maxX="252" minY="274" maxY="295" name="taxi-m"/>
-  <symbol minX="252" maxX="273" minY="274" maxY="295" name="computer-m"/>
+  <symbol minX="231" maxX="252" minY="274" maxY="295" name="cinema-m"/>
+  <symbol minX="252" maxX="273" minY="274" maxY="295" name="chemist-m"/>
   <symbol minX="273" maxX="294" minY="274" maxY="295" name="motel-m"/>
-  <symbol minX="294" maxX="315" minY="274" maxY="295" name="college-m"/>
+  <symbol minX="294" maxX="315" minY="274" maxY="295" name="cemetery-m"/>
   <symbol minX="315" maxX="336" minY="274" maxY="295" name="museum-m"/>
-  <symbol minX="336" maxX="357" minY="274" maxY="295" name="clothes-m"/>
-  <symbol minX="357" maxX="378" minY="274" maxY="295" name="shop-m"/>
-  <symbol minX="378" maxX="399" minY="274" maxY="295" name="bakery-m"/>
-  <symbol minX="399" maxX="420" minY="274" maxY="295" name="shop-bicycle-m"/>
-  <symbol minX="420" maxX="441" minY="274" maxY="295" name="banknote-m"/>
-  <symbol minX="441" maxX="462" minY="274" maxY="295" name="shoes-m"/>
-  <symbol minX="462" maxX="483" minY="274" maxY="295" name="swimming-m"/>
-  <symbol minX="483" maxX="504" minY="274" maxY="295" name="zoo-m"/>
+  <symbol minX="336" maxX="357" minY="274" maxY="295" name="sweets-m"/>
+  <symbol minX="357" maxX="378" minY="274" maxY="295" name="shoes-m"/>
+  <symbol minX="378" maxX="399" minY="274" maxY="295" name="banknote-m"/>
+  <symbol minX="399" maxX="420" minY="274" maxY="295" name="bar-m"/>
+  <symbol minX="420" maxX="441" minY="274" maxY="295" name="shop-m"/>
+  <symbol minX="441" maxX="462" minY="274" maxY="295" name="ship-m"/>
+  <symbol minX="462" maxX="483" minY="274" maxY="295" name="zoo-m"/>
+  <symbol minX="483" maxX="504" minY="274" maxY="295" name="cave-m"/>
   <symbol minX="0" maxX="21" minY="295" maxY="316" name="npark-m"/>
-  <symbol minX="21" maxX="42" minY="295" maxY="316" name="cinema-m"/>
-  <symbol minX="42" maxX="63" minY="295" maxY="316" name="chemist-m"/>
+  <symbol minX="21" maxX="42" minY="295" maxY="316" name="subway-spb-m"/>
+  <symbol minX="42" maxX="63" minY="295" maxY="316" name="casino-m"/>
   <symbol minX="63" maxX="84" minY="295" maxY="316" name="nparkf-m "/>
   <symbol minX="84" maxX="105" minY="295" maxY="316" name="nparkf-m"/>
-  <symbol minX="105" maxX="126" minY="295" maxY="316" name="sweets-m"/>
-  <symbol minX="126" maxX="147" minY="295" maxY="316" name="cemetery-m"/>
-  <symbol minX="147" maxX="168" minY="295" maxY="316" name="bar-m"/>
-  <symbol minX="168" maxX="189" minY="295" maxY="316" name="ship-m"/>
-  <symbol minX="189" maxX="210" minY="295" maxY="316" name="cave-m"/>
+  <symbol minX="105" maxX="126" minY="295" maxY="316" name="caravan_site-m"/>
+  <symbol minX="126" maxX="147" minY="295" maxY="316" name="car_sharing-m"/>
+  <symbol minX="147" maxX="168" minY="295" maxY="316" name="office-m"/>
+  <symbol minX="168" maxX="189" minY="295" maxY="316" name="skiing-m"/>
+  <symbol minX="189" maxX="210" minY="295" maxY="316" name="school-m"/>
   <symbol minX="210" maxX="231" minY="295" maxY="316" name="optician-m"/>
-  <symbol minX="231" maxX="252" minY="295" maxY="316" name="archery-m"/>
+  <symbol minX="231" maxX="252" minY="295" maxY="316" name="car-repair-m"/>
   <symbol minX="252" maxX="273" minY="295" maxY="316" name="park-m"/>
-  <symbol minX="273" maxX="294" minY="295" maxY="316" name="casino-m"/>
-  <symbol minX="294" maxX="315" minY="295" maxY="316" name="baseball-m"/>
-  <symbol minX="315" maxX="336" minY="295" maxY="316" name="subway-spb-m"/>
-  <symbol minX="336" maxX="357" minY="295" maxY="316" name="caravan_site-m"/>
+  <symbol minX="273" maxX="294" minY="295" maxY="316" name="baseball-m"/>
+  <symbol minX="294" maxX="315" minY="295" maxY="316" name="basketball-m"/>
+  <symbol minX="315" maxX="336" minY="295" maxY="316" name="soccer-m"/>
+  <symbol minX="336" maxX="357" minY="295" maxY="316" name="archery-m"/>
   <symbol minX="357" maxX="378" minY="295" maxY="316" name="parking-meter-m"/>
-  <symbol minX="378" maxX="399" minY="295" maxY="316" name="car_sharing-m"/>
-  <symbol minX="399" maxX="420" minY="295" maxY="316" name="school-m"/>
-  <symbol minX="420" maxX="441" minY="295" maxY="316" name="basketball-m"/>
-  <symbol minX="441" maxX="462" minY="295" maxY="316" name="sports-m"/>
+  <symbol minX="378" maxX="399" minY="295" maxY="316" name="campsite-m"/>
+  <symbol minX="399" maxX="420" minY="295" maxY="316" name="cafe-m"/>
+  <symbol minX="420" maxX="441" minY="295" maxY="316" name="peak-m"/>
+  <symbol minX="441" maxX="462" minY="295" maxY="316" name="subway-newyork-m"/>
   <symbol minX="462" maxX="483" minY="295" maxY="316" name="america-football-m"/>
-  <symbol minX="483" maxX="504" minY="295" maxY="316" name="subway-newyork-m"/>
-  <symbol minX="0" maxX="21" minY="316" maxY="337" name="campsite-m"/>
+  <symbol minX="483" maxX="504" minY="295" maxY="316" name="restaurant-m"/>
+  <symbol minX="0" maxX="21" minY="316" maxY="337" name="remains-m"/>
   <symbol minX="21" maxX="42" minY="316" maxY="337" name="pharmacy-2-m"/>
-  <symbol minX="42" maxX="63" minY="316" maxY="337" name="cafe-m"/>
+  <symbol minX="42" maxX="63" minY="316" maxY="337" name="cable-car-m"/>
   <symbol minX="63" maxX="84" minY="316" maxY="337" name="pharmacy-m"/>
-  <symbol minX="84" maxX="105" minY="316" maxY="337" name="restaurant-m"/>
-  <symbol minX="105" maxX="126" minY="316" maxY="337" name="alpine_hut-m"/>
+  <symbol minX="84" maxX="105" minY="316" maxY="337" name="subway-m"/>
+  <symbol minX="105" maxX="126" minY="316" maxY="337" name="butcher-m"/>
   <symbol minX="126" maxX="147" minY="316" maxY="337" name="phone-m"/>
   <symbol minX="147" maxX="168" minY="316" maxY="337" name="bbq-m"/>
-  <symbol minX="168" maxX="189" minY="316" maxY="337" name="cable-car-m"/>
-  <symbol minX="189" maxX="210" minY="316" maxY="337" name="butcher-m"/>
-  <symbol minX="210" maxX="231" minY="316" maxY="337" name="recycling-m"/>
-  <symbol minX="231" maxX="252" minY="316" maxY="337" name="bus-m"/>
+  <symbol minX="168" maxX="189" minY="316" maxY="337" name="bus-m"/>
+  <symbol minX="189" maxX="210" minY="316" maxY="337" name="picnic-m"/>
+  <symbol minX="210" maxX="231" minY="316" maxY="337" name="bowls-m"/>
+  <symbol minX="231" maxX="252" minY="316" maxY="337" name="boundary_stone-m"/>
   <symbol minX="252" maxX="273" minY="316" maxY="337" name="pitch-m"/>
-  <symbol minX="273" maxX="294" minY="316" maxY="337" name="subway-m"/>
-  <symbol minX="294" maxX="315" minY="316" maxY="337" name="bowls-m"/>
+  <symbol minX="273" maxX="294" minY="316" maxY="337" name="subway-entrance-m"/>
+  <symbol minX="294" maxX="315" minY="316" maxY="337" name="alpine_hut-m"/>
   <symbol minX="315" maxX="336" minY="316" maxY="337" name="place-of-worship-m"/>
-  <symbol minX="336" maxX="357" minY="316" maxY="337" name="beach-m"/>
-  <symbol minX="357" maxX="378" minY="316" maxY="337" name="boundary_stone-m"/>
+  <symbol minX="336" maxX="357" minY="316" maxY="337" name="book-shop-m"/>
+  <symbol minX="357" maxX="378" minY="316" maxY="337" name="bicycle-m"/>
   <symbol minX="378" maxX="399" minY="316" maxY="337" name="police-m"/>
-  <symbol minX="399" maxX="420" minY="316" maxY="337" name="alcohol-m"/>
-  <symbol minX="420" maxX="441" minY="316" maxY="337" name="book-shop-m"/>
+  <symbol minX="399" maxX="420" minY="316" maxY="337" name="subway-entrance-2-m"/>
+  <symbol minX="420" maxX="441" minY="316" maxY="337" name="alcohol-m"/>
   <symbol minX="441" maxX="462" minY="316" maxY="337" name="postbox-m"/>
-  <symbol minX="462" maxX="483" minY="316" maxY="337" name="subway-entrance-2-m"/>
-  <symbol minX="483" maxX="504" minY="316" maxY="337" name="bicycle-m"/>
-  <symbol minX="0" maxX="21" minY="337" maxY="358" name="subway-entrance-m"/>
+  <symbol minX="462" maxX="483" minY="316" maxY="337" name="bcontrol-m"/>
+  <symbol minX="483" maxX="504" minY="316" maxY="337" name="beer-m"/>
+  <symbol minX="0" maxX="21" minY="337" maxY="358" name="recycling-m"/>
   <symbol minX="21" maxX="42" minY="337" maxY="358" name="beauty-m"/>
   <symbol minX="42" maxX="63" minY="337" maxY="358" name="pub-m"/>
-  <symbol minX="63" maxX="83" minY="337" maxY="357" name="parking-l"/>
-  <symbol minX="83" maxX="103" minY="337" maxY="357" name="subway-berlin-l"/>
-  <symbol minX="103" maxX="123" minY="337" maxY="357" name="lightrail-berlin-m"/>
-  <symbol minX="123" maxX="143" minY="337" maxY="357" name="speedcam-l"/>
-  <symbol minX="143" maxX="163" minY="337" maxY="357" name="watch-my-position"/>
-  <symbol minX="163" maxX="183" minY="337" maxY="357" name="subway-rome-l"/>
-  <symbol minX="183" maxX="205" minY="337" maxY="356" name="subway-moscow-l"/>
-  <symbol minX="205" maxX="224" minY="337" maxY="356" name="route_from"/>
-  <symbol minX="224" maxX="242" minY="337" maxY="355" name="airport-s"/>
-  <symbol minX="242" maxX="263" minY="337" maxY="355" name="subway-moscow-m"/>
-  <symbol minX="263" maxX="280" minY="337" maxY="355" name="remains-s"/>
-  <symbol minX="280" maxX="298" minY="337" maxY="355" name="subway-paris-m"/>
-  <symbol minX="298" maxX="315" minY="337" maxY="355" name="bcontrol-s"/>
-  <symbol minX="315" maxX="333" minY="337" maxY="355" name="subway-rome-m"/>
-  <symbol minX="333" maxX="350" minY="337" maxY="355" name="beer-s"/>
-  <symbol minX="350" maxX="368" minY="337" maxY="355" name="subway-berlin-m"/>
-  <symbol minX="368" maxX="385" minY="337" maxY="355" name="office-s"/>
-  <symbol minX="385" maxX="402" minY="337" maxY="355" name="picnic-s"/>
-  <symbol minX="402" maxX="420" minY="337" maxY="355" name="current-position"/>
-  <symbol minX="420" maxX="438" minY="337" maxY="355" name="no-icon"/>
-  <symbol minX="438" maxX="456" minY="337" maxY="355" name="no-icon-tourism"/>
-  <symbol minX="456" maxX="474" minY="337" maxY="355" name="no-icon-shop"/>
-  <symbol minX="474" maxX="492" minY="337" maxY="355" name="no-icon-leisure"/>
-  <symbol minX="492" maxX="510" minY="337" maxY="355" name="no-icon-amenity"/>
-  <symbol minX="0" maxX="22" minY="358" maxY="376" name="subway-london-l"/>
-  <symbol minX="22" maxX="39" minY="358" maxY="376" name="waterfall-s"/>
-  <symbol minX="39" maxX="56" minY="358" maxY="376" name="hunting-tower-s"/>
-  <symbol minX="56" maxX="73" minY="358" maxY="376" name="heliport-s"/>
-  <symbol minX="73" maxX="90" minY="358" maxY="375" name="skiing-s"/>
-  <symbol minX="90" maxX="107" minY="358" maxY="375" name="shop-s"/>
-  <symbol minX="107" maxX="124" minY="358" maxY="375" name="soccer-s"/>
-  <symbol minX="124" maxX="141" minY="358" maxY="375" name="ship-s"/>
-  <symbol minX="141" maxX="158" minY="358" maxY="375" name="speedcam-m"/>
-  <symbol minX="158" maxX="175" minY="358" maxY="375" name="bar-s"/>
-  <symbol minX="175" maxX="192" minY="358" maxY="375" name="school-s"/>
-  <symbol minX="192" maxX="209" minY="358" maxY="375" name="baseball-s"/>
-  <symbol minX="209" maxX="226" minY="358" maxY="375" name="basketball-s"/>
-  <symbol minX="226" maxX="243" minY="358" maxY="375" name="bicycle-s"/>
-  <symbol minX="243" maxX="260" minY="358" maxY="375" name="book-shop-s"/>
-  <symbol minX="260" maxX="277" minY="358" maxY="375" name="alcohol-s"/>
-  <symbol minX="277" maxX="294" minY="358" maxY="375" name="bus-s"/>
-  <symbol minX="294" maxX="314" minY="358" maxY="375" name="subway-barcelona-s"/>
-  <symbol minX="314" maxX="331" minY="358" maxY="375" name="restaurant-s"/>
-  <symbol minX="331" maxX="348" minY="358" maxY="375" name="recycling-s"/>
-  <symbol minX="348" maxX="365" minY="358" maxY="375" name="cable-car-s"/>
-  <symbol minX="365" maxX="382" minY="358" maxY="375" name="cafe-s"/>
-  <symbol minX="382" maxX="399" minY="358" maxY="375" name="subway-entrance-2-s"/>
-  <symbol minX="399" maxX="416" minY="358" maxY="375" name="subway-entrance-arrow"/>
-  <symbol minX="416" maxX="433" minY="358" maxY="375" name="pub-s"/>
-  <symbol minX="433" maxX="450" minY="358" maxY="375" name="power-s"/>
-  <symbol minX="450" maxX="467" minY="358" maxY="375" name="subway-entrance-s"/>
-  <symbol minX="467" maxX="484" minY="358" maxY="375" name="campsite-s"/>
-  <symbol minX="484" maxX="501" minY="358" maxY="375" name="america-football-s"/>
-  <symbol minX="0" maxX="17" minY="376" maxY="393" name="car-repair-s"/>
-  <symbol minX="17" maxX="34" minY="376" maxY="393" name="police-s"/>
-  <symbol minX="34" maxX="51" minY="376" maxY="393" name="place-of-worship-s"/>
-  <symbol minX="51" maxX="72" minY="376" maxY="393" name="subway-london-m"/>
-  <symbol minX="72" maxX="89" minY="376" maxY="393" name="casino-s"/>
-  <symbol minX="89" maxX="106" minY="376" maxY="393" name="pitch-s"/>
-  <symbol minX="106" maxX="123" minY="376" maxY="393" name="cave-s"/>
-  <symbol minX="123" maxX="140" minY="376" maxY="393" name="cemetery-s"/>
+  <symbol minX="63" maxX="84" minY="337" maxY="358" name="beach-m"/>
+  <symbol minX="84" maxX="105" minY="337" maxY="358" name="sports-m"/>
+  <symbol minX="105" maxX="125" minY="337" maxY="357" name="subway-berlin-l"/>
+  <symbol minX="125" maxX="145" minY="337" maxY="357" name="lightrail-berlin-m"/>
+  <symbol minX="145" maxX="165" minY="337" maxY="357" name="watch-my-position"/>
+  <symbol minX="165" maxX="185" minY="337" maxY="357" name="subway-rome-l"/>
+  <symbol minX="185" maxX="205" minY="337" maxY="357" name="parking-l"/>
+  <symbol minX="205" maxX="225" minY="337" maxY="357" name="speedcam-l"/>
+  <symbol minX="225" maxX="247" minY="337" maxY="356" name="subway-moscow-l"/>
+  <symbol minX="247" maxX="268" minY="337" maxY="355" name="subway-moscow-m"/>
+  <symbol minX="268" maxX="286" minY="337" maxY="355" name="subway-paris-m"/>
+  <symbol minX="286" maxX="304" minY="337" maxY="355" name="airport-s"/>
+  <symbol minX="304" maxX="326" minY="337" maxY="355" name="subway-london-l"/>
+  <symbol minX="326" maxX="344" minY="337" maxY="355" name="current-position"/>
+  <symbol minX="344" maxX="362" minY="337" maxY="355" name="subway-rome-m"/>
+  <symbol minX="362" maxX="379" minY="337" maxY="355" name="beer-s"/>
+  <symbol minX="379" maxX="397" minY="337" maxY="355" name="no-icon"/>
+  <symbol minX="397" maxX="415" minY="337" maxY="355" name="no-icon-shop"/>
+  <symbol minX="415" maxX="433" minY="337" maxY="355" name="no-icon-leisure"/>
+  <symbol minX="433" maxX="451" minY="337" maxY="355" name="no-icon-amenity"/>
+  <symbol minX="451" maxX="469" minY="337" maxY="355" name="subway-berlin-m"/>
+  <symbol minX="469" maxX="486" minY="337" maxY="355" name="waterfall-s"/>
+  <symbol minX="486" maxX="503" minY="337" maxY="355" name="hunting-tower-s"/>
+  <symbol minX="0" maxX="18" minY="358" maxY="376" name="no-icon-tourism"/>
+  <symbol minX="18" maxX="35" minY="358" maxY="375" name="shop-s"/>
+  <symbol minX="35" maxX="52" minY="358" maxY="375" name="ship-s"/>
+  <symbol minX="52" maxX="69" minY="358" maxY="375" name="school-s"/>
+  <symbol minX="69" maxX="86" minY="358" maxY="375" name="skiing-s"/>
+  <symbol minX="86" maxX="103" minY="358" maxY="375" name="bar-s"/>
+  <symbol minX="103" maxX="120" minY="358" maxY="375" name="restaurant-s"/>
+  <symbol minX="120" maxX="137" minY="358" maxY="375" name="soccer-s"/>
+  <symbol minX="137" maxX="154" minY="358" maxY="375" name="remains-s"/>
+  <symbol minX="154" maxX="171" minY="358" maxY="375" name="speedcam-m"/>
+  <symbol minX="171" maxX="188" minY="358" maxY="375" name="baseball-s"/>
+  <symbol minX="188" maxX="205" minY="358" maxY="375" name="recycling-s"/>
+  <symbol minX="205" maxX="222" minY="358" maxY="375" name="basketball-s"/>
+  <symbol minX="222" maxX="239" minY="358" maxY="375" name="bcontrol-s"/>
+  <symbol minX="239" maxX="256" minY="358" maxY="375" name="alcohol-s"/>
+  <symbol minX="256" maxX="273" minY="358" maxY="375" name="bicycle-s"/>
+  <symbol minX="273" maxX="290" minY="358" maxY="375" name="book-shop-s"/>
+  <symbol minX="290" maxX="307" minY="358" maxY="375" name="bus-s"/>
+  <symbol minX="307" maxX="327" minY="358" maxY="375" name="subway-barcelona-s"/>
+  <symbol minX="327" maxX="344" minY="358" maxY="375" name="pub-s"/>
+  <symbol minX="344" maxX="361" minY="358" maxY="375" name="power-s"/>
+  <symbol minX="361" maxX="378" minY="358" maxY="375" name="cable-car-s"/>
+  <symbol minX="378" maxX="395" minY="358" maxY="375" name="police-s"/>
+  <symbol minX="395" maxX="412" minY="358" maxY="375" name="subway-entrance-2-s"/>
+  <symbol minX="412" maxX="429" minY="358" maxY="375" name="subway-entrance-arrow"/>
+  <symbol minX="429" maxX="446" minY="358" maxY="375" name="place-of-worship-s"/>
+  <symbol minX="446" maxX="463" minY="358" maxY="375" name="pitch-s"/>
+  <symbol minX="463" maxX="480" minY="358" maxY="375" name="subway-entrance-s"/>
+  <symbol minX="480" maxX="497" minY="358" maxY="375" name="america-football-s"/>
+  <symbol minX="0" maxX="17" minY="376" maxY="393" name="cafe-s"/>
+  <symbol minX="17" maxX="34" minY="376" maxY="393" name="campsite-s"/>
+  <symbol minX="34" maxX="51" minY="376" maxY="393" name="picnic-s"/>
+  <symbol minX="51" maxX="68" minY="376" maxY="393" name="phone-s"/>
+  <symbol minX="68" maxX="89" minY="376" maxY="393" name="subway-london-m"/>
+  <symbol minX="89" maxX="106" minY="376" maxY="393" name="car-repair-s"/>
+  <symbol minX="106" maxX="123" minY="376" maxY="393" name="pharmacy-s"/>
+  <symbol minX="123" maxX="140" minY="376" maxY="393" name="casino-s"/>
   <symbol minX="140" maxX="157" minY="376" maxY="393" name="zoo-s"/>
-  <symbol minX="157" maxX="174" minY="376" maxY="393" name="cinema-s"/>
-  <symbol minX="174" maxX="191" minY="376" maxY="393" name="college-s"/>
+  <symbol minX="157" maxX="174" minY="376" maxY="393" name="cave-s"/>
+  <symbol minX="174" maxX="191" minY="376" maxY="393" name="cemetery-s"/>
   <symbol minX="191" maxX="208" minY="376" maxY="393" name="windmill-s"/>
-  <symbol minX="208" maxX="225" minY="376" maxY="393" name="phone-s"/>
-  <symbol minX="225" maxX="242" minY="376" maxY="393" name="pharmacy-s"/>
+  <symbol minX="208" maxX="225" minY="376" maxY="393" name="cinema-s"/>
+  <symbol minX="225" maxX="242" minY="376" maxY="393" name="college-s"/>
   <symbol minX="242" maxX="259" minY="376" maxY="393" name="drinking-water-s"/>
-  <symbol minX="259" maxX="276" minY="376" maxY="393" name="embassy-s"/>
-  <symbol minX="276" maxX="293" minY="376" maxY="393" name="volcano-s"/>
-  <symbol minX="293" maxX="310" minY="376" maxY="393" name="subway-newyork-s"/>
-  <symbol minX="310" maxX="327" minY="376" maxY="393" name="equestrian-s"/>
-  <symbol minX="327" maxX="344" minY="376" maxY="393" name="fastfood-s"/>
-  <symbol minX="344" maxX="361" minY="376" maxY="393" name="fire_station-s"/>
-  <symbol minX="361" maxX="378" minY="376" maxY="393" name="tram-s"/>
-  <symbol minX="378" maxX="395" minY="376" maxY="393" name="fountain-s"/>
-  <symbol minX="395" maxX="412" minY="376" maxY="393" name="fuel-s"/>
-  <symbol minX="412" maxX="429" minY="376" maxY="393" name="train-s"/>
-  <symbol minX="429" maxX="446" minY="376" maxY="393" name="subway-s"/>
-  <symbol minX="446" maxX="463" minY="376" maxY="393" name="funicular-s"/>
-  <symbol minX="463" maxX="480" minY="376" maxY="393" name="gallery-s"/>
-  <symbol minX="480" maxX="497" minY="376" maxY="393" name="subway-spb-s"/>
-  <symbol minX="0" maxX="17" minY="393" maxY="410" name="garden-s"/>
-  <symbol minX="17" maxX="34" minY="393" maxY="410" name="golf-s"/>
-  <symbol minX="34" maxX="51" minY="393" maxY="410" name="townhall-s"/>
-  <symbol minX="51" maxX="68" minY="393" maxY="410" name="grocery-s"/>
-  <symbol minX="68" maxX="85" minY="393" maxY="410" name="park-s"/>
-  <symbol minX="85" maxX="102" minY="393" maxY="410" name="nparkf-s"/>
-  <symbol minX="102" maxX="119" minY="393" maxY="410" name="npark-s"/>
-  <symbol minX="119" maxX="136" minY="393" maxY="410" name="hand-s"/>
-  <symbol minX="136" maxX="153" minY="393" maxY="410" name="swimming-s"/>
-  <symbol minX="153" maxX="170" minY="393" maxY="410" name="atm-s"/>
-  <symbol minX="170" maxX="187" minY="393" maxY="410" name="monument-s"/>
-  <symbol minX="187" maxX="204" minY="393" maxY="410" name="military-s"/>
-  <symbol minX="204" maxX="221" minY="393" maxY="410" name="tourism-s"/>
-  <symbol minX="221" maxX="238" minY="393" maxY="410" name="tennis-s"/>
-  <symbol minX="238" maxX="255" minY="393" maxY="410" name="museum-s"/>
-  <symbol minX="255" maxX="272" minY="393" maxY="410" name="mail-s"/>
-  <symbol minX="272" maxX="289" minY="393" maxY="410" name="theatre-s"/>
-  <symbol minX="289" maxX="306" minY="393" maxY="410" name="helipad-s"/>
-  <symbol minX="306" maxX="323" minY="393" maxY="410" name="lighthouse-s"/>
-  <symbol minX="323" maxX="340" minY="393" maxY="410" name="toilets-s"/>
-  <symbol minX="340" maxX="357" minY="393" maxY="410" name="library-s"/>
-  <symbol minX="357" maxX="374" minY="393" maxY="410" name="kindergarten-s"/>
-  <symbol minX="374" maxX="391" minY="393" maxY="410" name="information-s"/>
-  <symbol minX="391" maxX="408" minY="393" maxY="410" name="hotel-s"/>
-  <symbol minX="408" maxX="425" minY="393" maxY="410" name="hospital-s"/>
-  <symbol minX="425" maxX="447" minY="393" maxY="409" name="metro-barcelona-m"/>
-  <symbol minX="447" maxX="462" minY="393" maxY="409" name="s-arrow"/>
-  <symbol minX="462" maxX="484" minY="393" maxY="409" name="subway-barcelona-l"/>
-  <symbol minX="484" maxX="506" minY="393" maxY="409" name="subway-barcelona-m"/>
-  <symbol minX="0" maxX="22" minY="410" maxY="426" name="subway-madrid-l"/>
-  <symbol minX="22" maxX="44" minY="410" maxY="426" name="subway-madrid-m"/>
-  <symbol minX="44" maxX="60" minY="410" maxY="426" name="parking-m"/>
-  <symbol minX="60" maxX="75" minY="410" maxY="425" name="lightrail-berlin-s"/>
-  <symbol minX="75" maxX="95" minY="410" maxY="425" name="subway-madrid-s"/>
-  <symbol minX="95" maxX="116" minY="410" maxY="425" name="subway-kiev-m"/>
-  <symbol minX="116" maxX="131" minY="410" maxY="425" name="peak-l"/>
-  <symbol minX="131" maxX="152" minY="410" maxY="425" name="subway-kiev-l"/>
-  <symbol minX="152" maxX="167" minY="410" maxY="425" name="subway-paris-s"/>
-  <symbol minX="167" maxX="187" minY="410" maxY="425" name="metro-barcelona-s"/>
-  <symbol minX="187" maxX="202" minY="410" maxY="425" name="api-result"/>
-  <symbol minX="202" maxX="217" minY="410" maxY="425" name="subway-moscow-s"/>
-  <symbol minX="217" maxX="232" minY="410" maxY="424" name="bench"/>
-  <symbol minX="232" maxX="246" minY="410" maxY="424" name="search-result"/>
-  <symbol minX="246" maxX="260" minY="410" maxY="424" name="subway-berlin-s"/>
-  <symbol minX="260" maxX="274" minY="410" maxY="424" name="speedcam-s"/>
-  <symbol minX="274" maxX="288" minY="410" maxY="424" name="subway-rome-s"/>
-  <symbol minX="288" maxX="305" minY="410" maxY="424" name="subway-london-s"/>
-  <symbol minX="305" maxX="319" minY="410" maxY="424" name="parking-s"/>
-  <symbol minX="319" maxX="332" minY="410" maxY="423" name="survey_point-l"/>
-  <symbol minX="332" maxX="346" minY="410" maxY="423" name="peakt-l"/>
-  <symbol minX="346" maxX="359" minY="410" maxY="423" name="star-l"/>
-  <symbol minX="359" maxX="380" minY="410" maxY="423" name="subway-minsk-l"/>
-  <symbol minX="380" maxX="398" minY="410" maxY="422" name="subway-minsk-m"/>
-  <symbol minX="398" maxX="410" minY="410" maxY="422" name="subway-xs"/>
-  <symbol minX="410" maxX="428" minY="410" maxY="422" name="subway-kiev-s"/>
-  <symbol minX="428" maxX="445" minY="410" maxY="422" name="railway-crossing"/>
-  <symbol minX="445" maxX="457" minY="410" maxY="422" name="peak-m"/>
-  <symbol minX="457" maxX="469" minY="410" maxY="422" name="star-m"/>
-  <symbol minX="469" maxX="481" minY="410" maxY="422" name="survey_point-m"/>
-  <symbol minX="481" maxX="493" minY="410" maxY="422" name="subway-newyork-xs"/>
-  <symbol minX="493" maxX="510" minY="410" maxY="421" name="subway-minsk-s"/>
-  <symbol minX="0" maxX="11" minY="426" maxY="437" name="crossing-l"/>
-  <symbol minX="11" maxX="22" minY="426" maxY="437" name="star-s"/>
-  <symbol minX="22" maxX="33" minY="426" maxY="436" name="peakt-m"/>
-  <symbol minX="33" maxX="53" minY="426" maxY="436" name="arrow-m"/>
-  <symbol minX="53" maxX="64" minY="426" maxY="436" name="peak-s"/>
-  <symbol minX="64" maxX="74" minY="426" maxY="436" name="survey_point-s"/>
-  <symbol minX="74" maxX="83" minY="426" maxY="435" name="crossing-m"/>
-  <symbol minX="83" maxX="92" minY="426" maxY="435" name="entrance-s"/>
-  <symbol minX="92" maxX="101" minY="426" maxY="435" name="peakt-s"/>
-  <symbol minX="101" maxX="109" minY="426" maxY="434" name="none"/>
-  <symbol minX="109" maxX="124" minY="426" maxY="434" name="arrow-s"/>
-  <symbol minX="124" maxX="132" minY="426" maxY="434" name="dot-m"/>
-  <symbol minX="132" maxX="140" minY="426" maxY="434" name="tree-l"/>
-  <symbol minX="140" maxX="148" minY="426" maxY="434" name="crossing-s"/>
-  <symbol minX="148" maxX="155" minY="426" maxY="433" name="entrance-xs"/>
-  <symbol minX="155" maxX="162" minY="426" maxY="433" name="tree-m"/>
-  <symbol minX="162" maxX="168" minY="426" maxY="432" name="dot-s"/>
-  <symbol minX="168" maxX="174" minY="426" maxY="432" name="dot-s-light"/>
-  <symbol minX="174" maxX="180" minY="426" maxY="432" name="zero-icon"/>
-  <symbol minX="180" maxX="186" minY="426" maxY="432" name="tree-s"/>
+  <symbol minX="259" maxX="276" minY="376" maxY="393" name="volcano-s"/>
+  <symbol minX="276" maxX="293" minY="376" maxY="393" name="embassy-s"/>
+  <symbol minX="293" maxX="310" minY="376" maxY="393" name="peak-s"/>
+  <symbol minX="310" maxX="327" minY="376" maxY="393" name="subway-newyork-s"/>
+  <symbol minX="327" maxX="344" minY="376" maxY="393" name="equestrian-s"/>
+  <symbol minX="344" maxX="361" minY="376" maxY="393" name="tram-s"/>
+  <symbol minX="361" maxX="378" minY="376" maxY="393" name="fastfood-s"/>
+  <symbol minX="378" maxX="395" minY="376" maxY="393" name="fire_station-s"/>
+  <symbol minX="395" maxX="412" minY="376" maxY="393" name="park-s"/>
+  <symbol minX="412" maxX="429" minY="376" maxY="393" name="office-s"/>
+  <symbol minX="429" maxX="446" minY="376" maxY="393" name="train-s"/>
+  <symbol minX="446" maxX="463" minY="376" maxY="393" name="subway-s"/>
+  <symbol minX="463" maxX="480" minY="376" maxY="393" name="nparkf-s"/>
+  <symbol minX="480" maxX="497" minY="376" maxY="393" name="npark-s"/>
+  <symbol minX="0" maxX="17" minY="393" maxY="410" name="subway-spb-s"/>
+  <symbol minX="17" maxX="34" minY="393" maxY="410" name="fountain-s"/>
+  <symbol minX="34" maxX="51" minY="393" maxY="410" name="fuel-s"/>
+  <symbol minX="51" maxX="68" minY="393" maxY="410" name="funicular-s"/>
+  <symbol minX="68" maxX="85" minY="393" maxY="410" name="gallery-s"/>
+  <symbol minX="85" maxX="102" minY="393" maxY="410" name="townhall-s"/>
+  <symbol minX="102" maxX="119" minY="393" maxY="410" name="atm-s"/>
+  <symbol minX="119" maxX="136" minY="393" maxY="410" name="monument-s"/>
+  <symbol minX="136" maxX="153" minY="393" maxY="410" name="military-s"/>
+  <symbol minX="153" maxX="170" minY="393" maxY="410" name="swimming-s"/>
+  <symbol minX="170" maxX="187" minY="393" maxY="410" name="garden-s"/>
+  <symbol minX="187" maxX="204" minY="393" maxY="410" name="golf-s"/>
+  <symbol minX="204" maxX="221" minY="393" maxY="410" name="mail-s"/>
+  <symbol minX="221" maxX="238" minY="393" maxY="410" name="museum-s"/>
+  <symbol minX="238" maxX="255" minY="393" maxY="410" name="tennis-s"/>
+  <symbol minX="255" maxX="272" minY="393" maxY="410" name="lighthouse-s"/>
+  <symbol minX="272" maxX="289" minY="393" maxY="410" name="library-s"/>
+  <symbol minX="289" maxX="306" minY="393" maxY="410" name="theatre-s"/>
+  <symbol minX="306" maxX="323" minY="393" maxY="410" name="kindergarten-s"/>
+  <symbol minX="323" maxX="340" minY="393" maxY="410" name="information-s"/>
+  <symbol minX="340" maxX="357" minY="393" maxY="410" name="toilets-s"/>
+  <symbol minX="357" maxX="374" minY="393" maxY="410" name="hotel-s"/>
+  <symbol minX="374" maxX="391" minY="393" maxY="410" name="hospital-s"/>
+  <symbol minX="391" maxX="408" minY="393" maxY="410" name="heliport-s"/>
+  <symbol minX="408" maxX="425" minY="393" maxY="410" name="helipad-s"/>
+  <symbol minX="425" maxX="442" minY="393" maxY="410" name="hand-s"/>
+  <symbol minX="442" maxX="459" minY="393" maxY="410" name="grocery-s"/>
+  <symbol minX="459" maxX="476" minY="393" maxY="410" name="tourism-s"/>
+  <symbol minX="476" maxX="498" minY="393" maxY="409" name="metro-barcelona-m"/>
+  <symbol minX="0" maxX="15" minY="410" maxY="426" name="s-arrow"/>
+  <symbol minX="15" maxX="31" minY="410" maxY="426" name="route_from"/>
+  <symbol minX="31" maxX="53" minY="410" maxY="426" name="subway-barcelona-l"/>
+  <symbol minX="53" maxX="75" minY="410" maxY="426" name="subway-barcelona-m"/>
+  <symbol minX="75" maxX="97" minY="410" maxY="426" name="subway-madrid-l"/>
+  <symbol minX="97" maxX="119" minY="410" maxY="426" name="subway-madrid-m"/>
+  <symbol minX="119" maxX="135" minY="410" maxY="426" name="parking-m"/>
+  <symbol minX="135" maxX="150" minY="410" maxY="425" name="subway-paris-s"/>
+  <symbol minX="150" maxX="170" minY="410" maxY="425" name="subway-madrid-s"/>
+  <symbol minX="170" maxX="190" minY="410" maxY="425" name="metro-barcelona-s"/>
+  <symbol minX="190" maxX="211" minY="410" maxY="425" name="subway-kiev-l"/>
+  <symbol minX="211" maxX="232" minY="410" maxY="425" name="subway-kiev-m"/>
+  <symbol minX="232" maxX="247" minY="410" maxY="425" name="api-result"/>
+  <symbol minX="247" maxX="262" minY="410" maxY="425" name="lightrail-berlin-s"/>
+  <symbol minX="262" maxX="277" minY="410" maxY="425" name="subway-moscow-s"/>
+  <symbol minX="277" maxX="291" minY="410" maxY="424" name="subway-rome-s"/>
+  <symbol minX="291" maxX="308" minY="410" maxY="424" name="subway-london-s"/>
+  <symbol minX="308" maxX="322" minY="410" maxY="424" name="parking-s"/>
+  <symbol minX="322" maxX="336" minY="410" maxY="424" name="speedcam-s"/>
+  <symbol minX="336" maxX="350" minY="410" maxY="424" name="search-result"/>
+  <symbol minX="350" maxX="364" minY="410" maxY="424" name="subway-berlin-s"/>
+  <symbol minX="364" maxX="378" minY="410" maxY="424" name="star-l"/>
+  <symbol minX="378" maxX="393" minY="410" maxY="424" name="bench"/>
+  <symbol minX="393" maxX="406" minY="410" maxY="423" name="star-m"/>
+  <symbol minX="406" maxX="427" minY="410" maxY="423" name="subway-minsk-l"/>
+  <symbol minX="427" maxX="440" minY="410" maxY="423" name="survey_point-l"/>
+  <symbol minX="440" maxX="454" minY="410" maxY="423" name="peakt-l"/>
+  <symbol minX="454" maxX="472" minY="410" maxY="422" name="subway-minsk-m"/>
+  <symbol minX="472" maxX="489" minY="410" maxY="422" name="railway-crossing"/>
+  <symbol minX="489" maxX="501" minY="410" maxY="422" name="star-s"/>
+  <symbol minX="0" maxX="18" minY="426" maxY="438" name="subway-kiev-s"/>
+  <symbol minX="18" maxX="30" minY="426" maxY="438" name="subway-xs"/>
+  <symbol minX="30" maxX="42" minY="426" maxY="438" name="subway-newyork-xs"/>
+  <symbol minX="42" maxX="54" minY="426" maxY="438" name="survey_point-m"/>
+  <symbol minX="54" maxX="71" minY="426" maxY="437" name="subway-minsk-s"/>
+  <symbol minX="71" maxX="82" minY="426" maxY="437" name="crossing-l"/>
+  <symbol minX="82" maxX="92" minY="426" maxY="436" name="survey_point-s"/>
+  <symbol minX="92" maxX="112" minY="426" maxY="436" name="arrow-m"/>
+  <symbol minX="112" maxX="123" minY="426" maxY="436" name="peakt-m"/>
+  <symbol minX="123" maxX="132" minY="426" maxY="435" name="crossing-m"/>
+  <symbol minX="132" maxX="141" minY="426" maxY="435" name="entrance-s"/>
+  <symbol minX="141" maxX="150" minY="426" maxY="435" name="peakt-s"/>
+  <symbol minX="150" maxX="159" minY="426" maxY="435" name="dot-m"/>
+  <symbol minX="159" maxX="174" minY="426" maxY="434" name="arrow-s"/>
+  <symbol minX="174" maxX="182" minY="426" maxY="434" name="tree-l"/>
+  <symbol minX="182" maxX="190" minY="426" maxY="434" name="crossing-s"/>
+  <symbol minX="190" maxX="198" minY="426" maxY="434" name="none"/>
+  <symbol minX="198" maxX="205" minY="426" maxY="433" name="dot-s-light"/>
+  <symbol minX="205" maxX="212" minY="426" maxY="433" name="entrance-xs"/>
+  <symbol minX="212" maxX="219" minY="426" maxY="433" name="dot-s"/>
+  <symbol minX="219" maxX="226" minY="426" maxY="433" name="tree-m"/>
+  <symbol minX="226" maxX="232" minY="426" maxY="432" name="zero-icon"/>
+  <symbol minX="232" maxX="238" minY="426" maxY="432" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-mdpi_dark/symbols.png b/data/resources-mdpi_dark/symbols.png
index c1cdceed3b..6d49d4815a 100644
--- a/data/resources-mdpi_dark/symbols.png
+++ b/data/resources-mdpi_dark/symbols.png
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/resources-mdpi_dark/symbols.sdf
index fce5360b66..44dff9123c 100644
--- a/data/resources-mdpi_dark/symbols.sdf
+++ b/data/resources-mdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file width="512" height="512">
+ <file height="512" width="512">
   <symbol minX="0" maxX="71" minY="0" maxY="71" name="route_to"/>
   <symbol minX="71" maxX="208" minY="0" maxY="68" name="route-arrow"/>
   <symbol minX="208" maxX="268" minY="0" maxY="60" name="compass-image"/>
@@ -21,444 +21,444 @@
   <symbol minX="68" maxX="90" minY="71" maxY="93" name="monument-l"/>
   <symbol minX="90" maxX="112" minY="71" maxY="93" name="ship-l"/>
   <symbol minX="112" maxX="134" minY="71" maxY="93" name="australian-football-l"/>
-  <symbol minX="134" maxX="156" minY="71" maxY="93" name="school-l"/>
+  <symbol minX="134" maxX="156" minY="71" maxY="93" name="shoes-l"/>
   <symbol minX="156" maxX="178" minY="71" maxY="93" name="bakery-l"/>
-  <symbol minX="178" maxX="200" minY="71" maxY="93" name="shop-bicycle-l"/>
-  <symbol minX="200" maxX="222" minY="71" maxY="93" name="restaurant-l"/>
+  <symbol minX="178" maxX="200" minY="71" maxY="93" name="school-l"/>
+  <symbol minX="200" maxX="222" minY="71" maxY="93" name="shop-bicycle-l"/>
   <symbol minX="222" maxX="244" minY="71" maxY="93" name="bank-l"/>
   <symbol minX="244" maxX="265" minY="71" maxY="93" name="bank-m"/>
   <symbol minX="265" maxX="287" minY="71" maxY="93" name="banknote-l"/>
-  <symbol minX="287" maxX="309" minY="71" maxY="93" name="shop-l copy"/>
+  <symbol minX="287" maxX="309" minY="71" maxY="93" name="restaurant-l"/>
   <symbol minX="309" maxX="331" minY="71" maxY="93" name="bar-l"/>
   <symbol minX="331" maxX="353" minY="71" maxY="93" name="remains-l"/>
   <symbol minX="353" maxX="375" minY="71" maxY="93" name="airport-m"/>
   <symbol minX="375" maxX="397" minY="71" maxY="93" name="baseball-l"/>
-  <symbol minX="397" maxX="419" minY="71" maxY="93" name="shop-l"/>
+  <symbol minX="397" maxX="419" minY="71" maxY="93" name="shop-l copy"/>
   <symbol minX="419" maxX="441" minY="71" maxY="93" name="alcohol-l"/>
   <symbol minX="441" maxX="463" minY="71" maxY="93" name="basketball-l"/>
   <symbol minX="463" maxX="485" minY="71" maxY="93" name="recycling-l"/>
-  <symbol minX="485" maxX="507" minY="71" maxY="93" name="pub-l"/>
+  <symbol minX="485" maxX="507" minY="71" maxY="93" name="shop-l"/>
   <symbol minX="0" maxX="22" minY="100" maxY="122" name="bbq-l"/>
-  <symbol minX="22" maxX="44" minY="100" maxY="122" name="power-m"/>
+  <symbol minX="22" maxX="44" minY="100" maxY="122" name="pub-l"/>
   <symbol minX="44" maxX="66" minY="100" maxY="122" name="bcontrol-l"/>
-  <symbol minX="66" maxX="88" minY="100" maxY="122" name="power-l"/>
-  <symbol minX="88" maxX="110" minY="100" maxY="122" name="postbox-l"/>
+  <symbol minX="66" maxX="88" minY="100" maxY="122" name="power-m"/>
+  <symbol minX="88" maxX="110" minY="100" maxY="122" name="alpine_hut-l"/>
   <symbol minX="110" maxX="132" minY="100" maxY="122" name="beach-l"/>
-  <symbol minX="132" maxX="154" minY="100" maxY="122" name="skiing-l"/>
+  <symbol minX="132" maxX="154" minY="100" maxY="122" name="power-l"/>
   <symbol minX="154" maxX="176" minY="100" maxY="122" name="beauty-l"/>
-  <symbol minX="176" maxX="198" minY="100" maxY="122" name="police-l"/>
+  <symbol minX="176" maxX="198" minY="100" maxY="122" name="postbox-l"/>
   <symbol minX="198" maxX="220" minY="100" maxY="122" name="beer-l"/>
-  <symbol minX="220" maxX="242" minY="100" maxY="122" name="place-of-worship-l"/>
-  <symbol minX="242" maxX="264" minY="100" maxY="122" name="alpine_hut-l"/>
-  <symbol minX="264" maxX="286" minY="100" maxY="122" name="soccer-l"/>
+  <symbol minX="220" maxX="242" minY="100" maxY="122" name="police-l"/>
+  <symbol minX="242" maxX="264" minY="100" maxY="122" name="skiing-l"/>
+  <symbol minX="264" maxX="286" minY="100" maxY="122" name="america-football-l"/>
   <symbol minX="286" maxX="308" minY="100" maxY="122" name="bicycle-l"/>
-  <symbol minX="308" maxX="330" minY="100" maxY="122" name="pitch-l"/>
-  <symbol minX="330" maxX="352" minY="100" maxY="122" name="america-football-l"/>
+  <symbol minX="308" maxX="330" minY="100" maxY="122" name="place-of-worship-l"/>
+  <symbol minX="330" maxX="352" minY="100" maxY="122" name="pitch-l"/>
   <symbol minX="352" maxX="374" minY="100" maxY="122" name="book-shop-l"/>
-  <symbol minX="374" maxX="396" minY="100" maxY="122" name="picnic-l"/>
-  <symbol minX="396" maxX="418" minY="100" maxY="122" name="phone-l"/>
+  <symbol minX="374" maxX="396" minY="100" maxY="122" name="soccer-l"/>
+  <symbol minX="396" maxX="418" minY="100" maxY="122" name="archery-l"/>
   <symbol minX="418" maxX="440" minY="100" maxY="122" name="boundary_stone-l"/>
-  <symbol minX="440" maxX="462" minY="100" maxY="122" name="sports-l"/>
+  <symbol minX="440" maxX="462" minY="100" maxY="122" name="picnic-l"/>
   <symbol minX="462" maxX="484" minY="100" maxY="122" name="bowls-l"/>
-  <symbol minX="484" maxX="506" minY="100" maxY="122" name="pharmacy-l"/>
+  <symbol minX="484" maxX="506" minY="100" maxY="122" name="phone-l"/>
   <symbol minX="0" maxX="22" minY="122" maxY="144" name="bus-l"/>
-  <symbol minX="22" maxX="44" minY="122" maxY="144" name="subway-entrance-l"/>
-  <symbol minX="44" maxX="66" minY="122" maxY="144" name="archery-l"/>
+  <symbol minX="22" maxX="44" minY="122" maxY="144" name="pharmacy-l"/>
+  <symbol minX="44" maxX="66" minY="122" maxY="144" name="sports-l"/>
   <symbol minX="66" maxX="88" minY="122" maxY="144" name="butcher-l"/>
   <symbol minX="88" maxX="110" minY="122" maxY="144" name="peak-l"/>
   <symbol minX="110" maxX="132" minY="122" maxY="144" name="cable-car-l"/>
-  <symbol minX="132" maxX="154" minY="122" maxY="144" name="parking-meter-l"/>
-  <symbol minX="154" maxX="176" minY="122" maxY="144" name="subway-l"/>
+  <symbol minX="132" maxX="154" minY="122" maxY="144" name="subway-entrance-l"/>
+  <symbol minX="154" maxX="176" minY="122" maxY="144" name="atm-l"/>
   <symbol minX="176" maxX="198" minY="122" maxY="144" name="cafe-l"/>
-  <symbol minX="198" maxX="220" minY="122" maxY="144" name="park-l"/>
-  <symbol minX="220" maxX="242" minY="122" maxY="144" name="atm-l"/>
+  <symbol minX="198" maxX="220" minY="122" maxY="144" name="parking-meter-l"/>
+  <symbol minX="220" maxX="242" minY="122" maxY="144" name="subway-l"/>
   <symbol minX="242" maxX="264" minY="122" maxY="144" name="campsite-l"/>
-  <symbol minX="264" maxX="286" minY="122" maxY="144" name="optician-l"/>
-  <symbol minX="286" maxX="308" minY="122" maxY="144" name="office-l"/>
+  <symbol minX="264" maxX="286" minY="122" maxY="144" name="park-l"/>
+  <symbol minX="286" maxX="308" minY="122" maxY="144" name="zoo-l"/>
   <symbol minX="308" maxX="330" minY="122" maxY="144" name="car-repair-l"/>
-  <symbol minX="330" maxX="352" minY="122" maxY="144" name="subway-newyork-l"/>
-  <symbol minX="352" maxX="374" minY="122" maxY="144" name="zoo-l"/>
+  <symbol minX="330" maxX="352" minY="122" maxY="144" name="optician-l"/>
+  <symbol minX="352" maxX="374" minY="122" maxY="144" name="office-l"/>
   <symbol minX="374" maxX="396" minY="122" maxY="144" name="car_sharing-l"/>
   <symbol minX="396" maxX="418" minY="122" maxY="144" name="nparkf-l"/>
   <symbol minX="418" maxX="440" minY="122" maxY="144" name="caravan_site-l"/>
-  <symbol minX="440" maxX="462" minY="122" maxY="144" name="npark-l"/>
+  <symbol minX="440" maxX="462" minY="122" maxY="144" name="subway-newyork-l"/>
   <symbol minX="462" maxX="484" minY="122" maxY="144" name="casino-l"/>
-  <symbol minX="484" maxX="506" minY="122" maxY="144" name="subway-paris-l"/>
-  <symbol minX="0" maxX="22" minY="144" maxY="166" name="subway-spb-l"/>
+  <symbol minX="484" maxX="506" minY="122" maxY="144" name="npark-l"/>
+  <symbol minX="0" maxX="22" minY="144" maxY="166" name="windmill-l"/>
   <symbol minX="22" maxX="44" minY="144" maxY="166" name="cave-l"/>
-  <symbol minX="44" maxX="66" minY="144" maxY="166" name="sweets-l"/>
-  <symbol minX="66" maxX="88" minY="144" maxY="166" name="windmill-l"/>
+  <symbol minX="44" maxX="66" minY="144" maxY="166" name="subway-paris-l"/>
+  <symbol minX="66" maxX="88" minY="144" maxY="166" name="subway-spb-l"/>
   <symbol minX="88" maxX="110" minY="144" maxY="166" name="cemetery-l"/>
-  <symbol minX="110" maxX="132" minY="144" maxY="166" name="swimming-l"/>
-  <symbol minX="132" maxX="154" minY="144" maxY="166" name="museum-l"/>
+  <symbol minX="110" maxX="132" minY="144" maxY="166" name="sweets-l"/>
+  <symbol minX="132" maxX="154" minY="144" maxY="166" name="wayside_shrine-l"/>
   <symbol minX="154" maxX="176" minY="144" maxY="166" name="chemist-l"/>
-  <symbol minX="176" maxX="198" minY="144" maxY="166" name="motel-l"/>
+  <symbol minX="176" maxX="198" minY="144" maxY="166" name="museum-l"/>
   <symbol minX="198" maxX="220" minY="144" maxY="166" name="cinema-l"/>
-  <symbol minX="220" maxX="242" minY="144" maxY="166" name="mobile_phone-l"/>
-  <symbol minX="242" maxX="264" minY="144" maxY="166" name="wayside_shrine-l"/>
+  <symbol minX="220" maxX="242" minY="144" maxY="166" name="motel-l"/>
+  <symbol minX="242" maxX="264" minY="144" maxY="166" name="swimming-l"/>
   <symbol minX="264" maxX="286" minY="144" maxY="166" name="clothes-l"/>
-  <symbol minX="286" maxX="308" minY="144" maxY="166" name="taxi-l"/>
+  <symbol minX="286" maxX="308" minY="144" maxY="166" name="mobile_phone-l"/>
   <symbol minX="308" maxX="330" minY="144" maxY="166" name="college-l"/>
   <symbol minX="330" maxX="352" minY="144" maxY="166" name="military-l"/>
-  <symbol minX="352" maxX="374" minY="144" maxY="166" name="tennis-l"/>
+  <symbol minX="352" maxX="374" minY="144" maxY="166" name="wayside_cross-l"/>
   <symbol minX="374" maxX="396" minY="144" maxY="166" name="computer-l"/>
-  <symbol minX="396" maxX="418" minY="144" maxY="166" name="marketplace-l"/>
+  <symbol minX="396" maxX="418" minY="144" maxY="166" name="taxi-l"/>
   <symbol minX="418" maxX="440" minY="144" maxY="166" name="convenience-l"/>
-  <symbol minX="440" maxX="462" minY="144" maxY="166" name="mail-l"/>
+  <symbol minX="440" maxX="462" minY="144" maxY="166" name="marketplace-l"/>
   <symbol minX="462" maxX="484" minY="144" maxY="166" name="cricket-l"/>
-  <symbol minX="484" maxX="506" minY="144" maxY="166" name="theatre-l"/>
+  <symbol minX="484" maxX="506" minY="144" maxY="166" name="tennis-l"/>
   <symbol minX="0" maxX="22" minY="166" maxY="188" name="curling-l"/>
-  <symbol minX="22" maxX="44" minY="166" maxY="188" name="lightrail-berlin-l"/>
+  <symbol minX="22" maxX="44" minY="166" maxY="188" name="mail-l"/>
   <symbol minX="44" maxX="66" minY="166" maxY="188" name="department_store-l"/>
-  <symbol minX="66" maxX="88" minY="166" maxY="188" name="lighthouse-l"/>
+  <symbol minX="66" maxX="88" minY="166" maxY="188" name="lightrail-berlin-l"/>
   <symbol minX="88" maxX="110" minY="166" maxY="188" name="diving-l"/>
-  <symbol minX="110" maxX="132" minY="166" maxY="188" name="lift_gate-l"/>
+  <symbol minX="110" maxX="132" minY="166" maxY="188" name="theatre-l"/>
   <symbol minX="132" maxX="154" minY="166" maxY="188" name="dog_park-l"/>
-  <symbol minX="154" maxX="176" minY="166" maxY="188" name="toilets-l"/>
+  <symbol minX="154" maxX="176" minY="166" maxY="188" name="lighthouse-l"/>
   <symbol minX="176" maxX="198" minY="166" maxY="188" name="doityourself-l"/>
-  <symbol minX="198" maxX="220" minY="166" maxY="188" name="library-l"/>
-  <symbol minX="220" maxX="242" minY="166" maxY="188" name="wayside_cross-l"/>
-  <symbol minX="242" maxX="264" minY="166" maxY="188" name="laundry-l"/>
-  <symbol minX="264" maxX="286" minY="166" maxY="188" name="waterfall-l"/>
+  <symbol minX="198" maxX="220" minY="166" maxY="188" name="lift_gate-l"/>
+  <symbol minX="220" maxX="242" minY="166" maxY="188" name="library-l"/>
+  <symbol minX="242" maxX="264" minY="166" maxY="188" name="waterfall-l"/>
+  <symbol minX="264" maxX="286" minY="166" maxY="188" name="laundry-l"/>
   <symbol minX="286" maxX="308" minY="166" maxY="188" name="drinking-water-l"/>
   <symbol minX="308" maxX="330" minY="166" maxY="188" name="kiosk-l"/>
-  <symbol minX="330" maxX="352" minY="166" maxY="188" name="kindergarten-m"/>
-  <symbol minX="352" maxX="374" minY="166" maxY="188" name="kindergarten-l"/>
+  <symbol minX="330" maxX="352" minY="166" maxY="188" name="volcano-l"/>
+  <symbol minX="352" maxX="374" minY="166" maxY="188" name="toilets-l"/>
   <symbol minX="374" maxX="396" minY="166" maxY="188" name="electronics-l"/>
-  <symbol minX="396" maxX="418" minY="166" maxY="188" name="jewelry-l"/>
+  <symbol minX="396" maxX="418" minY="166" maxY="188" name="kindergarten-m"/>
   <symbol minX="418" maxX="440" minY="166" maxY="188" name="embassy-l"/>
-  <symbol minX="440" maxX="462" minY="166" maxY="188" name="toll_booth-l"/>
-  <symbol minX="462" maxX="484" minY="166" maxY="188" name="volcano-l"/>
-  <symbol minX="484" maxX="506" minY="166" maxY="188" name="information-l"/>
-  <symbol minX="0" maxX="22" minY="188" maxY="210" name="vending-l"/>
+  <symbol minX="440" maxX="462" minY="166" maxY="188" name="kindergarten-l"/>
+  <symbol minX="462" maxX="484" minY="166" maxY="188" name="jewelry-l"/>
+  <symbol minX="484" maxX="506" minY="166" maxY="188" name="vending-l"/>
+  <symbol minX="0" maxX="22" minY="188" maxY="210" name="information-l"/>
   <symbol minX="22" maxX="44" minY="188" maxY="210" name="equestrian-l"/>
   <symbol minX="44" maxX="66" minY="188" maxY="210" name="equestrian-m"/>
   <symbol minX="66" maxX="88" minY="188" maxY="210" name="fastfood-l"/>
   <symbol minX="88" maxX="110" minY="188" maxY="210" name="hunting-tower-l"/>
-  <symbol minX="110" maxX="132" minY="188" maxY="210" name="hotel-l"/>
+  <symbol minX="110" maxX="132" minY="188" maxY="210" name="tram-l"/>
   <symbol minX="132" maxX="154" minY="188" maxY="210" name="fire_station-l"/>
-  <symbol minX="154" maxX="176" minY="188" maxY="210" name="tomb-l"/>
-  <symbol minX="176" maxX="198" minY="188" maxY="210" name="tram-l"/>
+  <symbol minX="154" maxX="176" minY="188" maxY="210" name="toll_booth-l"/>
+  <symbol minX="176" maxX="198" minY="188" maxY="210" name="hotel-l"/>
   <symbol minX="198" maxX="220" minY="188" maxY="210" name="florist-l"/>
   <symbol minX="220" maxX="242" minY="188" maxY="210" name="hospital-l"/>
   <symbol minX="242" maxX="264" minY="188" maxY="210" name="fountain-l"/>
   <symbol minX="264" maxX="286" minY="188" maxY="210" name="historic-ship-l"/>
-  <symbol minX="286" maxX="308" minY="188" maxY="210" name="heliport-l"/>
+  <symbol minX="286" maxX="308" minY="188" maxY="210" name="train-l"/>
   <symbol minX="308" maxX="330" minY="188" maxY="210" name="fuel-l copy"/>
   <symbol minX="330" maxX="352" minY="188" maxY="210" name="fuel-l"/>
-  <symbol minX="352" maxX="374" minY="188" maxY="210" name="tourism-l"/>
-  <symbol minX="374" maxX="396" minY="188" maxY="210" name="train-l"/>
+  <symbol minX="352" maxX="374" minY="188" maxY="210" name="tomb-l"/>
+  <symbol minX="374" maxX="396" minY="188" maxY="210" name="heliport-l"/>
   <symbol minX="396" maxX="418" minY="188" maxY="210" name="funicular-l"/>
   <symbol minX="418" maxX="440" minY="188" maxY="210" name="helipad-l"/>
-  <symbol minX="440" maxX="462" minY="188" maxY="210" name="hardware-l"/>
+  <symbol minX="440" maxX="462" minY="188" maxY="210" name="toys-l"/>
   <symbol minX="462" maxX="484" minY="188" maxY="210" name="furniture-l"/>
-  <symbol minX="484" maxX="506" minY="188" maxY="210" name="hand-m"/>
+  <symbol minX="484" maxX="506" minY="188" maxY="210" name="hardware-l"/>
   <symbol minX="0" maxX="22" minY="210" maxY="232" name="gallery-l"/>
-  <symbol minX="22" maxX="44" minY="210" maxY="232" name="hand-l"/>
-  <symbol minX="44" maxX="66" minY="210" maxY="232" name="toys-l"/>
+  <symbol minX="22" maxX="44" minY="210" maxY="232" name="hand-m"/>
+  <symbol minX="44" maxX="66" minY="210" maxY="232" name="hand-l"/>
   <symbol minX="66" maxX="88" minY="210" maxY="232" name="garden-l"/>
   <symbol minX="88" maxX="110" minY="210" maxY="232" name="hairdresser-l"/>
-  <symbol minX="110" maxX="132" minY="210" maxY="232" name="grocery-l"/>
+  <symbol minX="110" maxX="132" minY="210" maxY="232" name="townhall-l"/>
   <symbol minX="132" maxX="154" minY="210" maxY="232" name="garden_center-l"/>
-  <symbol minX="154" maxX="176" minY="210" maxY="232" name="greengrocer-l"/>
+  <symbol minX="154" maxX="176" minY="210" maxY="232" name="tourism-l"/>
   <symbol minX="176" maxX="198" minY="210" maxY="232" name="gate-l"/>
-  <symbol minX="198" maxX="220" minY="210" maxY="232" name="townhall-l"/>
+  <symbol minX="198" maxX="220" minY="210" maxY="232" name="grocery-l"/>
   <symbol minX="220" maxX="242" minY="210" maxY="232" name="gift-l"/>
-  <symbol minX="242" maxX="264" minY="210" maxY="232" name="shoes-l"/>
+  <symbol minX="242" maxX="264" minY="210" maxY="232" name="greengrocer-l"/>
   <symbol minX="264" maxX="286" minY="210" maxY="232" name="golf-l"/>
   <symbol minX="286" maxX="307" minY="210" maxY="231" name="golf-m"/>
-  <symbol minX="307" maxX="328" minY="210" maxY="231" name="gate-m"/>
-  <symbol minX="328" maxX="349" minY="210" maxY="231" name="garden_center-m"/>
+  <symbol minX="307" maxX="328" minY="210" maxY="231" name="tourism-m"/>
+  <symbol minX="328" maxX="349" minY="210" maxY="231" name="gift-m"/>
   <symbol minX="349" maxX="370" minY="210" maxY="231" name="greengrocer-m"/>
-  <symbol minX="370" maxX="391" minY="210" maxY="231" name="townhall-m"/>
+  <symbol minX="370" maxX="391" minY="210" maxY="231" name="gate-m"/>
   <symbol minX="391" maxX="412" minY="210" maxY="231" name="grocery-m"/>
-  <symbol minX="412" maxX="433" minY="210" maxY="231" name="tourism-m"/>
+  <symbol minX="412" maxX="433" minY="210" maxY="231" name="garden_center-m"/>
   <symbol minX="433" maxX="454" minY="210" maxY="231" name="garden-m"/>
   <symbol minX="454" maxX="475" minY="210" maxY="231" name="hairdresser-m"/>
-  <symbol minX="475" maxX="496" minY="210" maxY="231" name="gallery-m"/>
-  <symbol minX="0" maxX="21" minY="232" maxY="253" name="furniture-m"/>
-  <symbol minX="21" maxX="42" minY="232" maxY="253" name="toys-m"/>
+  <symbol minX="475" maxX="496" minY="210" maxY="231" name="townhall-m"/>
+  <symbol minX="0" maxX="21" minY="232" maxY="253" name="gallery-m"/>
+  <symbol minX="21" maxX="42" minY="232" maxY="253" name="furniture-m"/>
   <symbol minX="42" maxX="63" minY="232" maxY="253" name="hardware-m"/>
   <symbol minX="63" maxX="84" minY="232" maxY="253" name="funicular-m"/>
   <symbol minX="84" maxX="105" minY="232" maxY="253" name="helipad-m"/>
-  <symbol minX="105" maxX="126" minY="232" maxY="253" name="fuel-m"/>
-  <symbol minX="126" maxX="147" minY="232" maxY="253" name="train-m"/>
+  <symbol minX="105" maxX="126" minY="232" maxY="253" name="tomb-m"/>
+  <symbol minX="126" maxX="147" minY="232" maxY="253" name="toys-m"/>
   <symbol minX="147" maxX="168" minY="232" maxY="253" name="heliport-m"/>
-  <symbol minX="168" maxX="189" minY="232" maxY="253" name="tomb-m"/>
+  <symbol minX="168" maxX="189" minY="232" maxY="253" name="fuel-m"/>
   <symbol minX="189" maxX="210" minY="232" maxY="253" name="fountain-m"/>
   <symbol minX="210" maxX="231" minY="232" maxY="253" name="historic-ship-m"/>
   <symbol minX="231" maxX="252" minY="232" maxY="253" name="florist-m"/>
   <symbol minX="252" maxX="273" minY="232" maxY="253" name="hospital-m"/>
-  <symbol minX="273" maxX="294" minY="232" maxY="253" name="fire_station-m"/>
-  <symbol minX="294" maxX="315" minY="232" maxY="253" name="tram-m"/>
+  <symbol minX="273" maxX="294" minY="232" maxY="253" name="toll_booth-m"/>
+  <symbol minX="294" maxX="315" minY="232" maxY="253" name="train-m"/>
   <symbol minX="315" maxX="336" minY="232" maxY="253" name="hotel-m"/>
-  <symbol minX="336" maxX="357" minY="232" maxY="253" name="toll_booth-m"/>
+  <symbol minX="336" maxX="357" minY="232" maxY="253" name="fire_station-m"/>
   <symbol minX="357" maxX="378" minY="232" maxY="253" name="fastfood-m"/>
   <symbol minX="378" maxX="399" minY="232" maxY="253" name="hunting-tower-m"/>
-  <symbol minX="399" maxX="420" minY="232" maxY="253" name="vending-m"/>
+  <symbol minX="399" maxX="420" minY="232" maxY="253" name="tram-m"/>
   <symbol minX="420" maxX="441" minY="232" maxY="253" name="information-m"/>
-  <symbol minX="441" maxX="462" minY="232" maxY="253" name="embassy-m"/>
-  <symbol minX="462" maxX="483" minY="232" maxY="253" name="electronics-m"/>
+  <symbol minX="441" maxX="462" minY="232" maxY="253" name="toilets-m"/>
+  <symbol minX="462" maxX="483" minY="232" maxY="253" name="vending-m"/>
   <symbol minX="483" maxX="504" minY="232" maxY="253" name="jewelry-m"/>
-  <symbol minX="0" maxX="21" minY="253" maxY="274" name="drugs"/>
-  <symbol minX="21" maxX="42" minY="253" maxY="274" name="volcano-m"/>
-  <symbol minX="42" maxX="63" minY="253" maxY="274" name="toilets-m"/>
+  <symbol minX="0" maxX="21" minY="253" maxY="274" name="embassy-m"/>
+  <symbol minX="21" maxX="42" minY="253" maxY="274" name="electronics-m"/>
+  <symbol minX="42" maxX="63" minY="253" maxY="274" name="drugs"/>
   <symbol minX="63" maxX="84" minY="253" maxY="274" name="drinking-water-m"/>
   <symbol minX="84" maxX="105" minY="253" maxY="274" name="kiosk-m"/>
-  <symbol minX="105" maxX="126" minY="253" maxY="274" name="waterfall-m"/>
+  <symbol minX="105" maxX="126" minY="253" maxY="274" name="volcano-m"/>
   <symbol minX="126" maxX="147" minY="253" maxY="274" name="laundry-m"/>
-  <symbol minX="147" maxX="168" minY="253" maxY="274" name="doityourself-m"/>
+  <symbol minX="147" maxX="168" minY="253" maxY="274" name="waterfall-m"/>
   <symbol minX="168" maxX="189" minY="253" maxY="274" name="library-m"/>
-  <symbol minX="189" maxX="210" minY="253" maxY="274" name="dog_park-m"/>
-  <symbol minX="210" maxX="231" minY="253" maxY="274" name="diving-m"/>
+  <symbol minX="189" maxX="210" minY="253" maxY="274" name="theatre-m"/>
+  <symbol minX="210" maxX="231" minY="253" maxY="274" name="doityourself-m"/>
   <symbol minX="231" maxX="252" minY="253" maxY="274" name="lift_gate-m"/>
-  <symbol minX="252" maxX="273" minY="253" maxY="274" name="department_store-m"/>
+  <symbol minX="252" maxX="273" minY="253" maxY="274" name="dog_park-m"/>
   <symbol minX="273" maxX="294" minY="253" maxY="274" name="lighthouse-m"/>
-  <symbol minX="294" maxX="315" minY="253" maxY="274" name="theatre-m"/>
-  <symbol minX="315" maxX="336" minY="253" maxY="274" name="curling-m"/>
-  <symbol minX="336" maxX="357" minY="253" maxY="274" name="gift-m"/>
-  <symbol minX="357" maxX="378" minY="253" maxY="274" name="cricket-m"/>
-  <symbol minX="378" maxX="399" minY="253" maxY="274" name="convenience-m"/>
+  <symbol minX="294" maxX="315" minY="253" maxY="274" name="diving-m"/>
+  <symbol minX="315" maxX="336" minY="253" maxY="274" name="department_store-m"/>
+  <symbol minX="336" maxX="357" minY="253" maxY="274" name="ship-m"/>
+  <symbol minX="357" maxX="378" minY="253" maxY="274" name="tennis-m"/>
+  <symbol minX="378" maxX="399" minY="253" maxY="274" name="curling-m"/>
   <symbol minX="399" maxX="420" minY="253" maxY="274" name="mail-m"/>
-  <symbol minX="420" maxX="441" minY="253" maxY="274" name="tennis-m"/>
-  <symbol minX="441" maxX="462" minY="253" maxY="274" name="computer-m"/>
+  <symbol minX="420" maxX="441" minY="253" maxY="274" name="cricket-m"/>
+  <symbol minX="441" maxX="462" minY="253" maxY="274" name="convenience-m"/>
   <symbol minX="462" maxX="483" minY="253" maxY="274" name="marketplace-m"/>
-  <symbol minX="483" maxX="504" minY="253" maxY="274" name="wayside_cross-m"/>
-  <symbol minX="0" maxX="21" minY="274" maxY="295" name="taxi-m"/>
+  <symbol minX="483" maxX="504" minY="253" maxY="274" name="taxi-m"/>
+  <symbol minX="0" maxX="21" minY="274" maxY="295" name="computer-m"/>
   <symbol minX="21" maxX="42" minY="274" maxY="295" name="college-m"/>
   <symbol minX="42" maxX="63" minY="274" maxY="295" name="military-m"/>
-  <symbol minX="63" maxX="84" minY="274" maxY="295" name="clothes-m"/>
-  <symbol minX="84" maxX="105" minY="274" maxY="295" name="cinema-m"/>
+  <symbol minX="63" maxX="84" minY="274" maxY="295" name="swimming-m"/>
+  <symbol minX="84" maxX="105" minY="274" maxY="295" name="clothes-m"/>
   <symbol minX="105" maxX="126" minY="274" maxY="295" name="mobile_phone-m"/>
   <symbol minX="126" maxX="147" minY="274" maxY="295" name="atm-m"/>
   <symbol minX="147" maxX="168" minY="274" maxY="295" name="monument-m"/>
-  <symbol minX="168" maxX="189" minY="274" maxY="295" name="swimming-m"/>
-  <symbol minX="189" maxX="210" minY="274" maxY="295" name="chemist-m"/>
+  <symbol minX="168" maxX="189" minY="274" maxY="295" name="wayside_cross-m"/>
+  <symbol minX="189" maxX="210" minY="274" maxY="295" name="cinema-m"/>
   <symbol minX="210" maxX="231" minY="274" maxY="295" name="motel-m"/>
-  <symbol minX="231" maxX="252" minY="274" maxY="295" name="wayside_shrine-m"/>
+  <symbol minX="231" maxX="252" minY="274" maxY="295" name="chemist-m"/>
   <symbol minX="252" maxX="273" minY="274" maxY="295" name="museum-m"/>
-  <symbol minX="273" maxX="294" minY="274" maxY="295" name="cemetery-m"/>
-  <symbol minX="294" maxX="315" minY="274" maxY="295" name="sweets-m"/>
-  <symbol minX="315" maxX="336" minY="274" maxY="295" name="cave-m"/>
-  <symbol minX="336" maxX="357" minY="274" maxY="295" name="subway-spb-m"/>
-  <symbol minX="357" maxX="378" minY="274" maxY="295" name="windmill-m"/>
-  <symbol minX="378" maxX="399" minY="274" maxY="295" name="ship-m"/>
-  <symbol minX="399" maxX="420" minY="274" maxY="295" name="casino-m"/>
-  <symbol minX="420" maxX="441" minY="274" maxY="295" name="caravan_site-m"/>
+  <symbol minX="273" maxX="294" minY="274" maxY="295" name="sweets-m"/>
+  <symbol minX="294" maxX="315" minY="274" maxY="295" name="cemetery-m"/>
+  <symbol minX="315" maxX="336" minY="274" maxY="295" name="subway-spb-m"/>
+  <symbol minX="336" maxX="357" minY="274" maxY="295" name="wayside_shrine-m"/>
+  <symbol minX="357" maxX="378" minY="274" maxY="295" name="australian-football-m"/>
+  <symbol minX="378" maxX="399" minY="274" maxY="295" name="cave-m"/>
+  <symbol minX="399" maxX="420" minY="274" maxY="295" name="subway-newyork-m"/>
+  <symbol minX="420" maxX="441" minY="274" maxY="295" name="casino-m"/>
   <symbol minX="441" maxX="462" minY="274" maxY="295" name="npark-m"/>
-  <symbol minX="462" maxX="483" minY="274" maxY="295" name="subway-newyork-m"/>
+  <symbol minX="462" maxX="483" minY="274" maxY="295" name="caravan_site-m"/>
   <symbol minX="483" maxX="504" minY="274" maxY="295" name="car_sharing-m"/>
   <symbol minX="0" maxX="21" minY="295" maxY="316" name="nparkf-m"/>
-  <symbol minX="21" maxX="42" minY="295" maxY="316" name="car-repair-m"/>
-  <symbol minX="42" maxX="63" minY="295" maxY="316" name="zoo-m"/>
+  <symbol minX="21" maxX="42" minY="295" maxY="316" name="school-m"/>
+  <symbol minX="42" maxX="63" minY="295" maxY="316" name="windmill-m"/>
   <symbol minX="63" maxX="84" minY="295" maxY="316" name="office-m"/>
-  <symbol minX="84" maxX="105" minY="295" maxY="316" name="shoes-m"/>
-  <symbol minX="105" maxX="126" minY="295" maxY="316" name="campsite-m"/>
+  <symbol minX="84" maxX="105" minY="295" maxY="316" name="subway-m"/>
+  <symbol minX="105" maxX="126" minY="295" maxY="316" name="car-repair-m"/>
   <symbol minX="126" maxX="147" minY="295" maxY="316" name="optician-m"/>
-  <symbol minX="147" maxX="168" minY="295" maxY="316" name="cafe-m"/>
+  <symbol minX="147" maxX="168" minY="295" maxY="316" name="campsite-m"/>
   <symbol minX="168" maxX="189" minY="295" maxY="316" name="park-m"/>
-  <symbol minX="189" maxX="210" minY="295" maxY="316" name="subway-m"/>
-  <symbol minX="210" maxX="231" minY="295" maxY="316" name="school-m"/>
-  <symbol minX="231" maxX="252" minY="295" maxY="316" name="archery-m"/>
-  <symbol minX="252" maxX="273" minY="295" maxY="316" name="cable-car-m"/>
+  <symbol minX="189" maxX="210" minY="295" maxY="316" name="zoo-m"/>
+  <symbol minX="210" maxX="231" minY="295" maxY="316" name="bakery-m"/>
+  <symbol minX="231" maxX="252" minY="295" maxY="316" name="subway-entrance-m"/>
+  <symbol minX="252" maxX="273" minY="295" maxY="316" name="cafe-m"/>
   <symbol minX="273" maxX="294" minY="295" maxY="316" name="parking-meter-m"/>
-  <symbol minX="294" maxX="315" minY="295" maxY="316" name="subway-entrance-m"/>
+  <symbol minX="294" maxX="315" minY="295" maxY="316" name="cable-car-m"/>
   <symbol minX="315" maxX="336" minY="295" maxY="316" name="butcher-m"/>
   <symbol minX="336" maxX="357" minY="295" maxY="316" name="peak-m"/>
-  <symbol minX="357" maxX="378" minY="295" maxY="316" name="bus-m"/>
-  <symbol minX="378" maxX="399" minY="295" maxY="316" name="subway-entrance-2-m"/>
-  <symbol minX="399" maxX="420" minY="295" maxY="316" name="australian-football-m"/>
-  <symbol minX="420" maxX="441" minY="295" maxY="316" name="sports-m"/>
-  <symbol minX="441" maxX="462" minY="295" maxY="316" name="bowls-m"/>
+  <symbol minX="357" maxX="378" minY="295" maxY="316" name="subway-entrance-2-m"/>
+  <symbol minX="378" maxX="399" minY="295" maxY="316" name="shoes-m"/>
+  <symbol minX="399" maxX="420" minY="295" maxY="316" name="sports-m"/>
+  <symbol minX="420" maxX="441" minY="295" maxY="316" name="archery-m"/>
+  <symbol minX="441" maxX="462" minY="295" maxY="316" name="bus-m"/>
   <symbol minX="462" maxX="483" minY="295" maxY="316" name="pharmacy-m"/>
-  <symbol minX="483" maxX="504" minY="295" maxY="316" name="boundary_stone-m"/>
-  <symbol minX="0" maxX="21" minY="316" maxY="337" name="america-football-m"/>
+  <symbol minX="483" maxX="504" minY="295" maxY="316" name="bank-2-m"/>
+  <symbol minX="0" maxX="21" minY="316" maxY="337" name="bowls-m"/>
   <symbol minX="21" maxX="42" minY="316" maxY="337" name="phone-m"/>
-  <symbol minX="42" maxX="63" minY="316" maxY="337" name="bakery-m"/>
-  <symbol minX="63" maxX="84" minY="316" maxY="337" name="book-shop-m"/>
+  <symbol minX="42" maxX="63" minY="316" maxY="337" name="soccer-m"/>
+  <symbol minX="63" maxX="84" minY="316" maxY="337" name="boundary_stone-m"/>
   <symbol minX="84" maxX="105" minY="316" maxY="337" name="picnic-m"/>
-  <symbol minX="105" maxX="126" minY="316" maxY="337" name="soccer-m"/>
-  <symbol minX="126" maxX="147" minY="316" maxY="337" name="bicycle-m"/>
+  <symbol minX="105" maxX="126" minY="316" maxY="337" name="book-shop-m"/>
+  <symbol minX="126" maxX="147" minY="316" maxY="337" name="america-football-m"/>
   <symbol minX="147" maxX="168" minY="316" maxY="337" name="pitch-m"/>
-  <symbol minX="168" maxX="189" minY="316" maxY="337" name="alpine_hut-m"/>
-  <symbol minX="189" maxX="210" minY="316" maxY="337" name="beer-m"/>
+  <symbol minX="168" maxX="189" minY="316" maxY="337" name="skiing-m"/>
+  <symbol minX="189" maxX="210" minY="316" maxY="337" name="bicycle-m"/>
   <symbol minX="210" maxX="231" minY="316" maxY="337" name="place-of-worship-m"/>
-  <symbol minX="231" maxX="252" minY="316" maxY="337" name="skiing-m"/>
-  <symbol minX="252" maxX="273" minY="316" maxY="337" name="beauty-m"/>
+  <symbol minX="231" maxX="252" minY="316" maxY="337" name="alpine_hut-m"/>
+  <symbol minX="252" maxX="273" minY="316" maxY="337" name="beer-m"/>
   <symbol minX="273" maxX="294" minY="316" maxY="337" name="police-m"/>
-  <symbol minX="294" maxX="315" minY="316" maxY="337" name="beach-m"/>
-  <symbol minX="315" maxX="336" minY="316" maxY="337" name="alcohol-m"/>
+  <symbol minX="294" maxX="315" minY="316" maxY="337" name="shop-m"/>
+  <symbol minX="315" maxX="336" minY="316" maxY="337" name="beauty-m"/>
   <symbol minX="336" maxX="357" minY="316" maxY="337" name="postbox-m"/>
-  <symbol minX="357" maxX="378" minY="316" maxY="337" name="bcontrol-m"/>
-  <symbol minX="378" maxX="399" minY="316" maxY="337" name="bbq-m"/>
-  <symbol minX="399" maxX="420" minY="316" maxY="337" name="shop-bicycle-m"/>
+  <symbol minX="357" maxX="378" minY="316" maxY="337" name="beach-m"/>
+  <symbol minX="378" maxX="399" minY="316" maxY="337" name="bcontrol-m"/>
+  <symbol minX="399" maxX="420" minY="316" maxY="337" name="bbq-m"/>
   <symbol minX="420" maxX="441" minY="316" maxY="337" name="pub-m"/>
-  <symbol minX="441" maxX="462" minY="316" maxY="337" name="shop-m"/>
-  <symbol minX="462" maxX="483" minY="316" maxY="337" name="shop-m copy"/>
+  <symbol minX="441" maxX="462" minY="316" maxY="337" name="shop-m copy"/>
+  <symbol minX="462" maxX="483" minY="316" maxY="337" name="alcohol-m"/>
   <symbol minX="483" maxX="504" minY="316" maxY="337" name="basketball-m"/>
   <symbol minX="0" maxX="21" minY="337" maxY="358" name="recycling-m"/>
   <symbol minX="21" maxX="42" minY="337" maxY="358" name="baseball-m"/>
   <symbol minX="42" maxX="63" minY="337" maxY="358" name="bar-m"/>
   <symbol minX="63" maxX="84" minY="337" maxY="358" name="remains-m"/>
-  <symbol minX="84" maxX="105" minY="337" maxY="358" name="banknote-m"/>
-  <symbol minX="105" maxX="126" minY="337" maxY="358" name="bank-2-m"/>
+  <symbol minX="84" maxX="105" minY="337" maxY="358" name="shop-bicycle-m"/>
+  <symbol minX="105" maxX="126" minY="337" maxY="358" name="banknote-m"/>
   <symbol minX="126" maxX="147" minY="337" maxY="358" name="restaurant-m"/>
-  <symbol minX="147" maxX="167" minY="337" maxY="357" name="lightrail-berlin-m"/>
-  <symbol minX="167" maxX="187" minY="337" maxY="357" name="speedcam-l"/>
-  <symbol minX="187" maxX="207" minY="337" maxY="357" name="subway-berlin-l"/>
-  <symbol minX="207" maxX="227" minY="337" maxY="357" name="parking-l"/>
+  <symbol minX="147" maxX="167" minY="337" maxY="357" name="speedcam-l"/>
+  <symbol minX="167" maxX="187" minY="337" maxY="357" name="subway-berlin-l"/>
+  <symbol minX="187" maxX="207" minY="337" maxY="357" name="parking-l"/>
+  <symbol minX="207" maxX="227" minY="337" maxY="357" name="lightrail-berlin-m"/>
   <symbol minX="227" maxX="247" minY="337" maxY="357" name="subway-rome-l"/>
   <symbol minX="247" maxX="267" minY="337" maxY="357" name="watch-my-position"/>
-  <symbol minX="267" maxX="286" minY="337" maxY="356" name="route_from"/>
-  <symbol minX="286" maxX="308" minY="337" maxY="356" name="subway-moscow-l"/>
-  <symbol minX="308" maxX="326" minY="337" maxY="355" name="no-icon-leisure"/>
-  <symbol minX="326" maxX="344" minY="337" maxY="355" name="airport-s"/>
-  <symbol minX="344" maxX="362" minY="337" maxY="355" name="current-position"/>
-  <symbol minX="362" maxX="380" minY="337" maxY="355" name="no-icon-amenity"/>
-  <symbol minX="380" maxX="398" minY="337" maxY="355" name="no-icon-shop"/>
-  <symbol minX="398" maxX="416" minY="337" maxY="355" name="no-icon-tourism"/>
-  <symbol minX="416" maxX="434" minY="337" maxY="355" name="subway-rome-m"/>
-  <symbol minX="434" maxX="452" minY="337" maxY="355" name="no-icon"/>
-  <symbol minX="452" maxX="470" minY="337" maxY="355" name="subway-paris-m"/>
-  <symbol minX="470" maxX="491" minY="337" maxY="355" name="subway-moscow-m"/>
-  <symbol minX="0" maxX="22" minY="358" maxY="376" name="subway-london-l"/>
-  <symbol minX="22" maxX="40" minY="358" maxY="376" name="subway-berlin-m"/>
-  <symbol minX="40" maxX="57" minY="358" maxY="375" name="skiing-s"/>
-  <symbol minX="57" maxX="74" minY="358" maxY="375" name="pitch-s"/>
-  <symbol minX="74" maxX="91" minY="358" maxY="375" name="picnic-s"/>
-  <symbol minX="91" maxX="108" minY="358" maxY="375" name="soccer-s"/>
-  <symbol minX="108" maxX="125" minY="358" maxY="375" name="phone-s"/>
-  <symbol minX="125" maxX="142" minY="358" maxY="375" name="speedcam-m"/>
-  <symbol minX="142" maxX="159" minY="358" maxY="375" name="atm-s copy 2"/>
-  <symbol minX="159" maxX="176" minY="358" maxY="375" name="pharmacy-s"/>
-  <symbol minX="176" maxX="193" minY="358" maxY="375" name="atm-s"/>
-  <symbol minX="193" maxX="210" minY="358" maxY="375" name="bar-s"/>
-  <symbol minX="210" maxX="227" minY="358" maxY="375" name="school-s"/>
-  <symbol minX="227" maxX="244" minY="358" maxY="375" name="baseball-s"/>
-  <symbol minX="244" maxX="261" minY="358" maxY="375" name="basketball-s"/>
-  <symbol minX="261" maxX="278" minY="358" maxY="375" name="bcontrol-s"/>
-  <symbol minX="278" maxX="298" minY="358" maxY="375" name="subway-barcelona-s"/>
-  <symbol minX="298" maxX="315" minY="358" maxY="375" name="alcohol-s"/>
-  <symbol minX="315" maxX="332" minY="358" maxY="375" name="place-of-worship-s"/>
-  <symbol minX="332" maxX="349" minY="358" maxY="375" name="beer-s"/>
-  <symbol minX="349" maxX="366" minY="358" maxY="375" name="bicycle-s"/>
-  <symbol minX="366" maxX="383" minY="358" maxY="375" name="subway-entrance-2-s"/>
-  <symbol minX="383" maxX="400" minY="358" maxY="375" name="subway-entrance-arrow"/>
-  <symbol minX="400" maxX="417" minY="358" maxY="375" name="peak-s"/>
-  <symbol minX="417" maxX="434" minY="358" maxY="375" name="book-shop-s"/>
-  <symbol minX="434" maxX="451" minY="358" maxY="375" name="subway-entrance-s"/>
-  <symbol minX="451" maxX="468" minY="358" maxY="375" name="america-football-s"/>
-  <symbol minX="468" maxX="485" minY="358" maxY="375" name="bus-s"/>
-  <symbol minX="485" maxX="502" minY="358" maxY="375" name="cable-car-s"/>
-  <symbol minX="0" maxX="17" minY="376" maxY="393" name="cafe-s"/>
-  <symbol minX="17" maxX="34" minY="376" maxY="393" name="police-s"/>
-  <symbol minX="34" maxX="55" minY="376" maxY="393" name="subway-london-m"/>
-  <symbol minX="55" maxX="72" minY="376" maxY="393" name="zoo-s"/>
-  <symbol minX="72" maxX="89" minY="376" maxY="393" name="park-s"/>
-  <symbol minX="89" maxX="106" minY="376" maxY="393" name="campsite-s"/>
-  <symbol minX="106" maxX="123" minY="376" maxY="393" name="car-repair-s"/>
-  <symbol minX="123" maxX="140" minY="376" maxY="393" name="windmill-s"/>
-  <symbol minX="140" maxX="157" minY="376" maxY="393" name="casino-s"/>
-  <symbol minX="157" maxX="174" minY="376" maxY="393" name="cave-s"/>
-  <symbol minX="174" maxX="191" minY="376" maxY="393" name="cemetery-s"/>
-  <symbol minX="191" maxX="208" minY="376" maxY="393" name="office-s"/>
-  <symbol minX="208" maxX="225" minY="376" maxY="393" name="shop-s"/>
-  <symbol minX="225" maxX="242" minY="376" maxY="393" name="cinema-s"/>
-  <symbol minX="242" maxX="259" minY="376" maxY="393" name="nparkf-s"/>
-  <symbol minX="259" maxX="276" minY="376" maxY="393" name="npark-s"/>
-  <symbol minX="276" maxX="293" minY="376" maxY="393" name="subway-newyork-s"/>
-  <symbol minX="293" maxX="310" minY="376" maxY="393" name="college-s"/>
-  <symbol minX="310" maxX="327" minY="376" maxY="393" name="waterfall-s"/>
-  <symbol minX="327" maxX="344" minY="376" maxY="393" name="shop-s copy"/>
-  <symbol minX="344" maxX="361" minY="376" maxY="393" name="volcano-s"/>
-  <symbol minX="361" maxX="378" minY="376" maxY="393" name="pub-s"/>
-  <symbol minX="378" maxX="395" minY="376" maxY="393" name="drinking-water-s"/>
-  <symbol minX="395" maxX="412" minY="376" maxY="393" name="embassy-s"/>
-  <symbol minX="412" maxX="429" minY="376" maxY="393" name="subway-s"/>
-  <symbol minX="429" maxX="446" minY="376" maxY="393" name="recycling-s"/>
-  <symbol minX="446" maxX="463" minY="376" maxY="393" name="remains-s"/>
-  <symbol minX="463" maxX="480" minY="376" maxY="393" name="subway-spb-s"/>
-  <symbol minX="480" maxX="497" minY="376" maxY="393" name="tram-s"/>
-  <symbol minX="0" maxX="17" minY="393" maxY="410" name="fastfood-s"/>
-  <symbol minX="17" maxX="34" minY="393" maxY="410" name="fire_station-s"/>
-  <symbol minX="34" maxX="51" minY="393" maxY="410" name="train-s"/>
-  <symbol minX="51" maxX="68" minY="393" maxY="410" name="fountain-s"/>
-  <symbol minX="68" maxX="85" minY="393" maxY="410" name="ship-s"/>
-  <symbol minX="85" maxX="102" minY="393" maxY="410" name="restaurant-s"/>
-  <symbol minX="102" maxX="119" minY="393" maxY="410" name="museum-s"/>
-  <symbol minX="119" maxX="136" minY="393" maxY="410" name="monument-s"/>
-  <symbol minX="136" maxX="153" minY="393" maxY="410" name="swimming-s"/>
-  <symbol minX="153" maxX="170" minY="393" maxY="410" name="military-s"/>
-  <symbol minX="170" maxX="187" minY="393" maxY="410" name="fuel-s"/>
-  <symbol minX="187" maxX="204" minY="393" maxY="410" name="funicular-s"/>
-  <symbol minX="204" maxX="221" minY="393" maxY="410" name="mail-s"/>
-  <symbol minX="221" maxX="238" minY="393" maxY="410" name="tennis-s"/>
-  <symbol minX="238" maxX="255" minY="393" maxY="410" name="gallery-s"/>
-  <symbol minX="255" maxX="272" minY="393" maxY="410" name="lighthouse-s"/>
-  <symbol minX="272" maxX="289" minY="393" maxY="410" name="theatre-s"/>
-  <symbol minX="289" maxX="306" minY="393" maxY="410" name="library-s"/>
-  <symbol minX="306" maxX="323" minY="393" maxY="410" name="kindergarten-s"/>
-  <symbol minX="323" maxX="340" minY="393" maxY="410" name="toilets-s"/>
-  <symbol minX="340" maxX="357" minY="393" maxY="410" name="information-s"/>
-  <symbol minX="357" maxX="374" minY="393" maxY="410" name="hotel-s"/>
-  <symbol minX="374" maxX="391" minY="393" maxY="410" name="hospital-s"/>
-  <symbol minX="391" maxX="408" minY="393" maxY="410" name="heliport-s"/>
-  <symbol minX="408" maxX="425" minY="393" maxY="410" name="helipad-s"/>
-  <symbol minX="425" maxX="442" minY="393" maxY="410" name="grocery-s"/>
-  <symbol minX="442" maxX="459" minY="393" maxY="410" name="tourism-s"/>
-  <symbol minX="459" maxX="476" minY="393" maxY="410" name="golf-s"/>
-  <symbol minX="476" maxX="493" minY="393" maxY="410" name="garden-s"/>
-  <symbol minX="493" maxX="510" minY="393" maxY="410" name="townhall-s"/>
-  <symbol minX="0" maxX="22" minY="410" maxY="426" name="subway-barcelona-l"/>
-  <symbol minX="22" maxX="44" minY="410" maxY="426" name="metro-barcelona-m"/>
-  <symbol minX="44" maxX="66" minY="410" maxY="426" name="subway-barcelona-m"/>
-  <symbol minX="66" maxX="81" minY="410" maxY="426" name="s-arrow"/>
-  <symbol minX="81" maxX="97" minY="410" maxY="426" name="parking-m"/>
-  <symbol minX="97" maxX="119" minY="410" maxY="426" name="subway-madrid-l"/>
-  <symbol minX="119" maxX="141" minY="410" maxY="426" name="subway-madrid-m"/>
-  <symbol minX="141" maxX="161" minY="410" maxY="425" name="subway-madrid-s"/>
-  <symbol minX="161" maxX="176" minY="410" maxY="425" name="lightrail-berlin-s"/>
-  <symbol minX="176" maxX="196" minY="410" maxY="425" name="metro-barcelona-s"/>
-  <symbol minX="196" maxX="217" minY="410" maxY="425" name="subway-kiev-l"/>
-  <symbol minX="217" maxX="238" minY="410" maxY="425" name="subway-kiev-m"/>
-  <symbol minX="238" maxX="253" minY="410" maxY="425" name="api-result"/>
-  <symbol minX="253" maxX="268" minY="410" maxY="425" name="subway-moscow-s"/>
-  <symbol minX="268" maxX="283" minY="410" maxY="425" name="subway-paris-s"/>
-  <symbol minX="283" maxX="297" minY="410" maxY="424" name="speedcam-s"/>
-  <symbol minX="297" maxX="311" minY="410" maxY="424" name="subway-berlin-s"/>
-  <symbol minX="311" maxX="326" minY="410" maxY="424" name="bench"/>
-  <symbol minX="326" maxX="340" minY="410" maxY="424" name="star-l"/>
-  <symbol minX="340" maxX="354" minY="410" maxY="424" name="search-result"/>
-  <symbol minX="354" maxX="368" minY="410" maxY="424" name="parking-s"/>
-  <symbol minX="368" maxX="382" minY="410" maxY="424" name="subway-rome-s"/>
-  <symbol minX="382" maxX="399" minY="410" maxY="424" name="subway-london-s"/>
-  <symbol minX="399" maxX="412" minY="410" maxY="423" name="star-m"/>
-  <symbol minX="412" maxX="433" minY="410" maxY="423" name="subway-minsk-l"/>
-  <symbol minX="433" maxX="446" minY="410" maxY="423" name="survey_point-l"/>
-  <symbol minX="446" maxX="460" minY="410" maxY="423" name="peakt-l"/>
-  <symbol minX="460" maxX="472" minY="410" maxY="422" name="subway-xs"/>
-  <symbol minX="472" maxX="490" minY="410" maxY="422" name="subway-kiev-s"/>
-  <symbol minX="490" maxX="507" minY="410" maxY="422" name="railway-crossing"/>
-  <symbol minX="0" maxX="12" minY="426" maxY="438" name="subway-newyork-xs"/>
-  <symbol minX="12" maxX="24" minY="426" maxY="438" name="survey_point-m"/>
-  <symbol minX="24" maxX="42" minY="426" maxY="438" name="subway-minsk-m"/>
-  <symbol minX="42" maxX="54" minY="426" maxY="438" name="star-s"/>
-  <symbol minX="54" maxX="65" minY="426" maxY="437" name="subway-xs copy"/>
-  <symbol minX="65" maxX="82" minY="426" maxY="437" name="subway-minsk-s"/>
-  <symbol minX="82" maxX="102" minY="426" maxY="436" name="arrow-m"/>
-  <symbol minX="102" maxX="113" minY="426" maxY="436" name="peakt-m"/>
-  <symbol minX="113" maxX="123" minY="426" maxY="436" name="survey_point-s"/>
-  <symbol minX="123" maxX="132" minY="426" maxY="435" name="dot-m"/>
-  <symbol minX="132" maxX="141" minY="426" maxY="435" name="peakt-s"/>
-  <symbol minX="141" maxX="150" minY="426" maxY="435" name="entrance-s"/>
-  <symbol minX="150" maxX="158" minY="426" maxY="434" name="tree-l"/>
-  <symbol minX="158" maxX="166" minY="426" maxY="434" name="none"/>
-  <symbol minX="166" maxX="181" minY="426" maxY="434" name="arrow-s"/>
-  <symbol minX="181" maxX="188" minY="426" maxY="433" name="dot-s"/>
-  <symbol minX="188" maxX="195" minY="426" maxY="433" name="entrance-xs"/>
-  <symbol minX="195" maxX="202" minY="426" maxY="433" name="tree-m"/>
-  <symbol minX="202" maxX="209" minY="426" maxY="433" name="dot-s-light"/>
-  <symbol minX="209" maxX="215" minY="426" maxY="432" name="tree-s"/>
-  <symbol minX="215" maxX="221" minY="426" maxY="432" name="zero-icon"/>
+  <symbol minX="267" maxX="289" minY="337" maxY="356" name="subway-moscow-l"/>
+  <symbol minX="289" maxX="307" minY="337" maxY="355" name="no-icon-leisure"/>
+  <symbol minX="307" maxX="325" minY="337" maxY="355" name="airport-s"/>
+  <symbol minX="325" maxX="343" minY="337" maxY="355" name="current-position"/>
+  <symbol minX="343" maxX="361" minY="337" maxY="355" name="no-icon-amenity"/>
+  <symbol minX="361" maxX="379" minY="337" maxY="355" name="no-icon-shop"/>
+  <symbol minX="379" maxX="397" minY="337" maxY="355" name="subway-rome-m"/>
+  <symbol minX="397" maxX="415" minY="337" maxY="355" name="no-icon-tourism"/>
+  <symbol minX="415" maxX="433" minY="337" maxY="355" name="subway-paris-m"/>
+  <symbol minX="433" maxX="451" minY="337" maxY="355" name="no-icon"/>
+  <symbol minX="451" maxX="472" minY="337" maxY="355" name="subway-moscow-m"/>
+  <symbol minX="472" maxX="494" minY="337" maxY="355" name="subway-london-l"/>
+  <symbol minX="494" maxX="512" minY="337" maxY="355" name="subway-berlin-m"/>
+  <symbol minX="0" maxX="17" minY="358" maxY="375" name="pitch-s"/>
+  <symbol minX="17" maxX="34" minY="358" maxY="375" name="skiing-s"/>
+  <symbol minX="34" maxX="51" minY="358" maxY="375" name="picnic-s"/>
+  <symbol minX="51" maxX="68" minY="358" maxY="375" name="phone-s"/>
+  <symbol minX="68" maxX="85" minY="358" maxY="375" name="soccer-s"/>
+  <symbol minX="85" maxX="102" minY="358" maxY="375" name="pharmacy-s"/>
+  <symbol minX="102" maxX="119" minY="358" maxY="375" name="speedcam-m"/>
+  <symbol minX="119" maxX="136" minY="358" maxY="375" name="atm-s"/>
+  <symbol minX="136" maxX="153" minY="358" maxY="375" name="bar-s"/>
+  <symbol minX="153" maxX="170" minY="358" maxY="375" name="school-s"/>
+  <symbol minX="170" maxX="187" minY="358" maxY="375" name="baseball-s"/>
+  <symbol minX="187" maxX="204" minY="358" maxY="375" name="basketball-s"/>
+  <symbol minX="204" maxX="221" minY="358" maxY="375" name="alcohol-s"/>
+  <symbol minX="221" maxX="238" minY="358" maxY="375" name="bcontrol-s"/>
+  <symbol minX="238" maxX="255" minY="358" maxY="375" name="beer-s"/>
+  <symbol minX="255" maxX="275" minY="358" maxY="375" name="subway-barcelona-s"/>
+  <symbol minX="275" maxX="292" minY="358" maxY="375" name="bicycle-s"/>
+  <symbol minX="292" maxX="309" minY="358" maxY="375" name="place-of-worship-s"/>
+  <symbol minX="309" maxX="326" minY="358" maxY="375" name="america-football-s"/>
+  <symbol minX="326" maxX="343" minY="358" maxY="375" name="peak-s"/>
+  <symbol minX="343" maxX="360" minY="358" maxY="375" name="subway-entrance-2-s"/>
+  <symbol minX="360" maxX="377" minY="358" maxY="375" name="subway-entrance-arrow"/>
+  <symbol minX="377" maxX="394" minY="358" maxY="375" name="book-shop-s"/>
+  <symbol minX="394" maxX="411" minY="358" maxY="375" name="bus-s"/>
+  <symbol minX="411" maxX="428" minY="358" maxY="375" name="subway-entrance-s"/>
+  <symbol minX="428" maxX="445" minY="358" maxY="375" name="cable-car-s"/>
+  <symbol minX="445" maxX="462" minY="358" maxY="375" name="zoo-s"/>
+  <symbol minX="462" maxX="479" minY="358" maxY="375" name="cafe-s"/>
+  <symbol minX="479" maxX="496" minY="358" maxY="375" name="park-s"/>
+  <symbol minX="0" maxX="17" minY="375" maxY="392" name="shop-s"/>
+  <symbol minX="17" maxX="38" minY="375" maxY="392" name="subway-london-m"/>
+  <symbol minX="38" maxX="55" minY="375" maxY="392" name="campsite-s"/>
+  <symbol minX="55" maxX="72" minY="375" maxY="392" name="office-s"/>
+  <symbol minX="72" maxX="89" minY="375" maxY="392" name="windmill-s"/>
+  <symbol minX="89" maxX="106" minY="375" maxY="392" name="car-repair-s"/>
+  <symbol minX="106" maxX="123" minY="375" maxY="392" name="casino-s"/>
+  <symbol minX="123" maxX="140" minY="375" maxY="392" name="cave-s"/>
+  <symbol minX="140" maxX="157" minY="375" maxY="392" name="cemetery-s"/>
+  <symbol minX="157" maxX="174" minY="375" maxY="392" name="cinema-s"/>
+  <symbol minX="174" maxX="191" minY="375" maxY="392" name="nparkf-s"/>
+  <symbol minX="191" maxX="208" minY="375" maxY="392" name="shop-s copy"/>
+  <symbol minX="208" maxX="225" minY="375" maxY="392" name="college-s"/>
+  <symbol minX="225" maxX="242" minY="375" maxY="392" name="npark-s"/>
+  <symbol minX="242" maxX="259" minY="375" maxY="392" name="waterfall-s"/>
+  <symbol minX="259" maxX="276" minY="375" maxY="392" name="subway-newyork-s"/>
+  <symbol minX="276" maxX="293" minY="375" maxY="392" name="volcano-s"/>
+  <symbol minX="293" maxX="310" minY="375" maxY="392" name="police-s"/>
+  <symbol minX="310" maxX="327" minY="375" maxY="392" name="pub-s"/>
+  <symbol minX="327" maxX="344" minY="375" maxY="392" name="drinking-water-s"/>
+  <symbol minX="344" maxX="361" minY="375" maxY="392" name="embassy-s"/>
+  <symbol minX="361" maxX="378" minY="375" maxY="392" name="recycling-s"/>
+  <symbol minX="378" maxX="395" minY="375" maxY="392" name="tram-s"/>
+  <symbol minX="395" maxX="412" minY="375" maxY="392" name="subway-s"/>
+  <symbol minX="412" maxX="429" minY="375" maxY="392" name="remains-s"/>
+  <symbol minX="429" maxX="446" minY="375" maxY="392" name="ship-s"/>
+  <symbol minX="446" maxX="463" minY="375" maxY="392" name="subway-spb-s"/>
+  <symbol minX="463" maxX="480" minY="375" maxY="392" name="fastfood-s"/>
+  <symbol minX="480" maxX="497" minY="375" maxY="392" name="train-s"/>
+  <symbol minX="0" maxX="17" minY="392" maxY="409" name="fire_station-s"/>
+  <symbol minX="17" maxX="34" minY="392" maxY="409" name="fountain-s"/>
+  <symbol minX="34" maxX="51" minY="392" maxY="409" name="fuel-s"/>
+  <symbol minX="51" maxX="68" minY="392" maxY="409" name="restaurant-s"/>
+  <symbol minX="68" maxX="85" minY="392" maxY="409" name="museum-s"/>
+  <symbol minX="85" maxX="102" minY="392" maxY="409" name="monument-s"/>
+  <symbol minX="102" maxX="119" minY="392" maxY="409" name="military-s"/>
+  <symbol minX="119" maxX="136" minY="392" maxY="409" name="swimming-s"/>
+  <symbol minX="136" maxX="153" minY="392" maxY="409" name="funicular-s"/>
+  <symbol minX="153" maxX="170" minY="392" maxY="409" name="townhall-s"/>
+  <symbol minX="170" maxX="187" minY="392" maxY="409" name="mail-s"/>
+  <symbol minX="187" maxX="204" minY="392" maxY="409" name="atm-s copy 2"/>
+  <symbol minX="204" maxX="221" minY="392" maxY="409" name="tennis-s"/>
+  <symbol minX="221" maxX="238" minY="392" maxY="409" name="lighthouse-s"/>
+  <symbol minX="238" maxX="255" minY="392" maxY="409" name="library-s"/>
+  <symbol minX="255" maxX="272" minY="392" maxY="409" name="theatre-s"/>
+  <symbol minX="272" maxX="289" minY="392" maxY="409" name="kindergarten-s"/>
+  <symbol minX="289" maxX="306" minY="392" maxY="409" name="information-s"/>
+  <symbol minX="306" maxX="323" minY="392" maxY="409" name="toilets-s"/>
+  <symbol minX="323" maxX="340" minY="392" maxY="409" name="hotel-s"/>
+  <symbol minX="340" maxX="357" minY="392" maxY="409" name="hospital-s"/>
+  <symbol minX="357" maxX="374" minY="392" maxY="409" name="heliport-s"/>
+  <symbol minX="374" maxX="391" minY="392" maxY="409" name="helipad-s"/>
+  <symbol minX="391" maxX="408" minY="392" maxY="409" name="grocery-s"/>
+  <symbol minX="408" maxX="425" minY="392" maxY="409" name="golf-s"/>
+  <symbol minX="425" maxX="442" minY="392" maxY="409" name="tourism-s"/>
+  <symbol minX="442" maxX="459" minY="392" maxY="409" name="garden-s"/>
+  <symbol minX="459" maxX="476" minY="392" maxY="409" name="gallery-s"/>
+  <symbol minX="476" maxX="498" minY="392" maxY="408" name="metro-barcelona-m"/>
+  <symbol minX="0" maxX="16" minY="409" maxY="425" name="route_from"/>
+  <symbol minX="16" maxX="38" minY="409" maxY="425" name="subway-barcelona-l"/>
+  <symbol minX="38" maxX="60" minY="409" maxY="425" name="subway-barcelona-m"/>
+  <symbol minX="60" maxX="76" minY="409" maxY="425" name="parking-m"/>
+  <symbol minX="76" maxX="91" minY="409" maxY="425" name="s-arrow"/>
+  <symbol minX="91" maxX="113" minY="409" maxY="425" name="subway-madrid-l"/>
+  <symbol minX="113" maxX="135" minY="409" maxY="425" name="subway-madrid-m"/>
+  <symbol minX="135" maxX="156" minY="409" maxY="424" name="subway-kiev-m"/>
+  <symbol minX="156" maxX="176" minY="409" maxY="424" name="metro-barcelona-s"/>
+  <symbol minX="176" maxX="197" minY="409" maxY="424" name="subway-kiev-l"/>
+  <symbol minX="197" maxX="212" minY="409" maxY="424" name="api-result"/>
+  <symbol minX="212" maxX="227" minY="409" maxY="424" name="lightrail-berlin-s"/>
+  <symbol minX="227" maxX="247" minY="409" maxY="424" name="subway-madrid-s"/>
+  <symbol minX="247" maxX="262" minY="409" maxY="424" name="subway-paris-s"/>
+  <symbol minX="262" maxX="277" minY="409" maxY="424" name="subway-moscow-s"/>
+  <symbol minX="277" maxX="291" minY="409" maxY="423" name="subway-rome-s"/>
+  <symbol minX="291" maxX="305" minY="409" maxY="423" name="speedcam-s"/>
+  <symbol minX="305" maxX="319" minY="409" maxY="423" name="search-result"/>
+  <symbol minX="319" maxX="333" minY="409" maxY="423" name="star-l"/>
+  <symbol minX="333" maxX="347" minY="409" maxY="423" name="parking-s"/>
+  <symbol minX="347" maxX="362" minY="409" maxY="423" name="bench"/>
+  <symbol minX="362" maxX="379" minY="409" maxY="423" name="subway-london-s"/>
+  <symbol minX="379" maxX="393" minY="409" maxY="423" name="subway-berlin-s"/>
+  <symbol minX="393" maxX="414" minY="409" maxY="422" name="subway-minsk-l"/>
+  <symbol minX="414" maxX="427" minY="409" maxY="422" name="star-m"/>
+  <symbol minX="427" maxX="440" minY="409" maxY="422" name="survey_point-l"/>
+  <symbol minX="440" maxX="454" minY="409" maxY="422" name="peakt-l"/>
+  <symbol minX="454" maxX="466" minY="409" maxY="421" name="subway-newyork-xs"/>
+  <symbol minX="466" maxX="484" minY="409" maxY="421" name="subway-kiev-s"/>
+  <symbol minX="484" maxX="496" minY="409" maxY="421" name="star-s"/>
+  <symbol minX="496" maxX="508" minY="409" maxY="421" name="survey_point-m"/>
+  <symbol minX="0" maxX="12" minY="425" maxY="437" name="subway-xs"/>
+  <symbol minX="12" maxX="30" minY="425" maxY="437" name="subway-minsk-m"/>
+  <symbol minX="30" maxX="47" minY="425" maxY="437" name="railway-crossing"/>
+  <symbol minX="47" maxX="64" minY="425" maxY="436" name="subway-minsk-s"/>
+  <symbol minX="64" maxX="75" minY="425" maxY="436" name="subway-xs copy"/>
+  <symbol minX="75" maxX="95" minY="425" maxY="435" name="arrow-m"/>
+  <symbol minX="95" maxX="106" minY="425" maxY="435" name="peakt-m"/>
+  <symbol minX="106" maxX="116" minY="425" maxY="435" name="survey_point-s"/>
+  <symbol minX="116" maxX="125" minY="425" maxY="434" name="entrance-s"/>
+  <symbol minX="125" maxX="134" minY="425" maxY="434" name="peakt-s"/>
+  <symbol minX="134" maxX="143" minY="425" maxY="434" name="dot-m"/>
+  <symbol minX="143" maxX="151" minY="425" maxY="433" name="tree-l"/>
+  <symbol minX="151" maxX="166" minY="425" maxY="433" name="arrow-s"/>
+  <symbol minX="166" maxX="174" minY="425" maxY="433" name="none"/>
+  <symbol minX="174" maxX="181" minY="425" maxY="432" name="entrance-xs"/>
+  <symbol minX="181" maxX="188" minY="425" maxY="432" name="tree-m"/>
+  <symbol minX="188" maxX="195" minY="425" maxY="432" name="dot-s"/>
+  <symbol minX="195" maxX="202" minY="425" maxY="432" name="dot-s-light"/>
+  <symbol minX="202" maxX="208" minY="425" maxY="431" name="tree-s"/>
+  <symbol minX="208" maxX="214" minY="425" maxY="431" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi/symbols.png b/data/resources-xhdpi/symbols.png
index 692ec388c5..56b2f16684 100644
--- a/data/resources-xhdpi/symbols.png
+++ b/data/resources-xhdpi/symbols.png
diff --git a/data/resources-xhdpi/symbols.sdf b/data/resources-xhdpi/symbols.sdf
index e303764fa1..fa66ddc9c5 100644
--- a/data/resources-xhdpi/symbols.sdf
+++ b/data/resources-xhdpi/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="512" width="1024">
+ <file width="1024" height="512">
   <symbol minX="0" maxX="138" minY="0" maxY="138" name="route_to"/>
   <symbol minX="138" maxX="408" minY="0" maxY="132" name="route-arrow"/>
   <symbol minX="408" maxX="524" minY="0" maxY="116" name="compass-image"/>
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/resources-xhdpi_clear/symbols.png
index 3ec3a9027f..2fd7be1b62 100644
--- a/data/resources-xhdpi_clear/symbols.png
+++ b/data/resources-xhdpi_clear/symbols.png
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/resources-xhdpi_clear/symbols.sdf
index da508c55fc..0c101e519c 100644
--- a/data/resources-xhdpi_clear/symbols.sdf
+++ b/data/resources-xhdpi_clear/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="1024" width="1024">
+ <file width="1024" height="1024">
   <symbol minX="0" maxX="138" minY="0" maxY="138" name="route_to"/>
   <symbol minX="138" maxX="408" minY="0" maxY="132" name="route-arrow"/>
   <symbol minX="408" maxX="524" minY="0" maxY="116" name="compass-image"/>
@@ -39,428 +39,428 @@
   <symbol minX="831" maxX="871" minY="138" maxY="178" name="bbq-l"/>
   <symbol minX="871" maxX="911" minY="138" maxY="178" name="wayside_cross-l"/>
   <symbol minX="911" maxX="951" minY="138" maxY="178" name="bcontrol-l"/>
-  <symbol minX="951" maxX="990" minY="138" maxY="178" name="bcontrol-m"/>
-  <symbol minX="0" maxX="39" minY="196" maxY="236" name="waterfall-m"/>
-  <symbol minX="39" maxX="79" minY="196" maxY="236" name="beach-l"/>
-  <symbol minX="79" maxX="119" minY="196" maxY="236" name="waterfall-l"/>
-  <symbol minX="119" maxX="159" minY="196" maxY="236" name="beauty-l"/>
-  <symbol minX="159" maxX="199" minY="196" maxY="236" name="volcano-l"/>
-  <symbol minX="199" maxX="239" minY="196" maxY="236" name="beer-l"/>
-  <symbol minX="239" maxX="278" minY="196" maxY="236" name="beer-m"/>
-  <symbol minX="278" maxX="318" minY="196" maxY="236" name="vending-l"/>
-  <symbol minX="318" maxX="358" minY="196" maxY="236" name="tram-l"/>
-  <symbol minX="358" maxX="398" minY="196" maxY="236" name="bicycle-l"/>
-  <symbol minX="398" maxX="438" minY="196" maxY="236" name="train-l"/>
-  <symbol minX="438" maxX="478" minY="196" maxY="236" name="toys-l"/>
-  <symbol minX="478" maxX="518" minY="196" maxY="236" name="book-shop-l"/>
-  <symbol minX="518" maxX="558" minY="196" maxY="236" name="townhall-l"/>
-  <symbol minX="558" maxX="598" minY="196" maxY="236" name="tourism-l"/>
-  <symbol minX="598" maxX="638" minY="196" maxY="236" name="boundary_stone-l"/>
-  <symbol minX="638" maxX="678" minY="196" maxY="236" name="tomb-l"/>
-  <symbol minX="678" maxX="718" minY="196" maxY="236" name="bowls-l"/>
-  <symbol minX="718" maxX="758" minY="196" maxY="236" name="toll_booth-l"/>
-  <symbol minX="758" maxX="798" minY="196" maxY="236" name="bus-l"/>
-  <symbol minX="798" maxX="838" minY="196" maxY="236" name="toilets-l"/>
-  <symbol minX="838" maxX="878" minY="196" maxY="236" name="theatre-l"/>
-  <symbol minX="878" maxX="918" minY="196" maxY="236" name="butcher-l"/>
-  <symbol minX="918" maxX="958" minY="196" maxY="236" name="tennis-l"/>
-  <symbol minX="958" maxX="998" minY="196" maxY="236" name="cable-car-l"/>
-  <symbol minX="0" maxX="40" minY="236" maxY="276" name="taxi-l"/>
-  <symbol minX="40" maxX="80" minY="236" maxY="276" name="swimming-l"/>
+  <symbol minX="951" maxX="990" minY="138" maxY="178" name="waterfall-m"/>
+  <symbol minX="0" maxX="40" minY="196" maxY="236" name="waterfall-l"/>
+  <symbol minX="40" maxX="80" minY="196" maxY="236" name="beach-l"/>
+  <symbol minX="80" maxX="120" minY="196" maxY="236" name="volcano-l"/>
+  <symbol minX="120" maxX="160" minY="196" maxY="236" name="beauty-l"/>
+  <symbol minX="160" maxX="200" minY="196" maxY="236" name="vending-l"/>
+  <symbol minX="200" maxX="240" minY="196" maxY="236" name="beer-l"/>
+  <symbol minX="240" maxX="280" minY="196" maxY="236" name="tram-l"/>
+  <symbol minX="280" maxX="320" minY="196" maxY="236" name="train-l"/>
+  <symbol minX="320" maxX="360" minY="196" maxY="236" name="toys-l"/>
+  <symbol minX="360" maxX="400" minY="196" maxY="236" name="bicycle-l"/>
+  <symbol minX="400" maxX="440" minY="196" maxY="236" name="townhall-l"/>
+  <symbol minX="440" maxX="480" minY="196" maxY="236" name="tourism-l"/>
+  <symbol minX="480" maxX="520" minY="196" maxY="236" name="book-shop-l"/>
+  <symbol minX="520" maxX="560" minY="196" maxY="236" name="tomb-l"/>
+  <symbol minX="560" maxX="600" minY="196" maxY="236" name="toll_booth-l"/>
+  <symbol minX="600" maxX="640" minY="196" maxY="236" name="boundary_stone-l"/>
+  <symbol minX="640" maxX="680" minY="196" maxY="236" name="toilets-l"/>
+  <symbol minX="680" maxX="720" minY="196" maxY="236" name="bowls-l"/>
+  <symbol minX="720" maxX="760" minY="196" maxY="236" name="theatre-l"/>
+  <symbol minX="760" maxX="800" minY="196" maxY="236" name="bus-l"/>
+  <symbol minX="800" maxX="840" minY="196" maxY="236" name="tennis-l"/>
+  <symbol minX="840" maxX="880" minY="196" maxY="236" name="taxi-l"/>
+  <symbol minX="880" maxX="920" minY="196" maxY="236" name="butcher-l"/>
+  <symbol minX="920" maxX="960" minY="196" maxY="236" name="swimming-l"/>
+  <symbol minX="960" maxX="1000" minY="196" maxY="236" name="cable-car-l"/>
+  <symbol minX="0" maxX="40" minY="236" maxY="276" name="sweets-l"/>
+  <symbol minX="40" maxX="80" minY="236" maxY="276" name="subway-spb-l"/>
   <symbol minX="80" maxX="120" minY="236" maxY="276" name="cafe-l"/>
-  <symbol minX="120" maxX="160" minY="236" maxY="276" name="sweets-l"/>
-  <symbol minX="160" maxX="200" minY="236" maxY="276" name="subway-spb-l"/>
+  <symbol minX="120" maxX="160" minY="236" maxY="276" name="subway-paris-l"/>
+  <symbol minX="160" maxX="200" minY="236" maxY="276" name="subway-newyork-l"/>
   <symbol minX="200" maxX="240" minY="236" maxY="276" name="campsite-l"/>
-  <symbol minX="240" maxX="280" minY="236" maxY="276" name="subway-paris-l"/>
-  <symbol minX="280" maxX="320" minY="236" maxY="276" name="subway-newyork-l"/>
+  <symbol minX="240" maxX="280" minY="236" maxY="276" name="subway-l"/>
+  <symbol minX="280" maxX="320" minY="236" maxY="276" name="subway-entrance-l"/>
   <symbol minX="320" maxX="360" minY="236" maxY="276" name="car-repair-l"/>
-  <symbol minX="360" maxX="399" minY="236" maxY="276" name="car-repair-m"/>
-  <symbol minX="399" maxX="439" minY="236" maxY="276" name="subway-l"/>
-  <symbol minX="439" maxX="479" minY="236" maxY="276" name="car_sharing-l"/>
-  <symbol minX="479" maxX="519" minY="236" maxY="276" name="subway-entrance-l"/>
-  <symbol minX="519" maxX="559" minY="236" maxY="276" name="caravan_site-l"/>
-  <symbol minX="559" maxX="599" minY="236" maxY="276" name="sports-l"/>
-  <symbol minX="599" maxX="639" minY="236" maxY="276" name="casino-l"/>
-  <symbol minX="639" maxX="679" minY="236" maxY="276" name="soccer-l"/>
-  <symbol minX="679" maxX="719" minY="236" maxY="276" name="skiing-l"/>
-  <symbol minX="719" maxX="759" minY="236" maxY="276" name="cave-l"/>
-  <symbol minX="759" maxX="799" minY="236" maxY="276" name="shop-l"/>
-  <symbol minX="799" maxX="839" minY="236" maxY="276" name="shop-bicycle-l"/>
-  <symbol minX="839" maxX="879" minY="236" maxY="276" name="cemetery-l"/>
-  <symbol minX="879" maxX="919" minY="236" maxY="276" name="shoes-l"/>
-  <symbol minX="919" maxX="959" minY="236" maxY="276" name="ship-l"/>
-  <symbol minX="959" maxX="999" minY="236" maxY="276" name="chemist-l"/>
-  <symbol minX="0" maxX="40" minY="276" maxY="316" name="school-l"/>
+  <symbol minX="360" maxX="400" minY="236" maxY="276" name="sports-l"/>
+  <symbol minX="400" maxX="440" minY="236" maxY="276" name="soccer-l"/>
+  <symbol minX="440" maxX="480" minY="236" maxY="276" name="car_sharing-l"/>
+  <symbol minX="480" maxX="520" minY="236" maxY="276" name="skiing-l"/>
+  <symbol minX="520" maxX="560" minY="236" maxY="276" name="caravan_site-l"/>
+  <symbol minX="560" maxX="600" minY="236" maxY="276" name="shop-l"/>
+  <symbol minX="600" maxX="640" minY="236" maxY="276" name="casino-l"/>
+  <symbol minX="640" maxX="680" minY="236" maxY="276" name="shop-bicycle-l"/>
+  <symbol minX="680" maxX="720" minY="236" maxY="276" name="shoes-l"/>
+  <symbol minX="720" maxX="760" minY="236" maxY="276" name="cave-l"/>
+  <symbol minX="760" maxX="800" minY="236" maxY="276" name="ship-l"/>
+  <symbol minX="800" maxX="840" minY="236" maxY="276" name="school-l"/>
+  <symbol minX="840" maxX="880" minY="236" maxY="276" name="cemetery-l"/>
+  <symbol minX="880" maxX="920" minY="236" maxY="276" name="restaurant-l"/>
+  <symbol minX="920" maxX="960" minY="236" maxY="276" name="remains-l"/>
+  <symbol minX="960" maxX="1000" minY="236" maxY="276" name="chemist-l"/>
+  <symbol minX="0" maxX="40" minY="276" maxY="316" name="recycling-l"/>
   <symbol minX="40" maxX="80" minY="276" maxY="316" name="cinema-l"/>
-  <symbol minX="80" maxX="120" minY="276" maxY="316" name="restaurant-l"/>
-  <symbol minX="120" maxX="159" minY="276" maxY="316" name="remains-m"/>
-  <symbol minX="159" maxX="199" minY="276" maxY="316" name="clothes-l"/>
-  <symbol minX="199" maxX="239" minY="276" maxY="316" name="remains-l"/>
-  <symbol minX="239" maxX="279" minY="276" maxY="316" name="college-l"/>
-  <symbol minX="279" maxX="319" minY="276" maxY="316" name="recycling-l"/>
-  <symbol minX="319" maxX="359" minY="276" maxY="316" name="pub-l"/>
-  <symbol minX="359" maxX="399" minY="276" maxY="316" name="computer-l"/>
-  <symbol minX="399" maxX="439" minY="276" maxY="316" name="power-m"/>
-  <symbol minX="439" maxX="479" minY="276" maxY="316" name="convenience-l"/>
-  <symbol minX="479" maxX="519" minY="276" maxY="316" name="power-l"/>
-  <symbol minX="519" maxX="559" minY="276" maxY="316" name="cricket-l"/>
-  <symbol minX="559" maxX="599" minY="276" maxY="316" name="postbox-l"/>
-  <symbol minX="599" maxX="639" minY="276" maxY="316" name="police-l"/>
-  <symbol minX="639" maxX="679" minY="276" maxY="316" name="place-of-worship-l"/>
-  <symbol minX="679" maxX="719" minY="276" maxY="316" name="pitch-l"/>
-  <symbol minX="719" maxX="759" minY="276" maxY="316" name="curling-l"/>
-  <symbol minX="759" maxX="798" minY="276" maxY="316" name="picnic-m"/>
-  <symbol minX="798" maxX="838" minY="276" maxY="316" name="department_store-l"/>
-  <symbol minX="838" maxX="878" minY="276" maxY="316" name="picnic-l"/>
-  <symbol minX="878" maxX="918" minY="276" maxY="316" name="diving-l"/>
-  <symbol minX="918" maxX="958" minY="276" maxY="316" name="phone-l"/>
-  <symbol minX="958" maxX="998" minY="276" maxY="316" name="dog_park-l"/>
-  <symbol minX="0" maxX="40" minY="316" maxY="356" name="pharmacy-l"/>
+  <symbol minX="80" maxX="120" minY="276" maxY="316" name="pub-l"/>
+  <symbol minX="120" maxX="160" minY="276" maxY="316" name="power-m"/>
+  <symbol minX="160" maxX="200" minY="276" maxY="316" name="clothes-l"/>
+  <symbol minX="200" maxX="240" minY="276" maxY="316" name="power-l"/>
+  <symbol minX="240" maxX="280" minY="276" maxY="316" name="college-l"/>
+  <symbol minX="280" maxX="320" minY="276" maxY="316" name="postbox-l"/>
+  <symbol minX="320" maxX="360" minY="276" maxY="316" name="police-l"/>
+  <symbol minX="360" maxX="400" minY="276" maxY="316" name="computer-l"/>
+  <symbol minX="400" maxX="440" minY="276" maxY="316" name="place-of-worship-l"/>
+  <symbol minX="440" maxX="480" minY="276" maxY="316" name="convenience-l"/>
+  <symbol minX="480" maxX="520" minY="276" maxY="316" name="pitch-l"/>
+  <symbol minX="520" maxX="560" minY="276" maxY="316" name="cricket-l"/>
+  <symbol minX="560" maxX="600" minY="276" maxY="316" name="picnic-l"/>
+  <symbol minX="600" maxX="640" minY="276" maxY="316" name="phone-l"/>
+  <symbol minX="640" maxX="680" minY="276" maxY="316" name="pharmacy-l"/>
+  <symbol minX="680" maxX="720" minY="276" maxY="316" name="peak-l"/>
+  <symbol minX="720" maxX="760" minY="276" maxY="316" name="curling-l"/>
+  <symbol minX="760" maxX="800" minY="276" maxY="316" name="parking-meter-l"/>
+  <symbol minX="800" maxX="840" minY="276" maxY="316" name="department_store-l"/>
+  <symbol minX="840" maxX="880" minY="276" maxY="316" name="park-l"/>
+  <symbol minX="880" maxX="920" minY="276" maxY="316" name="diving-l"/>
+  <symbol minX="920" maxX="960" minY="276" maxY="316" name="optician-l"/>
+  <symbol minX="960" maxX="1000" minY="276" maxY="316" name="dog_park-l"/>
+  <symbol minX="0" maxX="40" minY="316" maxY="356" name="office-l"/>
   <symbol minX="40" maxX="80" minY="316" maxY="356" name="doityourself-l"/>
-  <symbol minX="80" maxX="120" minY="316" maxY="356" name="parking-meter-l"/>
-  <symbol minX="120" maxX="160" minY="316" maxY="356" name="park-l"/>
-  <symbol minX="160" maxX="200" minY="316" maxY="356" name="optician-l"/>
-  <symbol minX="200" maxX="239" minY="316" maxY="356" name="office-m"/>
-  <symbol minX="239" maxX="279" minY="316" maxY="356" name="drinking-water-l"/>
-  <symbol minX="279" maxX="319" minY="316" maxY="356" name="office-l"/>
-  <symbol minX="319" maxX="359" minY="316" maxY="356" name="nparkf-l"/>
-  <symbol minX="359" maxX="399" minY="316" maxY="356" name="npark-l"/>
-  <symbol minX="399" maxX="439" minY="316" maxY="356" name="electronics-l"/>
-  <symbol minX="439" maxX="479" minY="316" maxY="356" name="mobile_phone-l"/>
-  <symbol minX="479" maxX="519" minY="316" maxY="356" name="embassy-l"/>
-  <symbol minX="519" maxX="559" minY="316" maxY="356" name="museum-l"/>
-  <symbol minX="559" maxX="599" minY="316" maxY="356" name="motel-l"/>
-  <symbol minX="599" maxX="639" minY="316" maxY="356" name="monument-l"/>
-  <symbol minX="639" maxX="679" minY="316" maxY="356" name="military-l"/>
-  <symbol minX="679" maxX="719" minY="316" maxY="356" name="equestrian-l"/>
-  <symbol minX="719" maxX="759" minY="316" maxY="356" name="equestrian-m"/>
-  <symbol minX="759" maxX="799" minY="316" maxY="356" name="marketplace-l"/>
-  <symbol minX="799" maxX="839" minY="316" maxY="356" name="fastfood-l"/>
-  <symbol minX="839" maxX="879" minY="316" maxY="356" name="mail-l"/>
-  <symbol minX="879" maxX="919" minY="316" maxY="356" name="lightrail-berlin-l"/>
-  <symbol minX="919" maxX="959" minY="316" maxY="356" name="fire_station-l"/>
-  <symbol minX="959" maxX="999" minY="316" maxY="356" name="lighthouse-l"/>
-  <symbol minX="0" maxX="40" minY="356" maxY="396" name="lift_gate-l"/>
+  <symbol minX="80" maxX="120" minY="316" maxY="356" name="nparkf-l"/>
+  <symbol minX="120" maxX="160" minY="316" maxY="356" name="npark-l"/>
+  <symbol minX="160" maxX="200" minY="316" maxY="356" name="mobile_phone-l"/>
+  <symbol minX="200" maxX="240" minY="316" maxY="356" name="museum-l"/>
+  <symbol minX="240" maxX="280" minY="316" maxY="356" name="drinking-water-l"/>
+  <symbol minX="280" maxX="320" minY="316" maxY="356" name="motel-l"/>
+  <symbol minX="320" maxX="360" minY="316" maxY="356" name="monument-l"/>
+  <symbol minX="360" maxX="400" minY="316" maxY="356" name="military-l"/>
+  <symbol minX="400" maxX="440" minY="316" maxY="356" name="electronics-l"/>
+  <symbol minX="440" maxX="480" minY="316" maxY="356" name="marketplace-l"/>
+  <symbol minX="480" maxX="520" minY="316" maxY="356" name="embassy-l"/>
+  <symbol minX="520" maxX="560" minY="316" maxY="356" name="mail-l"/>
+  <symbol minX="560" maxX="600" minY="316" maxY="356" name="lightrail-berlin-l"/>
+  <symbol minX="600" maxX="640" minY="316" maxY="356" name="lighthouse-l"/>
+  <symbol minX="640" maxX="680" minY="316" maxY="356" name="lift_gate-l"/>
+  <symbol minX="680" maxX="720" minY="316" maxY="356" name="equestrian-l"/>
+  <symbol minX="720" maxX="760" minY="316" maxY="356" name="equestrian-m"/>
+  <symbol minX="760" maxX="800" minY="316" maxY="356" name="library-l"/>
+  <symbol minX="800" maxX="840" minY="316" maxY="356" name="fastfood-l"/>
+  <symbol minX="840" maxX="880" minY="316" maxY="356" name="laundry-l"/>
+  <symbol minX="880" maxX="920" minY="316" maxY="356" name="kiosk-l"/>
+  <symbol minX="920" maxX="960" minY="316" maxY="356" name="fire_station-l"/>
+  <symbol minX="960" maxX="1000" minY="316" maxY="356" name="kindergarten-m"/>
+  <symbol minX="0" maxX="40" minY="356" maxY="396" name="kindergarten-l"/>
   <symbol minX="40" maxX="80" minY="356" maxY="396" name="florist-l"/>
-  <symbol minX="80" maxX="120" minY="356" maxY="396" name="library-l"/>
+  <symbol minX="80" maxX="120" minY="356" maxY="396" name="jewelry-l"/>
   <symbol minX="120" maxX="160" minY="356" maxY="396" name="fountain-l"/>
-  <symbol minX="160" maxX="199" minY="356" maxY="396" name="laundry-m"/>
-  <symbol minX="199" maxX="239" minY="356" maxY="396" name="laundry-l"/>
-  <symbol minX="239" maxX="279" minY="356" maxY="396" name="fuel-l"/>
-  <symbol minX="279" maxX="319" minY="356" maxY="396" name="kiosk-l"/>
-  <symbol minX="319" maxX="359" minY="356" maxY="396" name="kindergarten-m"/>
-  <symbol minX="359" maxX="399" minY="356" maxY="396" name="funicular-l"/>
-  <symbol minX="399" maxX="439" minY="356" maxY="396" name="kindergarten-l"/>
-  <symbol minX="439" maxX="479" minY="356" maxY="396" name="jewelry-l"/>
-  <symbol minX="479" maxX="519" minY="356" maxY="396" name="furniture-l"/>
-  <symbol minX="519" maxX="559" minY="356" maxY="396" name="information-l"/>
-  <symbol minX="559" maxX="599" minY="356" maxY="396" name="gallery-l"/>
-  <symbol minX="599" maxX="638" minY="356" maxY="396" name="hunting-tower-m"/>
-  <symbol minX="638" maxX="678" minY="356" maxY="396" name="hunting-tower-l"/>
-  <symbol minX="678" maxX="718" minY="356" maxY="396" name="garden-l"/>
-  <symbol minX="718" maxX="758" minY="356" maxY="396" name="hotel-l"/>
-  <symbol minX="758" maxX="798" minY="356" maxY="396" name="hospital-l"/>
-  <symbol minX="798" maxX="838" minY="356" maxY="396" name="garden_center-l"/>
-  <symbol minX="838" maxX="878" minY="356" maxY="396" name="historic-ship-l"/>
-  <symbol minX="878" maxX="918" minY="356" maxY="396" name="gate-l"/>
-  <symbol minX="918" maxX="957" minY="356" maxY="396" name="heliport-m"/>
-  <symbol minX="957" maxX="997" minY="356" maxY="396" name="gift-l"/>
-  <symbol minX="0" maxX="40" minY="396" maxY="436" name="heliport-l"/>
-  <symbol minX="40" maxX="80" minY="396" maxY="436" name="golf-l"/>
-  <symbol minX="80" maxX="120" minY="396" maxY="436" name="helipad-l"/>
-  <symbol minX="120" maxX="160" minY="396" maxY="436" name="hardware-l"/>
-  <symbol minX="160" maxX="200" minY="396" maxY="436" name="greengrocer-l"/>
-  <symbol minX="200" maxX="240" minY="396" maxY="436" name="hand-m"/>
-  <symbol minX="240" maxX="280" minY="396" maxY="436" name="grocery-l"/>
-  <symbol minX="280" maxX="320" minY="396" maxY="436" name="hand-l"/>
-  <symbol minX="320" maxX="360" minY="396" maxY="436" name="hairdresser-l"/>
-  <symbol minX="360" maxX="399" minY="396" maxY="435" name="shoes-m"/>
-  <symbol minX="399" maxX="438" minY="396" maxY="435" name="hairdresser-m"/>
-  <symbol minX="438" maxX="477" minY="396" maxY="435" name="grocery-m"/>
-  <symbol minX="477" maxX="516" minY="396" maxY="435" name="greengrocer-m"/>
-  <symbol minX="516" maxX="555" minY="396" maxY="435" name="australian-football-m"/>
-  <symbol minX="555" maxX="594" minY="396" maxY="435" name="casino-m"/>
-  <symbol minX="594" maxX="633" minY="396" maxY="435" name="hardware-m"/>
-  <symbol minX="633" maxX="672" minY="396" maxY="435" name="golf-m"/>
-  <symbol minX="672" maxX="711" minY="396" maxY="435" name="helipad-m"/>
-  <symbol minX="711" maxX="750" minY="396" maxY="435" name="bakery-m"/>
-  <symbol minX="750" maxX="789" minY="396" maxY="435" name="gift-m"/>
-  <symbol minX="789" maxX="828" minY="396" maxY="435" name="gate-m"/>
-  <symbol minX="828" maxX="867" minY="396" maxY="435" name="skiing-m"/>
-  <symbol minX="867" maxX="906" minY="396" maxY="435" name="garden_center-m"/>
-  <symbol minX="906" maxX="945" minY="396" maxY="435" name="historic-ship-m"/>
-  <symbol minX="945" maxX="984" minY="396" maxY="435" name="alcohol-m"/>
-  <symbol minX="984" maxX="1023" minY="396" maxY="435" name="hospital-m"/>
-  <symbol minX="0" maxX="39" minY="436" maxY="475" name="soccer-m"/>
-  <symbol minX="39" maxX="78" minY="436" maxY="475" name="garden-m"/>
+  <symbol minX="160" maxX="200" minY="356" maxY="396" name="information-l"/>
+  <symbol minX="200" maxX="240" minY="356" maxY="396" name="hunting-tower-l"/>
+  <symbol minX="240" maxX="280" minY="356" maxY="396" name="fuel-l"/>
+  <symbol minX="280" maxX="320" minY="356" maxY="396" name="hotel-l"/>
+  <symbol minX="320" maxX="360" minY="356" maxY="396" name="hospital-l"/>
+  <symbol minX="360" maxX="400" minY="356" maxY="396" name="funicular-l"/>
+  <symbol minX="400" maxX="440" minY="356" maxY="396" name="historic-ship-l"/>
+  <symbol minX="440" maxX="480" minY="356" maxY="396" name="heliport-l"/>
+  <symbol minX="480" maxX="520" minY="356" maxY="396" name="furniture-l"/>
+  <symbol minX="520" maxX="560" minY="356" maxY="396" name="helipad-l"/>
+  <symbol minX="560" maxX="600" minY="356" maxY="396" name="gallery-l"/>
+  <symbol minX="600" maxX="640" minY="356" maxY="396" name="hardware-l"/>
+  <symbol minX="640" maxX="680" minY="356" maxY="396" name="hand-m"/>
+  <symbol minX="680" maxX="720" minY="356" maxY="396" name="garden-l"/>
+  <symbol minX="720" maxX="760" minY="356" maxY="396" name="hand-l"/>
+  <symbol minX="760" maxX="800" minY="356" maxY="396" name="hairdresser-l"/>
+  <symbol minX="800" maxX="840" minY="356" maxY="396" name="garden_center-l"/>
+  <symbol minX="840" maxX="880" minY="356" maxY="396" name="grocery-l"/>
+  <symbol minX="880" maxX="920" minY="356" maxY="396" name="gate-l"/>
+  <symbol minX="920" maxX="960" minY="356" maxY="396" name="greengrocer-l"/>
+  <symbol minX="960" maxX="1000" minY="356" maxY="396" name="gift-l"/>
+  <symbol minX="0" maxX="40" minY="396" maxY="436" name="golf-l"/>
+  <symbol minX="40" maxX="79" minY="396" maxY="435" name="gift-m"/>
+  <symbol minX="79" maxX="118" minY="396" maxY="435" name="golf-m"/>
+  <symbol minX="118" maxX="157" minY="396" maxY="435" name="australian-football-m"/>
+  <symbol minX="157" maxX="196" minY="396" maxY="435" name="gate-m"/>
+  <symbol minX="196" maxX="235" minY="396" maxY="435" name="greengrocer-m"/>
+  <symbol minX="235" maxX="274" minY="396" maxY="435" name="garden_center-m"/>
+  <symbol minX="274" maxX="313" minY="396" maxY="435" name="grocery-m"/>
+  <symbol minX="313" maxX="352" minY="396" maxY="435" name="bakery-m"/>
+  <symbol minX="352" maxX="391" minY="396" maxY="435" name="alcohol-m"/>
+  <symbol minX="391" maxX="430" minY="396" maxY="435" name="hairdresser-m"/>
+  <symbol minX="430" maxX="469" minY="396" maxY="435" name="garden-m"/>
+  <symbol minX="469" maxX="508" minY="396" maxY="435" name="banknote-m"/>
+  <symbol minX="508" maxX="547" minY="396" maxY="435" name="alpine_hut-m"/>
+  <symbol minX="547" maxX="586" minY="396" maxY="435" name="gallery-m"/>
+  <symbol minX="586" maxX="625" minY="396" maxY="435" name="hardware-m"/>
+  <symbol minX="625" maxX="664" minY="396" maxY="435" name="furniture-m"/>
+  <symbol minX="664" maxX="703" minY="396" maxY="435" name="helipad-m"/>
+  <symbol minX="703" maxX="742" minY="396" maxY="435" name="bar-m"/>
+  <symbol minX="742" maxX="781" minY="396" maxY="435" name="america-football-m"/>
+  <symbol minX="781" maxX="820" minY="396" maxY="435" name="heliport-m"/>
+  <symbol minX="820" maxX="859" minY="396" maxY="435" name="archery-m"/>
+  <symbol minX="859" maxX="898" minY="396" maxY="435" name="funicular-m"/>
+  <symbol minX="898" maxX="937" minY="396" maxY="435" name="historic-ship-m"/>
+  <symbol minX="937" maxX="976" minY="396" maxY="435" name="baseball-m"/>
+  <symbol minX="976" maxX="1015" minY="396" maxY="435" name="hospital-m"/>
+  <symbol minX="0" maxX="39" minY="436" maxY="475" name="atm-m"/>
+  <symbol minX="39" maxX="78" minY="436" maxY="475" name="fuel-m"/>
   <symbol minX="78" maxX="117" minY="436" maxY="475" name="hotel-m"/>
-  <symbol minX="117" maxX="156" minY="436" maxY="475" name="banknote-m"/>
-  <symbol minX="156" maxX="195" minY="436" maxY="475" name="alpine_hut-m"/>
-  <symbol minX="195" maxX="234" minY="436" maxY="475" name="gallery-m"/>
-  <symbol minX="234" maxX="273" minY="436" maxY="475" name="shop-m"/>
-  <symbol minX="273" maxX="312" minY="436" maxY="475" name="furniture-m"/>
+  <symbol minX="117" maxX="156" minY="436" maxY="475" name="zoo-m"/>
+  <symbol minX="156" maxX="195" minY="436" maxY="475" name="windmill-m"/>
+  <symbol minX="195" maxX="234" minY="436" maxY="475" name="hunting-tower-m"/>
+  <symbol minX="234" maxX="273" minY="436" maxY="475" name="basketball-m"/>
+  <symbol minX="273" maxX="312" minY="436" maxY="475" name="fountain-m"/>
   <symbol minX="312" maxX="351" minY="436" maxY="475" name="information-m"/>
-  <symbol minX="351" maxX="390" minY="436" maxY="475" name="bar-m"/>
-  <symbol minX="390" maxX="429" minY="436" maxY="475" name="america-football-m"/>
+  <symbol minX="351" maxX="390" minY="436" maxY="475" name="wayside_shrine-m"/>
+  <symbol minX="390" maxX="429" minY="436" maxY="475" name="florist-m"/>
   <symbol minX="429" maxX="468" minY="436" maxY="475" name="jewelry-m"/>
-  <symbol minX="468" maxX="507" minY="436" maxY="475" name="funicular-m"/>
-  <symbol minX="507" maxX="546" minY="436" maxY="475" name="archery-m"/>
-  <symbol minX="546" maxX="585" minY="436" maxY="475" name="cave-m"/>
-  <symbol minX="585" maxX="624" minY="436" maxY="475" name="fuel-m"/>
+  <symbol minX="468" maxX="507" minY="436" maxY="475" name="wayside_cross-m"/>
+  <symbol minX="507" maxX="546" minY="436" maxY="475" name="fire_station-m"/>
+  <symbol minX="546" maxX="585" minY="436" maxY="475" name="bbq-m"/>
+  <symbol minX="585" maxX="624" minY="436" maxY="475" name="bcontrol-m"/>
   <symbol minX="624" maxX="663" minY="436" maxY="475" name="kiosk-m"/>
-  <symbol minX="663" maxX="702" minY="436" maxY="475" name="baseball-m"/>
-  <symbol minX="702" maxX="741" minY="436" maxY="475" name="fountain-m"/>
-  <symbol minX="741" maxX="780" minY="436" maxY="475" name="florist-m"/>
+  <symbol minX="663" maxX="702" minY="436" maxY="475" name="fastfood-m"/>
+  <symbol minX="702" maxX="741" minY="436" maxY="475" name="laundry-m"/>
+  <symbol minX="741" maxX="780" minY="436" maxY="475" name="volcano-m"/>
   <symbol minX="780" maxX="819" minY="436" maxY="475" name="library-m"/>
-  <symbol minX="819" maxX="858" minY="436" maxY="475" name="atm-m"/>
-  <symbol minX="858" maxX="897" minY="436" maxY="475" name="zoo-m"/>
+  <symbol minX="819" maxX="858" minY="436" maxY="475" name="beach-m"/>
+  <symbol minX="858" maxX="897" minY="436" maxY="475" name="vending-m"/>
   <symbol minX="897" maxX="936" minY="436" maxY="475" name="lift_gate-m"/>
-  <symbol minX="936" maxX="975" minY="436" maxY="475" name="fire_station-m"/>
+  <symbol minX="936" maxX="975" minY="436" maxY="475" name="beauty-m"/>
   <symbol minX="975" maxX="1014" minY="436" maxY="475" name="lighthouse-m"/>
-  <symbol minX="0" maxX="39" minY="475" maxY="514" name="windmill-m"/>
-  <symbol minX="39" maxX="78" minY="475" maxY="514" name="basketball-m"/>
-  <symbol minX="78" maxX="117" minY="475" maxY="514" name="shop-bicycle-m"/>
-  <symbol minX="117" maxX="156" minY="475" maxY="514" name="wayside_shrine-m"/>
-  <symbol minX="156" maxX="195" minY="475" maxY="514" name="fastfood-m"/>
+  <symbol minX="0" maxX="39" minY="475" maxY="514" name="tram-m"/>
+  <symbol minX="39" maxX="78" minY="475" maxY="514" name="beer-m"/>
+  <symbol minX="78" maxX="117" minY="475" maxY="514" name="train-m"/>
+  <symbol minX="117" maxX="156" minY="475" maxY="514" name="toys-m"/>
+  <symbol minX="156" maxX="195" minY="475" maxY="514" name="embassy-m"/>
   <symbol minX="195" maxX="234" minY="475" maxY="514" name="mail-m"/>
-  <symbol minX="234" maxX="273" minY="475" maxY="514" name="wayside_cross-m"/>
-  <symbol minX="273" maxX="312" minY="475" maxY="514" name="bbq-m"/>
+  <symbol minX="234" maxX="273" minY="475" maxY="514" name="townhall-m"/>
+  <symbol minX="273" maxX="312" minY="475" maxY="514" name="electronics-m"/>
   <symbol minX="312" maxX="351" minY="475" maxY="514" name="marketplace-m"/>
-  <symbol minX="351" maxX="390" minY="475" maxY="514" name="caravan_site-m"/>
-  <symbol minX="390" maxX="429" minY="475" maxY="514" name="sports-m"/>
-  <symbol minX="429" maxX="468" minY="475" maxY="514" name="beach-m"/>
+  <symbol minX="351" maxX="390" minY="475" maxY="514" name="bicycle-m"/>
+  <symbol minX="390" maxX="429" minY="475" maxY="514" name="tourism-m"/>
+  <symbol minX="429" maxX="468" minY="475" maxY="514" name="drugs"/>
   <symbol minX="468" maxX="507" minY="475" maxY="514" name="military-m"/>
-  <symbol minX="507" maxX="546" minY="475" maxY="514" name="volcano-m"/>
-  <symbol minX="546" maxX="585" minY="475" maxY="514" name="beauty-m"/>
+  <symbol minX="507" maxX="546" minY="475" maxY="514" name="tomb-m"/>
+  <symbol minX="546" maxX="585" minY="475" maxY="514" name="book-shop-m"/>
   <symbol minX="585" maxX="624" minY="475" maxY="514" name="mobile_phone-m"/>
-  <symbol minX="624" maxX="663" minY="475" maxY="514" name="vending-m"/>
+  <symbol minX="624" maxX="663" minY="475" maxY="514" name="toll_booth-m"/>
   <symbol minX="663" maxX="702" minY="475" maxY="514" name="monument-m"/>
-  <symbol minX="702" maxX="741" minY="475" maxY="514" name="cemetery-m"/>
-  <symbol minX="741" maxX="780" minY="475" maxY="514" name="tram-m"/>
+  <symbol minX="702" maxX="741" minY="475" maxY="514" name="toilets-m"/>
+  <symbol minX="741" maxX="780" minY="475" maxY="514" name="drinking-water-m"/>
   <symbol minX="780" maxX="819" minY="475" maxY="514" name="motel-m"/>
-  <symbol minX="819" maxX="858" minY="475" maxY="514" name="embassy-m"/>
+  <symbol minX="819" maxX="858" minY="475" maxY="514" name="boundary_stone-m"/>
   <symbol minX="858" maxX="897" minY="475" maxY="514" name="museum-m"/>
-  <symbol minX="897" maxX="936" minY="475" maxY="514" name="electronics-m"/>
-  <symbol minX="936" maxX="975" minY="475" maxY="514" name="ship-m"/>
-  <symbol minX="975" maxX="1014" minY="475" maxY="514" name="subway-entrance-2-m"/>
-  <symbol minX="0" maxX="39" minY="514" maxY="553" name="school-m"/>
-  <symbol minX="39" maxX="78" minY="514" maxY="553" name="chemist-m"/>
-  <symbol minX="78" maxX="117" minY="514" maxY="553" name="car_sharing-m"/>
-  <symbol minX="117" maxX="156" minY="514" maxY="553" name="train-m"/>
-  <symbol minX="156" maxX="195" minY="514" maxY="553" name="drugs"/>
+  <symbol minX="897" maxX="936" minY="475" maxY="514" name="theatre-m"/>
+  <symbol minX="936" maxX="975" minY="475" maxY="514" name="bowls-m"/>
+  <symbol minX="975" maxX="1014" minY="475" maxY="514" name="tennis-m"/>
+  <symbol minX="0" maxX="39" minY="514" maxY="553" name="bus-m"/>
+  <symbol minX="39" maxX="78" minY="514" maxY="553" name="taxi-m"/>
+  <symbol minX="78" maxX="117" minY="514" maxY="553" name="swimming-m"/>
+  <symbol minX="117" maxX="156" minY="514" maxY="553" name="butcher-m"/>
+  <symbol minX="156" maxX="195" minY="514" maxY="553" name="sweets-m"/>
   <symbol minX="195" maxX="234" minY="514" maxY="553" name="npark-m"/>
-  <symbol minX="234" maxX="273" minY="514" maxY="553" name="bicycle-m"/>
-  <symbol minX="273" maxX="312" minY="514" maxY="553" name="toys-m"/>
+  <symbol minX="234" maxX="273" minY="514" maxY="553" name="cable-car-m"/>
+  <symbol minX="273" maxX="312" minY="514" maxY="553" name="doityourself-m"/>
   <symbol minX="312" maxX="351" minY="514" maxY="553" name="nparkf-m "/>
   <symbol minX="351" maxX="390" minY="514" maxY="553" name="nparkf-m"/>
-  <symbol minX="390" maxX="429" minY="514" maxY="553" name="townhall-m"/>
-  <symbol minX="429" maxX="468" minY="514" maxY="553" name="drinking-water-m"/>
-  <symbol minX="468" maxX="507" minY="514" maxY="553" name="book-shop-m"/>
-  <symbol minX="507" maxX="546" minY="514" maxY="553" name="subway-entrance-m"/>
-  <symbol minX="546" maxX="585" minY="514" maxY="553" name="tourism-m"/>
+  <symbol minX="390" maxX="429" minY="514" maxY="553" name="subway-spb-m"/>
+  <symbol minX="429" maxX="468" minY="514" maxY="553" name="dog_park-m"/>
+  <symbol minX="468" maxX="507" minY="514" maxY="553" name="office-m"/>
+  <symbol minX="507" maxX="546" minY="514" maxY="553" name="cafe-m"/>
+  <symbol minX="546" maxX="585" minY="514" maxY="553" name="diving-m"/>
   <symbol minX="585" maxX="624" minY="514" maxY="553" name="optician-m"/>
-  <symbol minX="624" maxX="663" minY="514" maxY="553" name="tomb-m"/>
+  <symbol minX="624" maxX="663" minY="514" maxY="553" name="department_store-m"/>
   <symbol minX="663" maxX="702" minY="514" maxY="553" name="park-m"/>
-  <symbol minX="702" maxX="741" minY="514" maxY="553" name="boundary_stone-m"/>
-  <symbol minX="741" maxX="780" minY="514" maxY="553" name="restaurant-m"/>
-  <symbol minX="780" maxX="819" minY="514" maxY="553" name="toll_booth-m"/>
-  <symbol minX="819" maxX="858" minY="514" maxY="553" name="doityourself-m"/>
+  <symbol minX="702" maxX="741" minY="514" maxY="553" name="subway-newyork-m"/>
+  <symbol minX="741" maxX="780" minY="514" maxY="553" name="subway-m"/>
+  <symbol minX="780" maxX="819" minY="514" maxY="553" name="campsite-m"/>
+  <symbol minX="819" maxX="858" minY="514" maxY="553" name="curling-m"/>
   <symbol minX="858" maxX="897" minY="514" maxY="553" name="parking-meter-m"/>
-  <symbol minX="897" maxX="936" minY="514" maxY="553" name="bowls-m"/>
-  <symbol minX="936" maxX="975" minY="514" maxY="553" name="toilets-m"/>
-  <symbol minX="975" maxX="1014" minY="514" maxY="553" name="bus-m"/>
-  <symbol minX="0" maxX="39" minY="553" maxY="592" name="theatre-m"/>
-  <symbol minX="39" maxX="78" minY="553" maxY="592" name="tennis-m"/>
-  <symbol minX="78" maxX="117" minY="553" maxY="592" name="butcher-m"/>
-  <symbol minX="117" maxX="156" minY="553" maxY="592" name="taxi-m"/>
+  <symbol minX="897" maxX="936" minY="514" maxY="553" name="subway-entrance-m"/>
+  <symbol minX="936" maxX="975" minY="514" maxY="553" name="subway-entrance-2-m"/>
+  <symbol minX="975" maxX="1014" minY="514" maxY="553" name="peak-m"/>
+  <symbol minX="0" maxX="39" minY="553" maxY="592" name="sports-m"/>
+  <symbol minX="39" maxX="78" minY="553" maxY="592" name="car-repair-m"/>
+  <symbol minX="78" maxX="117" minY="553" maxY="592" name="soccer-m"/>
+  <symbol minX="117" maxX="156" minY="553" maxY="592" name="skiing-m"/>
   <symbol minX="156" maxX="195" minY="553" maxY="592" name="pharmacy-2-m"/>
-  <symbol minX="195" maxX="234" minY="553" maxY="592" name="dog_park-m"/>
+  <symbol minX="195" maxX="234" minY="553" maxY="592" name="car_sharing-m"/>
   <symbol minX="234" maxX="273" minY="553" maxY="592" name="pharmacy-m"/>
-  <symbol minX="273" maxX="312" minY="553" maxY="592" name="cable-car-m"/>
-  <symbol minX="312" maxX="351" minY="553" maxY="592" name="diving-m"/>
+  <symbol minX="273" maxX="312" minY="553" maxY="592" name="shop-m"/>
+  <symbol minX="312" maxX="351" minY="553" maxY="592" name="caravan_site-m"/>
   <symbol minX="351" maxX="390" minY="553" maxY="592" name="phone-m"/>
-  <symbol minX="390" maxX="429" minY="553" maxY="592" name="swimming-m"/>
-  <symbol minX="429" maxX="468" minY="553" maxY="592" name="department_store-m"/>
-  <symbol minX="468" maxX="507" minY="553" maxY="592" name="curling-m"/>
-  <symbol minX="507" maxX="546" minY="553" maxY="592" name="cinema-m"/>
-  <symbol minX="546" maxX="585" minY="553" maxY="592" name="sweets-m"/>
+  <symbol minX="390" maxX="429" minY="553" maxY="592" name="shop-bicycle-m"/>
+  <symbol minX="429" maxX="468" minY="553" maxY="592" name="cricket-m"/>
+  <symbol minX="468" maxX="507" minY="553" maxY="592" name="picnic-m"/>
+  <symbol minX="507" maxX="546" minY="553" maxY="592" name="casino-m"/>
+  <symbol minX="546" maxX="585" minY="553" maxY="592" name="convenience-m"/>
   <symbol minX="585" maxX="624" minY="553" maxY="592" name="pitch-m"/>
-  <symbol minX="624" maxX="663" minY="553" maxY="592" name="cafe-m"/>
-  <symbol minX="663" maxX="702" minY="553" maxY="592" name="subway-spb-m"/>
+  <symbol minX="624" maxX="663" minY="553" maxY="592" name="shoes-m"/>
+  <symbol minX="663" maxX="702" minY="553" maxY="592" name="computer-m"/>
   <symbol minX="702" maxX="741" minY="553" maxY="592" name="place-of-worship-m"/>
-  <symbol minX="741" maxX="780" minY="553" maxY="592" name="clothes-m"/>
-  <symbol minX="780" maxX="819" minY="553" maxY="592" name="subway-m"/>
+  <symbol minX="741" maxX="780" minY="553" maxY="592" name="ship-m"/>
+  <symbol minX="780" maxX="819" minY="553" maxY="592" name="cave-m"/>
   <symbol minX="819" maxX="858" minY="553" maxY="592" name="police-m"/>
-  <symbol minX="858" maxX="897" minY="553" maxY="592" name="recycling-m"/>
-  <symbol minX="897" maxX="936" minY="553" maxY="592" name="cricket-m"/>
+  <symbol minX="858" maxX="897" minY="553" maxY="592" name="school-m"/>
+  <symbol minX="897" maxX="936" minY="553" maxY="592" name="college-m"/>
   <symbol minX="936" maxX="975" minY="553" maxY="592" name="postbox-m"/>
-  <symbol minX="975" maxX="1014" minY="553" maxY="592" name="convenience-m"/>
-  <symbol minX="0" maxX="39" minY="592" maxY="631" name="computer-m"/>
-  <symbol minX="39" maxX="78" minY="592" maxY="631" name="campsite-m"/>
-  <symbol minX="78" maxX="117" minY="592" maxY="631" name="subway-newyork-m"/>
+  <symbol minX="975" maxX="1014" minY="553" maxY="592" name="clothes-m"/>
+  <symbol minX="0" maxX="39" minY="592" maxY="631" name="restaurant-m"/>
+  <symbol minX="39" maxX="78" minY="592" maxY="631" name="cemetery-m"/>
+  <symbol minX="78" maxX="117" minY="592" maxY="631" name="cinema-m"/>
   <symbol minX="117" maxX="156" minY="592" maxY="631" name="pub-m"/>
-  <symbol minX="156" maxX="195" minY="592" maxY="631" name="college-m"/>
-  <symbol minX="195" maxX="235" minY="592" maxY="628" name="subway-moscow-l"/>
-  <symbol minX="235" maxX="271" minY="592" maxY="628" name="parking-l"/>
-  <symbol minX="271" maxX="307" minY="592" maxY="628" name="speedcam-l"/>
-  <symbol minX="307" maxX="343" minY="592" maxY="628" name="subway-rome-l"/>
-  <symbol minX="343" maxX="379" minY="592" maxY="628" name="lightrail-berlin-m"/>
-  <symbol minX="379" maxX="415" minY="592" maxY="628" name="subway-berlin-l"/>
-  <symbol minX="415" maxX="449" minY="592" maxY="626" name="route_from"/>
-  <symbol minX="449" maxX="482" minY="592" maxY="625" name="no-icon-leisure"/>
-  <symbol minX="482" maxX="519" minY="592" maxY="625" name="subway-moscow-m"/>
-  <symbol minX="519" maxX="552" minY="592" maxY="625" name="subway-paris-m"/>
-  <symbol minX="552" maxX="585" minY="592" maxY="625" name="no-icon"/>
-  <symbol minX="585" maxX="618" minY="592" maxY="625" name="no-icon-tourism"/>
-  <symbol minX="618" maxX="651" minY="592" maxY="625" name="no-icon-shop"/>
-  <symbol minX="651" maxX="684" minY="592" maxY="625" name="subway-rome-m"/>
-  <symbol minX="684" maxX="717" minY="592" maxY="625" name="subway-berlin-m"/>
-  <symbol minX="717" maxX="750" minY="592" maxY="625" name="no-icon-amenity"/>
-  <symbol minX="750" maxX="790" minY="592" maxY="624" name="subway-london-l"/>
-  <symbol minX="790" maxX="822" minY="592" maxY="624" name="current-position"/>
-  <symbol minX="822" maxX="852" minY="592" maxY="623" name="bcontrol-s"/>
-  <symbol minX="852" maxX="882" minY="592" maxY="623" name="waterfall-s"/>
-  <symbol minX="882" maxX="912" minY="592" maxY="623" name="beer-s"/>
-  <symbol minX="912" maxX="942" minY="592" maxY="623" name="picnic-s"/>
-  <symbol minX="942" maxX="972" minY="592" maxY="623" name="hunting-tower-s"/>
-  <symbol minX="972" maxX="1002" minY="592" maxY="623" name="office-s"/>
-  <symbol minX="0" maxX="30" minY="631" maxY="662" name="remains-s"/>
-  <symbol minX="30" maxX="60" minY="631" maxY="662" name="heliport-s"/>
-  <symbol minX="60" maxX="91" minY="631" maxY="662" name="airport-s"/>
-  <symbol minX="91" maxX="121" minY="631" maxY="661" name="skiing-s"/>
-  <symbol minX="121" maxX="151" minY="631" maxY="661" name="casino-s"/>
-  <symbol minX="151" maxX="181" minY="631" maxY="661" name="soccer-s"/>
-  <symbol minX="181" maxX="211" minY="631" maxY="661" name="shop-s"/>
-  <symbol minX="211" maxX="241" minY="631" maxY="661" name="speedcam-m"/>
-  <symbol minX="241" maxX="271" minY="631" maxY="661" name="museum-s"/>
-  <symbol minX="271" maxX="301" minY="631" maxY="661" name="cave-s"/>
-  <symbol minX="301" maxX="331" minY="631" maxY="661" name="grocery-s"/>
-  <symbol minX="331" maxX="361" minY="631" maxY="661" name="hand-s"/>
-  <symbol minX="361" maxX="391" minY="631" maxY="661" name="golf-s"/>
-  <symbol minX="391" maxX="421" minY="631" maxY="661" name="helipad-s"/>
-  <symbol minX="421" maxX="451" minY="631" maxY="661" name="garden-s"/>
-  <symbol minX="451" maxX="481" minY="631" maxY="661" name="hospital-s"/>
-  <symbol minX="481" maxX="517" minY="631" maxY="661" name="subway-barcelona-s"/>
-  <symbol minX="517" maxX="547" minY="631" maxY="661" name="ship-s"/>
-  <symbol minX="547" maxX="577" minY="631" maxY="661" name="cemetery-s"/>
-  <symbol minX="577" maxX="607" minY="631" maxY="661" name="alcohol-s"/>
-  <symbol minX="607" maxX="637" minY="631" maxY="661" name="school-s"/>
-  <symbol minX="637" maxX="667" minY="631" maxY="661" name="subway-entrance-2-s"/>
-  <symbol minX="667" maxX="697" minY="631" maxY="661" name="subway-entrance-arrow"/>
-  <symbol minX="697" maxX="727" minY="631" maxY="661" name="hotel-s"/>
-  <symbol minX="727" maxX="757" minY="631" maxY="661" name="restaurant-s"/>
-  <symbol minX="757" maxX="787" minY="631" maxY="661" name="subway-entrance-s"/>
-  <symbol minX="787" maxX="817" minY="631" maxY="661" name="gallery-s"/>
-  <symbol minX="817" maxX="847" minY="631" maxY="661" name="information-s"/>
-  <symbol minX="847" maxX="877" minY="631" maxY="661" name="funicular-s"/>
-  <symbol minX="877" maxX="907" minY="631" maxY="661" name="car-repair-s"/>
-  <symbol minX="907" maxX="937" minY="631" maxY="661" name="cinema-s"/>
-  <symbol minX="937" maxX="976" minY="631" maxY="661" name="subway-london-m"/>
-  <symbol minX="976" maxX="1006" minY="631" maxY="661" name="america-football-s"/>
-  <symbol minX="0" maxX="30" minY="662" maxY="692" name="recycling-s"/>
-  <symbol minX="30" maxX="60" minY="662" maxY="692" name="bar-s"/>
-  <symbol minX="60" maxX="90" minY="662" maxY="692" name="fuel-s"/>
-  <symbol minX="90" maxX="120" minY="662" maxY="692" name="kindergarten-s"/>
-  <symbol minX="120" maxX="150" minY="662" maxY="692" name="fountain-s"/>
-  <symbol minX="150" maxX="180" minY="662" maxY="692" name="library-s"/>
-  <symbol minX="180" maxX="210" minY="662" maxY="692" name="zoo-s"/>
-  <symbol minX="210" maxX="240" minY="662" maxY="692" name="fire_station-s"/>
-  <symbol minX="240" maxX="270" minY="662" maxY="692" name="pub-s"/>
-  <symbol minX="270" maxX="300" minY="662" maxY="692" name="baseball-s"/>
-  <symbol minX="300" maxX="330" minY="662" maxY="692" name="campsite-s"/>
-  <symbol minX="330" maxX="360" minY="662" maxY="692" name="college-s"/>
-  <symbol minX="360" maxX="390" minY="662" maxY="692" name="subway-newyork-s"/>
-  <symbol minX="390" maxX="420" minY="662" maxY="692" name="windmill-s"/>
-  <symbol minX="420" maxX="450" minY="662" maxY="692" name="power-s"/>
-  <symbol minX="450" maxX="480" minY="662" maxY="692" name="police-s"/>
-  <symbol minX="480" maxX="510" minY="662" maxY="692" name="lighthouse-s"/>
-  <symbol minX="510" maxX="540" minY="662" maxY="692" name="fastfood-s"/>
-  <symbol minX="540" maxX="570" minY="662" maxY="692" name="place-of-worship-s"/>
-  <symbol minX="570" maxX="600" minY="662" maxY="692" name="basketball-s"/>
-  <symbol minX="600" maxX="630" minY="662" maxY="692" name="subway-s"/>
-  <symbol minX="630" maxX="660" minY="662" maxY="692" name="cafe-s"/>
-  <symbol minX="660" maxX="690" minY="662" maxY="692" name="mail-s"/>
-  <symbol minX="690" maxX="720" minY="662" maxY="692" name="subway-spb-s"/>
-  <symbol minX="720" maxX="750" minY="662" maxY="692" name="equestrian-s"/>
-  <symbol minX="750" maxX="780" minY="662" maxY="692" name="volcano-s"/>
-  <symbol minX="780" maxX="810" minY="662" maxY="692" name="military-s"/>
-  <symbol minX="810" maxX="840" minY="662" maxY="692" name="atm-s"/>
-  <symbol minX="840" maxX="870" minY="662" maxY="692" name="pitch-s"/>
-  <symbol minX="870" maxX="900" minY="662" maxY="692" name="monument-s"/>
-  <symbol minX="900" maxX="930" minY="662" maxY="692" name="cable-car-s"/>
-  <symbol minX="930" maxX="960" minY="662" maxY="692" name="phone-s"/>
-  <symbol minX="960" maxX="990" minY="662" maxY="692" name="swimming-s"/>
-  <symbol minX="990" maxX="1020" minY="662" maxY="692" name="pharmacy-s"/>
-  <symbol minX="0" maxX="30" minY="692" maxY="722" name="tram-s"/>
-  <symbol minX="30" maxX="60" minY="692" maxY="722" name="embassy-s"/>
-  <symbol minX="60" maxX="90" minY="692" maxY="722" name="train-s"/>
-  <symbol minX="90" maxX="120" minY="692" maxY="722" name="tennis-s"/>
-  <symbol minX="120" maxX="150" minY="692" maxY="722" name="bus-s"/>
-  <symbol minX="150" maxX="180" minY="692" maxY="722" name="npark-s"/>
-  <symbol minX="180" maxX="210" minY="692" maxY="722" name="theatre-s"/>
-  <symbol minX="210" maxX="240" minY="692" maxY="722" name="drinking-water-s"/>
-  <symbol minX="240" maxX="270" minY="692" maxY="722" name="bicycle-s"/>
-  <symbol minX="270" maxX="300" minY="692" maxY="722" name="toilets-s"/>
-  <symbol minX="300" maxX="330" minY="692" maxY="722" name="townhall-s"/>
-  <symbol minX="330" maxX="360" minY="692" maxY="722" name="nparkf-s"/>
-  <symbol minX="360" maxX="390" minY="692" maxY="722" name="park-s"/>
-  <symbol minX="390" maxX="420" minY="692" maxY="722" name="tourism-s"/>
-  <symbol minX="420" maxX="450" minY="692" maxY="722" name="book-shop-s"/>
-  <symbol minX="450" maxX="490" minY="692" maxY="721" name="subway-barcelona-l"/>
-  <symbol minX="490" maxX="530" minY="692" maxY="721" name="subway-madrid-m"/>
-  <symbol minX="530" maxX="570" minY="692" maxY="721" name="subway-madrid-l"/>
-  <symbol minX="570" maxX="610" minY="692" maxY="721" name="metro-barcelona-m"/>
-  <symbol minX="610" maxX="650" minY="692" maxY="721" name="subway-barcelona-m"/>
-  <symbol minX="650" maxX="677" minY="692" maxY="720" name="s-arrow"/>
-  <symbol minX="677" maxX="705" minY="692" maxY="720" name="parking-m"/>
-  <symbol minX="705" maxX="741" minY="692" maxY="719" name="subway-madrid-s"/>
-  <symbol minX="741" maxX="780" minY="692" maxY="719" name="subway-kiev-m"/>
-  <symbol minX="780" maxX="816" minY="692" maxY="719" name="metro-barcelona-s"/>
-  <symbol minX="816" maxX="843" minY="692" maxY="719" name="peak-l"/>
-  <symbol minX="843" maxX="870" minY="692" maxY="719" name="lightrail-berlin-s"/>
-  <symbol minX="870" maxX="897" minY="692" maxY="719" name="subway-paris-s"/>
-  <symbol minX="897" maxX="936" minY="692" maxY="719" name="subway-kiev-l"/>
-  <symbol minX="936" maxX="961" minY="692" maxY="717" name="subway-moscow-s"/>
-  <symbol minX="961" maxX="986" minY="692" maxY="717" name="api-result"/>
-  <symbol minX="986" maxX="1010" minY="692" maxY="716" name="speedcam-s"/>
-  <symbol minX="0" maxX="24" minY="722" maxY="746" name="subway-rome-s"/>
-  <symbol minX="24" maxX="48" minY="722" maxY="746" name="subway-berlin-s"/>
-  <symbol minX="48" maxX="72" minY="722" maxY="746" name="parking-s"/>
-  <symbol minX="72" maxX="102" minY="722" maxY="746" name="subway-london-s"/>
-  <symbol minX="102" maxX="129" minY="722" maxY="746" name="bench"/>
-  <symbol minX="129" maxX="153" minY="722" maxY="746" name="search-result"/>
-  <symbol minX="153" maxX="177" minY="722" maxY="744" name="peakt-l"/>
-  <symbol minX="177" maxX="199" minY="722" maxY="744" name="star-l"/>
-  <symbol minX="199" maxX="238" minY="722" maxY="744" name="subway-minsk-l"/>
-  <symbol minX="238" maxX="260" minY="722" maxY="744" name="survey_point-l"/>
-  <symbol minX="260" maxX="281" minY="722" maxY="743" name="star-m"/>
-  <symbol minX="281" maxX="314" minY="722" maxY="743" name="subway-kiev-s"/>
-  <symbol minX="314" maxX="333" minY="722" maxY="741" name="survey_point-m"/>
-  <symbol minX="333" maxX="352" minY="722" maxY="741" name="subway-newyork-xs"/>
-  <symbol minX="352" maxX="373" minY="722" maxY="741" name="peak-m"/>
-  <symbol minX="373" maxX="392" minY="722" maxY="741" name="subway-xs"/>
-  <symbol minX="392" maxX="422" minY="722" maxY="741" name="railway-crossing"/>
-  <symbol minX="422" maxX="455" minY="722" maxY="741" name="subway-minsk-m"/>
-  <symbol minX="455" maxX="485" minY="722" maxY="740" name="subway-minsk-s"/>
-  <symbol minX="485" maxX="503" minY="722" maxY="740" name="star-s"/>
-  <symbol minX="503" maxX="521" minY="722" maxY="740" name="crossing-l"/>
-  <symbol minX="521" maxX="557" minY="722" maxY="738" name="arrow-m"/>
-  <symbol minX="557" maxX="575" minY="722" maxY="738" name="peakt-m"/>
-  <symbol minX="575" maxX="591" minY="722" maxY="738" name="survey_point-s"/>
-  <symbol minX="591" maxX="609" minY="722" maxY="738" name="peak-s"/>
-  <symbol minX="609" maxX="624" minY="722" maxY="737" name="crossing-m"/>
-  <symbol minX="624" maxX="639" minY="722" maxY="737" name="entrance-s"/>
-  <symbol minX="639" maxX="654" minY="722" maxY="735" name="peakt-s"/>
-  <symbol minX="654" maxX="666" minY="722" maxY="734" name="dot-m"/>
-  <symbol minX="666" maxX="678" minY="722" maxY="734" name="crossing-s"/>
-  <symbol minX="678" maxX="690" minY="722" maxY="734" name="tree-l"/>
-  <symbol minX="690" maxX="717" minY="722" maxY="734" name="arrow-s"/>
-  <symbol minX="717" maxX="729" minY="722" maxY="734" name="none"/>
-  <symbol minX="729" maxX="739" minY="722" maxY="732" name="entrance-xs"/>
-  <symbol minX="739" maxX="749" minY="722" maxY="732" name="tree-m"/>
-  <symbol minX="749" maxX="758" minY="722" maxY="731" name="zero-icon"/>
-  <symbol minX="758" maxX="767" minY="722" maxY="731" name="dot-s"/>
-  <symbol minX="767" maxX="776" minY="722" maxY="731" name="tree-s"/>
-  <symbol minX="776" maxX="785" minY="722" maxY="731" name="dot-s-light"/>
+  <symbol minX="156" maxX="195" minY="592" maxY="631" name="remains-m"/>
+  <symbol minX="195" maxX="234" minY="592" maxY="631" name="recycling-m"/>
+  <symbol minX="234" maxX="273" minY="592" maxY="631" name="chemist-m"/>
+  <symbol minX="273" maxX="309" minY="592" maxY="628" name="parking-l"/>
+  <symbol minX="309" maxX="345" minY="592" maxY="628" name="speedcam-l"/>
+  <symbol minX="345" maxX="381" minY="592" maxY="628" name="lightrail-berlin-m"/>
+  <symbol minX="381" maxX="417" minY="592" maxY="628" name="subway-berlin-l"/>
+  <symbol minX="417" maxX="457" minY="592" maxY="628" name="subway-moscow-l"/>
+  <symbol minX="457" maxX="493" minY="592" maxY="628" name="subway-rome-l"/>
+  <symbol minX="493" maxX="526" minY="592" maxY="625" name="no-icon-shop"/>
+  <symbol minX="526" maxX="559" minY="592" maxY="625" name="no-icon-tourism"/>
+  <symbol minX="559" maxX="592" minY="592" maxY="625" name="no-icon"/>
+  <symbol minX="592" maxX="625" minY="592" maxY="625" name="subway-rome-m"/>
+  <symbol minX="625" maxX="658" minY="592" maxY="625" name="subway-berlin-m"/>
+  <symbol minX="658" maxX="691" minY="592" maxY="625" name="no-icon-leisure"/>
+  <symbol minX="691" maxX="724" minY="592" maxY="625" name="subway-paris-m"/>
+  <symbol minX="724" maxX="761" minY="592" maxY="625" name="subway-moscow-m"/>
+  <symbol minX="761" maxX="794" minY="592" maxY="625" name="no-icon-amenity"/>
+  <symbol minX="794" maxX="826" minY="592" maxY="624" name="current-position"/>
+  <symbol minX="826" maxX="866" minY="592" maxY="624" name="subway-london-l"/>
+  <symbol minX="866" maxX="896" minY="592" maxY="623" name="waterfall-s"/>
+  <symbol minX="896" maxX="926" minY="592" maxY="623" name="beer-s"/>
+  <symbol minX="926" maxX="956" minY="592" maxY="623" name="hunting-tower-s"/>
+  <symbol minX="956" maxX="987" minY="592" maxY="623" name="airport-s"/>
+  <symbol minX="987" maxX="1017" minY="592" maxY="622" name="shop-s"/>
+  <symbol minX="0" maxX="30" minY="631" maxY="661" name="pharmacy-s"/>
+  <symbol minX="30" maxX="60" minY="631" maxY="661" name="fire_station-s"/>
+  <symbol minX="60" maxX="90" minY="631" maxY="661" name="skiing-s"/>
+  <symbol minX="90" maxX="120" minY="631" maxY="661" name="car-repair-s"/>
+  <symbol minX="120" maxX="150" minY="631" maxY="661" name="grocery-s"/>
+  <symbol minX="150" maxX="180" minY="631" maxY="661" name="soccer-s"/>
+  <symbol minX="180" maxX="210" minY="631" maxY="661" name="golf-s"/>
+  <symbol minX="210" maxX="240" minY="631" maxY="661" name="speedcam-m"/>
+  <symbol minX="240" maxX="270" minY="631" maxY="661" name="kindergarten-s"/>
+  <symbol minX="270" maxX="300" minY="631" maxY="661" name="garden-s"/>
+  <symbol minX="300" maxX="330" minY="631" maxY="661" name="peak-s"/>
+  <symbol minX="330" maxX="360" minY="631" maxY="661" name="museum-s"/>
+  <symbol minX="360" maxX="390" minY="631" maxY="661" name="fastfood-s"/>
+  <symbol minX="390" maxX="420" minY="631" maxY="661" name="alcohol-s"/>
+  <symbol minX="420" maxX="450" minY="631" maxY="661" name="bcontrol-s"/>
+  <symbol minX="450" maxX="480" minY="631" maxY="661" name="volcano-s"/>
+  <symbol minX="480" maxX="516" minY="631" maxY="661" name="subway-barcelona-s"/>
+  <symbol minX="516" maxX="546" minY="631" maxY="661" name="phone-s"/>
+  <symbol minX="546" maxX="576" minY="631" maxY="661" name="picnic-s"/>
+  <symbol minX="576" maxX="606" minY="631" maxY="661" name="equestrian-s"/>
+  <symbol minX="606" maxX="636" minY="631" maxY="661" name="gallery-s"/>
+  <symbol minX="636" maxX="666" minY="631" maxY="661" name="subway-entrance-2-s"/>
+  <symbol minX="666" maxX="696" minY="631" maxY="661" name="subway-entrance-arrow"/>
+  <symbol minX="696" maxX="726" minY="631" maxY="661" name="campsite-s"/>
+  <symbol minX="726" maxX="756" minY="631" maxY="661" name="library-s"/>
+  <symbol minX="756" maxX="786" minY="631" maxY="661" name="subway-entrance-s"/>
+  <symbol minX="786" maxX="816" minY="631" maxY="661" name="basketball-s"/>
+  <symbol minX="816" maxX="846" minY="631" maxY="661" name="information-s"/>
+  <symbol minX="846" maxX="876" minY="631" maxY="661" name="hand-s"/>
+  <symbol minX="876" maxX="906" minY="631" maxY="661" name="recycling-s"/>
+  <symbol minX="906" maxX="936" minY="631" maxY="661" name="pitch-s"/>
+  <symbol minX="936" maxX="975" minY="631" maxY="661" name="subway-london-m"/>
+  <symbol minX="975" maxX="1005" minY="631" maxY="661" name="fountain-s"/>
+  <symbol minX="0" maxX="30" minY="661" maxY="691" name="casino-s"/>
+  <symbol minX="30" maxX="60" minY="661" maxY="691" name="windmill-s"/>
+  <symbol minX="60" maxX="90" minY="661" maxY="691" name="tram-s"/>
+  <symbol minX="90" maxX="120" minY="661" maxY="691" name="lighthouse-s"/>
+  <symbol minX="120" maxX="150" minY="661" maxY="691" name="helipad-s"/>
+  <symbol minX="150" maxX="180" minY="661" maxY="691" name="funicular-s"/>
+  <symbol minX="180" maxX="210" minY="661" maxY="691" name="america-football-s"/>
+  <symbol minX="210" maxX="240" minY="661" maxY="691" name="ship-s"/>
+  <symbol minX="240" maxX="270" minY="661" maxY="691" name="place-of-worship-s"/>
+  <symbol minX="270" maxX="300" minY="661" maxY="691" name="embassy-s"/>
+  <symbol minX="300" maxX="330" minY="661" maxY="691" name="cafe-s"/>
+  <symbol minX="330" maxX="360" minY="661" maxY="691" name="park-s"/>
+  <symbol minX="360" maxX="390" minY="661" maxY="691" name="subway-newyork-s"/>
+  <symbol minX="390" maxX="420" minY="661" maxY="691" name="bar-s"/>
+  <symbol minX="420" maxX="450" minY="661" maxY="691" name="office-s"/>
+  <symbol minX="450" maxX="480" minY="661" maxY="691" name="college-s"/>
+  <symbol minX="480" maxX="510" minY="661" maxY="691" name="train-s"/>
+  <symbol minX="510" maxX="540" minY="661" maxY="691" name="school-s"/>
+  <symbol minX="540" maxX="570" minY="661" maxY="691" name="police-s"/>
+  <symbol minX="570" maxX="600" minY="661" maxY="691" name="cemetery-s"/>
+  <symbol minX="600" maxX="630" minY="661" maxY="691" name="subway-s"/>
+  <symbol minX="630" maxX="660" minY="661" maxY="691" name="cable-car-s"/>
+  <symbol minX="660" maxX="690" minY="661" maxY="691" name="nparkf-s"/>
+  <symbol minX="690" maxX="720" minY="661" maxY="691" name="subway-spb-s"/>
+  <symbol minX="720" maxX="750" minY="661" maxY="691" name="heliport-s"/>
+  <symbol minX="750" maxX="780" minY="661" maxY="691" name="cave-s"/>
+  <symbol minX="780" maxX="810" minY="661" maxY="691" name="fuel-s"/>
+  <symbol minX="810" maxX="840" minY="661" maxY="691" name="hospital-s"/>
+  <symbol minX="840" maxX="870" minY="661" maxY="691" name="npark-s"/>
+  <symbol minX="870" maxX="900" minY="661" maxY="691" name="pub-s"/>
+  <symbol minX="900" maxX="930" minY="661" maxY="691" name="zoo-s"/>
+  <symbol minX="930" maxX="960" minY="661" maxY="691" name="townhall-s"/>
+  <symbol minX="960" maxX="990" minY="661" maxY="691" name="swimming-s"/>
+  <symbol minX="990" maxX="1020" minY="661" maxY="691" name="bus-s"/>
+  <symbol minX="0" maxX="30" minY="691" maxY="721" name="restaurant-s"/>
+  <symbol minX="30" maxX="60" minY="691" maxY="721" name="cinema-s"/>
+  <symbol minX="60" maxX="90" minY="691" maxY="721" name="power-s"/>
+  <symbol minX="90" maxX="120" minY="691" maxY="721" name="tennis-s"/>
+  <symbol minX="120" maxX="150" minY="691" maxY="721" name="remains-s"/>
+  <symbol minX="150" maxX="180" minY="691" maxY="721" name="hotel-s"/>
+  <symbol minX="180" maxX="210" minY="691" maxY="721" name="theatre-s"/>
+  <symbol minX="210" maxX="240" minY="691" maxY="721" name="baseball-s"/>
+  <symbol minX="240" maxX="270" minY="691" maxY="721" name="monument-s"/>
+  <symbol minX="270" maxX="300" minY="691" maxY="721" name="toilets-s"/>
+  <symbol minX="300" maxX="330" minY="691" maxY="721" name="book-shop-s"/>
+  <symbol minX="330" maxX="360" minY="691" maxY="721" name="drinking-water-s"/>
+  <symbol minX="360" maxX="390" minY="691" maxY="721" name="atm-s"/>
+  <symbol minX="390" maxX="420" minY="691" maxY="721" name="military-s"/>
+  <symbol minX="420" maxX="450" minY="691" maxY="721" name="bicycle-s"/>
+  <symbol minX="450" maxX="480" minY="691" maxY="721" name="mail-s"/>
+  <symbol minX="480" maxX="510" minY="691" maxY="721" name="tourism-s"/>
+  <symbol minX="510" maxX="550" minY="691" maxY="720" name="metro-barcelona-m"/>
+  <symbol minX="550" maxX="590" minY="691" maxY="720" name="subway-madrid-m"/>
+  <symbol minX="590" maxX="630" minY="691" maxY="720" name="subway-barcelona-l"/>
+  <symbol minX="630" maxX="670" minY="691" maxY="720" name="subway-madrid-l"/>
+  <symbol minX="670" maxX="710" minY="691" maxY="720" name="subway-barcelona-m"/>
+  <symbol minX="710" maxX="738" minY="691" maxY="719" name="route_from"/>
+  <symbol minX="738" maxX="765" minY="691" maxY="719" name="s-arrow"/>
+  <symbol minX="765" maxX="793" minY="691" maxY="719" name="parking-m"/>
+  <symbol minX="793" maxX="832" minY="691" maxY="718" name="subway-kiev-l"/>
+  <symbol minX="832" maxX="868" minY="691" maxY="718" name="subway-madrid-s"/>
+  <symbol minX="868" maxX="895" minY="691" maxY="718" name="subway-paris-s"/>
+  <symbol minX="895" maxX="934" minY="691" maxY="718" name="subway-kiev-m"/>
+  <symbol minX="934" maxX="961" minY="691" maxY="718" name="lightrail-berlin-s"/>
+  <symbol minX="961" maxX="997" minY="691" maxY="718" name="metro-barcelona-s"/>
+  <symbol minX="997" maxX="1022" minY="691" maxY="716" name="api-result"/>
+  <symbol minX="0" maxX="25" minY="721" maxY="746" name="subway-moscow-s"/>
+  <symbol minX="25" maxX="49" minY="721" maxY="745" name="parking-s"/>
+  <symbol minX="49" maxX="73" minY="721" maxY="745" name="subway-berlin-s"/>
+  <symbol minX="73" maxX="103" minY="721" maxY="745" name="subway-london-s"/>
+  <symbol minX="103" maxX="127" minY="721" maxY="745" name="subway-rome-s"/>
+  <symbol minX="127" maxX="154" minY="721" maxY="745" name="bench"/>
+  <symbol minX="154" maxX="178" minY="721" maxY="745" name="star-l"/>
+  <symbol minX="178" maxX="202" minY="721" maxY="745" name="speedcam-s"/>
+  <symbol minX="202" maxX="226" minY="721" maxY="745" name="search-result"/>
+  <symbol minX="226" maxX="248" minY="721" maxY="743" name="survey_point-l"/>
+  <symbol minX="248" maxX="272" minY="721" maxY="743" name="peakt-l"/>
+  <symbol minX="272" maxX="294" minY="721" maxY="743" name="star-m"/>
+  <symbol minX="294" maxX="333" minY="721" maxY="743" name="subway-minsk-l"/>
+  <symbol minX="333" maxX="366" minY="721" maxY="742" name="subway-kiev-s"/>
+  <symbol minX="366" maxX="396" minY="721" maxY="740" name="railway-crossing"/>
+  <symbol minX="396" maxX="429" minY="721" maxY="740" name="subway-minsk-m"/>
+  <symbol minX="429" maxX="448" minY="721" maxY="740" name="subway-newyork-xs"/>
+  <symbol minX="448" maxX="467" minY="721" maxY="740" name="star-s"/>
+  <symbol minX="467" maxX="486" minY="721" maxY="740" name="subway-xs"/>
+  <symbol minX="486" maxX="505" minY="721" maxY="740" name="survey_point-m"/>
+  <symbol minX="505" maxX="535" minY="721" maxY="739" name="subway-minsk-s"/>
+  <symbol minX="535" maxX="553" minY="721" maxY="739" name="crossing-l"/>
+  <symbol minX="553" maxX="569" minY="721" maxY="737" name="survey_point-s"/>
+  <symbol minX="569" maxX="587" minY="721" maxY="737" name="peakt-m"/>
+  <symbol minX="587" maxX="623" minY="721" maxY="737" name="arrow-m"/>
+  <symbol minX="623" maxX="638" minY="721" maxY="736" name="entrance-s"/>
+  <symbol minX="638" maxX="653" minY="721" maxY="736" name="crossing-m"/>
+  <symbol minX="653" maxX="668" minY="721" maxY="734" name="peakt-s"/>
+  <symbol minX="668" maxX="681" minY="721" maxY="734" name="dot-m"/>
+  <symbol minX="681" maxX="693" minY="721" maxY="733" name="tree-l"/>
+  <symbol minX="693" maxX="705" minY="721" maxY="733" name="crossing-s"/>
+  <symbol minX="705" maxX="717" minY="721" maxY="733" name="none"/>
+  <symbol minX="717" maxX="744" minY="721" maxY="733" name="arrow-s"/>
+  <symbol minX="744" maxX="754" minY="721" maxY="731" name="dot-s"/>
+  <symbol minX="754" maxX="764" minY="721" maxY="731" name="entrance-xs"/>
+  <symbol minX="764" maxX="774" minY="721" maxY="731" name="tree-m"/>
+  <symbol minX="774" maxX="784" minY="721" maxY="731" name="dot-s-light"/>
+  <symbol minX="784" maxX="793" minY="721" maxY="730" name="zero-icon"/>
+  <symbol minX="793" maxX="802" minY="721" maxY="730" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/resources-xhdpi_dark/symbols.png
index 47b0a9e44b..917f2d584b 100644
--- a/data/resources-xhdpi_dark/symbols.png
+++ b/data/resources-xhdpi_dark/symbols.png
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/resources-xhdpi_dark/symbols.sdf
index c3a95fb555..79079a14a5 100644
--- a/data/resources-xhdpi_dark/symbols.sdf
+++ b/data/resources-xhdpi_dark/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="1024" width="1024">
+ <file width="1024" height="1024">
   <symbol minX="0" maxX="138" minY="0" maxY="138" name="route_to"/>
   <symbol minX="138" maxX="408" minY="0" maxY="132" name="route-arrow"/>
   <symbol minX="408" maxX="524" minY="0" maxY="116" name="compass-image"/>
@@ -21,9 +21,9 @@
   <symbol minX="112" maxX="152" minY="138" maxY="178" name="airport-l"/>
   <symbol minX="152" maxX="192" minY="138" maxY="178" name="monument-l"/>
   <symbol minX="192" maxX="232" minY="138" maxY="178" name="australian-football-l"/>
-  <symbol minX="232" maxX="272" minY="138" maxY="178" name="shoes-l"/>
+  <symbol minX="232" maxX="272" minY="138" maxY="178" name="ship-l"/>
   <symbol minX="272" maxX="312" minY="138" maxY="178" name="bakery-l"/>
-  <symbol minX="312" maxX="352" minY="138" maxY="178" name="ship-l"/>
+  <symbol minX="312" maxX="352" minY="138" maxY="178" name="shoes-l"/>
   <symbol minX="352" maxX="392" minY="138" maxY="178" name="school-l"/>
   <symbol minX="392" maxX="432" minY="138" maxY="178" name="bank-l"/>
   <symbol minX="432" maxX="471" minY="138" maxY="178" name="bank-m"/>
@@ -33,74 +33,74 @@
   <symbol minX="591" maxX="631" minY="138" maxY="178" name="restaurant-l"/>
   <symbol minX="631" maxX="671" minY="138" maxY="178" name="airport-m"/>
   <symbol minX="671" maxX="711" minY="138" maxY="178" name="baseball-l"/>
-  <symbol minX="711" maxX="751" minY="138" maxY="178" name="shop-l copy"/>
+  <symbol minX="711" maxX="751" minY="138" maxY="178" name="remains-l"/>
   <symbol minX="751" maxX="791" minY="138" maxY="178" name="alcohol-l"/>
   <symbol minX="791" maxX="831" minY="138" maxY="178" name="basketball-l"/>
-  <symbol minX="831" maxX="871" minY="138" maxY="178" name="remains-l"/>
-  <symbol minX="871" maxX="911" minY="138" maxY="178" name="shop-l"/>
+  <symbol minX="831" maxX="871" minY="138" maxY="178" name="shop-l copy"/>
+  <symbol minX="871" maxX="911" minY="138" maxY="178" name="recycling-l"/>
   <symbol minX="911" maxX="951" minY="138" maxY="178" name="bbq-l"/>
-  <symbol minX="951" maxX="991" minY="138" maxY="178" name="recycling-l"/>
+  <symbol minX="951" maxX="991" minY="138" maxY="178" name="shop-l"/>
   <symbol minX="0" maxX="40" minY="196" maxY="236" name="bcontrol-l"/>
   <symbol minX="40" maxX="80" minY="196" maxY="236" name="pub-l"/>
-  <symbol minX="80" maxX="120" minY="196" maxY="236" name="power-m"/>
+  <symbol minX="80" maxX="120" minY="196" maxY="236" name="alpine_hut-l"/>
   <symbol minX="120" maxX="160" minY="196" maxY="236" name="beach-l"/>
-  <symbol minX="160" maxX="200" minY="196" maxY="236" name="power-l"/>
+  <symbol minX="160" maxX="200" minY="196" maxY="236" name="power-m"/>
   <symbol minX="200" maxX="240" minY="196" maxY="236" name="beauty-l"/>
-  <symbol minX="240" maxX="280" minY="196" maxY="236" name="postbox-l"/>
+  <symbol minX="240" maxX="280" minY="196" maxY="236" name="power-l"/>
   <symbol minX="280" maxX="320" minY="196" maxY="236" name="beer-l"/>
-  <symbol minX="320" maxX="360" minY="196" maxY="236" name="skiing-l"/>
-  <symbol minX="360" maxX="400" minY="196" maxY="236" name="alpine_hut-l"/>
-  <symbol minX="400" maxX="440" minY="196" maxY="236" name="police-l"/>
+  <symbol minX="320" maxX="360" minY="196" maxY="236" name="postbox-l"/>
+  <symbol minX="360" maxX="400" minY="196" maxY="236" name="police-l"/>
+  <symbol minX="400" maxX="440" minY="196" maxY="236" name="america-football-l"/>
   <symbol minX="440" maxX="480" minY="196" maxY="236" name="bicycle-l"/>
-  <symbol minX="480" maxX="520" minY="196" maxY="236" name="place-of-worship-l"/>
-  <symbol minX="520" maxX="560" minY="196" maxY="236" name="america-football-l"/>
+  <symbol minX="480" maxX="520" minY="196" maxY="236" name="skiing-l"/>
+  <symbol minX="520" maxX="560" minY="196" maxY="236" name="place-of-worship-l"/>
   <symbol minX="560" maxX="600" minY="196" maxY="236" name="book-shop-l"/>
-  <symbol minX="600" maxX="640" minY="196" maxY="236" name="soccer-l"/>
-  <symbol minX="640" maxX="680" minY="196" maxY="236" name="pitch-l"/>
+  <symbol minX="600" maxX="640" minY="196" maxY="236" name="pitch-l"/>
+  <symbol minX="640" maxX="680" minY="196" maxY="236" name="archery-l"/>
   <symbol minX="680" maxX="720" minY="196" maxY="236" name="boundary_stone-l"/>
-  <symbol minX="720" maxX="760" minY="196" maxY="236" name="picnic-l"/>
+  <symbol minX="720" maxX="760" minY="196" maxY="236" name="soccer-l"/>
   <symbol minX="760" maxX="800" minY="196" maxY="236" name="bowls-l"/>
-  <symbol minX="800" maxX="840" minY="196" maxY="236" name="phone-l"/>
+  <symbol minX="800" maxX="840" minY="196" maxY="236" name="picnic-l"/>
   <symbol minX="840" maxX="880" minY="196" maxY="236" name="bus-l"/>
-  <symbol minX="880" maxX="920" minY="196" maxY="236" name="sports-l"/>
-  <symbol minX="920" maxX="960" minY="196" maxY="236" name="archery-l"/>
+  <symbol minX="880" maxX="920" minY="196" maxY="236" name="phone-l"/>
+  <symbol minX="920" maxX="960" minY="196" maxY="236" name="pharmacy-l"/>
   <symbol minX="960" maxX="1000" minY="196" maxY="236" name="butcher-l"/>
-  <symbol minX="0" maxX="40" minY="236" maxY="276" name="pharmacy-l"/>
+  <symbol minX="0" maxX="40" minY="236" maxY="276" name="sports-l"/>
   <symbol minX="40" maxX="80" minY="236" maxY="276" name="cable-car-l"/>
-  <symbol minX="80" maxX="120" minY="236" maxY="276" name="subway-entrance-l"/>
-  <symbol minX="120" maxX="160" minY="236" maxY="276" name="peak-l"/>
+  <symbol minX="80" maxX="120" minY="236" maxY="276" name="peak-l"/>
+  <symbol minX="120" maxX="160" minY="236" maxY="276" name="atm-l"/>
   <symbol minX="160" maxX="200" minY="236" maxY="276" name="cafe-l"/>
-  <symbol minX="200" maxX="240" minY="236" maxY="276" name="parking-meter-l"/>
-  <symbol minX="240" maxX="280" minY="236" maxY="276" name="atm-l"/>
+  <symbol minX="200" maxX="240" minY="236" maxY="276" name="subway-entrance-l"/>
+  <symbol minX="240" maxX="280" minY="236" maxY="276" name="parking-meter-l"/>
   <symbol minX="280" maxX="320" minY="236" maxY="276" name="campsite-l"/>
   <symbol minX="320" maxX="360" minY="236" maxY="276" name="subway-l"/>
   <symbol minX="360" maxX="400" minY="236" maxY="276" name="park-l"/>
   <symbol minX="400" maxX="440" minY="236" maxY="276" name="car-repair-l"/>
   <symbol minX="440" maxX="480" minY="236" maxY="276" name="optician-l"/>
-  <symbol minX="480" maxX="520" minY="236" maxY="276" name="office-l"/>
+  <symbol minX="480" maxX="520" minY="236" maxY="276" name="zoo-l"/>
   <symbol minX="520" maxX="560" minY="236" maxY="276" name="car_sharing-l"/>
-  <symbol minX="560" maxX="600" minY="236" maxY="276" name="subway-newyork-l"/>
+  <symbol minX="560" maxX="600" minY="236" maxY="276" name="office-l"/>
   <symbol minX="600" maxX="640" minY="236" maxY="276" name="caravan_site-l"/>
   <symbol minX="640" maxX="680" minY="236" maxY="276" name="nparkf-l"/>
   <symbol minX="680" maxX="720" minY="236" maxY="276" name="casino-l"/>
-  <symbol minX="720" maxX="760" minY="236" maxY="276" name="npark-l"/>
-  <symbol minX="760" maxX="800" minY="236" maxY="276" name="zoo-l"/>
+  <symbol minX="720" maxX="760" minY="236" maxY="276" name="subway-newyork-l"/>
+  <symbol minX="760" maxX="800" minY="236" maxY="276" name="npark-l"/>
   <symbol minX="800" maxX="840" minY="236" maxY="276" name="cave-l"/>
   <symbol minX="840" maxX="880" minY="236" maxY="276" name="subway-paris-l"/>
-  <symbol minX="880" maxX="920" minY="236" maxY="276" name="subway-spb-l"/>
+  <symbol minX="880" maxX="920" minY="236" maxY="276" name="windmill-l"/>
   <symbol minX="920" maxX="960" minY="236" maxY="276" name="cemetery-l"/>
-  <symbol minX="960" maxX="1000" minY="236" maxY="276" name="sweets-l"/>
-  <symbol minX="0" maxX="40" minY="276" maxY="316" name="windmill-l"/>
+  <symbol minX="960" maxX="1000" minY="236" maxY="276" name="subway-spb-l"/>
+  <symbol minX="0" maxX="40" minY="276" maxY="316" name="sweets-l"/>
   <symbol minX="40" maxX="80" minY="276" maxY="316" name="chemist-l"/>
-  <symbol minX="80" maxX="120" minY="276" maxY="316" name="swimming-l"/>
+  <symbol minX="80" maxX="120" minY="276" maxY="316" name="museum-l"/>
   <symbol minX="120" maxX="160" minY="276" maxY="316" name="cinema-l"/>
-  <symbol minX="160" maxX="200" minY="276" maxY="316" name="museum-l"/>
-  <symbol minX="200" maxX="240" minY="276" maxY="316" name="motel-l"/>
+  <symbol minX="160" maxX="200" minY="276" maxY="316" name="motel-l"/>
+  <symbol minX="200" maxX="240" minY="276" maxY="316" name="wayside_shrine-l"/>
   <symbol minX="240" maxX="280" minY="276" maxY="316" name="clothes-l"/>
-  <symbol minX="280" maxX="320" minY="276" maxY="316" name="taxi-l"/>
+  <symbol minX="280" maxX="320" minY="276" maxY="316" name="swimming-l"/>
   <symbol minX="320" maxX="360" minY="276" maxY="316" name="college-l"/>
   <symbol minX="360" maxX="400" minY="276" maxY="316" name="mobile_phone-l"/>
-  <symbol minX="400" maxX="440" minY="276" maxY="316" name="wayside_shrine-l"/>
+  <symbol minX="400" maxX="440" minY="276" maxY="316" name="taxi-l"/>
   <symbol minX="440" maxX="480" minY="276" maxY="316" name="computer-l"/>
   <symbol minX="480" maxX="520" minY="276" maxY="316" name="military-l"/>
   <symbol minX="520" maxX="560" minY="276" maxY="316" name="convenience-l"/>
@@ -108,357 +108,357 @@
   <symbol minX="600" maxX="640" minY="276" maxY="316" name="cricket-l"/>
   <symbol minX="640" maxX="680" minY="276" maxY="316" name="marketplace-l"/>
   <symbol minX="680" maxX="720" minY="276" maxY="316" name="curling-l"/>
-  <symbol minX="720" maxX="760" minY="276" maxY="316" name="theatre-l"/>
+  <symbol minX="720" maxX="760" minY="276" maxY="316" name="mail-l"/>
   <symbol minX="760" maxX="800" minY="276" maxY="316" name="department_store-l"/>
-  <symbol minX="800" maxX="840" minY="276" maxY="316" name="mail-l"/>
+  <symbol minX="800" maxX="840" minY="276" maxY="316" name="theatre-l"/>
   <symbol minX="840" maxX="880" minY="276" maxY="316" name="diving-l"/>
   <symbol minX="880" maxX="920" minY="276" maxY="316" name="lightrail-berlin-l"/>
   <symbol minX="920" maxX="960" minY="276" maxY="316" name="dog_park-l"/>
-  <symbol minX="960" maxX="1000" minY="276" maxY="316" name="toilets-l"/>
+  <symbol minX="960" maxX="1000" minY="276" maxY="316" name="lighthouse-l"/>
   <symbol minX="0" maxX="40" minY="316" maxY="356" name="doityourself-l"/>
-  <symbol minX="40" maxX="80" minY="316" maxY="356" name="lighthouse-l"/>
-  <symbol minX="80" maxX="120" minY="316" maxY="356" name="lift_gate-l"/>
-  <symbol minX="120" maxX="160" minY="316" maxY="356" name="wayside_cross-l"/>
-  <symbol minX="160" maxX="200" minY="316" maxY="356" name="library-l"/>
+  <symbol minX="40" maxX="80" minY="316" maxY="356" name="lift_gate-l"/>
+  <symbol minX="80" maxX="120" minY="316" maxY="356" name="wayside_cross-l"/>
+  <symbol minX="120" maxX="160" minY="316" maxY="356" name="toilets-l"/>
+  <symbol minX="160" maxX="200" minY="316" maxY="356" name="waterfall-l"/>
   <symbol minX="200" maxX="240" minY="316" maxY="356" name="drinking-water-l"/>
-  <symbol minX="240" maxX="280" minY="316" maxY="356" name="laundry-l"/>
-  <symbol minX="280" maxX="320" minY="316" maxY="356" name="waterfall-l"/>
+  <symbol minX="240" maxX="280" minY="316" maxY="356" name="library-l"/>
+  <symbol minX="280" maxX="320" minY="316" maxY="356" name="laundry-l"/>
   <symbol minX="320" maxX="360" minY="316" maxY="356" name="kiosk-l"/>
   <symbol minX="360" maxX="400" minY="316" maxY="356" name="electronics-l"/>
-  <symbol minX="400" maxX="440" minY="316" maxY="356" name="toll_booth-l"/>
+  <symbol minX="400" maxX="440" minY="316" maxY="356" name="kindergarten-m"/>
   <symbol minX="440" maxX="480" minY="316" maxY="356" name="embassy-l"/>
-  <symbol minX="480" maxX="520" minY="316" maxY="356" name="kindergarten-m"/>
-  <symbol minX="520" maxX="560" minY="316" maxY="356" name="kindergarten-l"/>
-  <symbol minX="560" maxX="600" minY="316" maxY="356" name="volcano-l"/>
-  <symbol minX="600" maxX="640" minY="316" maxY="356" name="jewelry-l"/>
+  <symbol minX="480" maxX="520" minY="316" maxY="356" name="kindergarten-l"/>
+  <symbol minX="520" maxX="560" minY="316" maxY="356" name="volcano-l"/>
+  <symbol minX="560" maxX="600" minY="316" maxY="356" name="jewelry-l"/>
+  <symbol minX="600" maxX="640" minY="316" maxY="356" name="vending-l"/>
   <symbol minX="640" maxX="680" minY="316" maxY="356" name="equestrian-l"/>
   <symbol minX="680" maxX="720" minY="316" maxY="356" name="equestrian-m"/>
   <symbol minX="720" maxX="760" minY="316" maxY="356" name="fastfood-l"/>
-  <symbol minX="760" maxX="800" minY="316" maxY="356" name="information-l"/>
-  <symbol minX="800" maxX="840" minY="316" maxY="356" name="vending-l"/>
+  <symbol minX="760" maxX="800" minY="316" maxY="356" name="toll_booth-l"/>
+  <symbol minX="800" maxX="840" minY="316" maxY="356" name="information-l"/>
   <symbol minX="840" maxX="880" minY="316" maxY="356" name="fire_station-l"/>
   <symbol minX="880" maxX="920" minY="316" maxY="356" name="hunting-tower-l"/>
-  <symbol minX="920" maxX="960" minY="316" maxY="356" name="tomb-l"/>
+  <symbol minX="920" maxX="960" minY="316" maxY="356" name="tram-l"/>
   <symbol minX="960" maxX="1000" minY="316" maxY="356" name="florist-l"/>
   <symbol minX="0" maxX="40" minY="356" maxY="396" name="hotel-l"/>
   <symbol minX="40" maxX="80" minY="356" maxY="396" name="fountain-l"/>
-  <symbol minX="80" maxX="120" minY="356" maxY="396" name="hospital-l"/>
-  <symbol minX="120" maxX="160" minY="356" maxY="396" name="tram-l"/>
+  <symbol minX="80" maxX="120" minY="356" maxY="396" name="tomb-l"/>
+  <symbol minX="120" maxX="160" minY="356" maxY="396" name="hospital-l"/>
   <symbol minX="160" maxX="200" minY="356" maxY="396" name="fuel-l copy"/>
   <symbol minX="200" maxX="240" minY="356" maxY="396" name="fuel-l"/>
   <symbol minX="240" maxX="280" minY="356" maxY="396" name="historic-ship-l"/>
-  <symbol minX="280" maxX="320" minY="356" maxY="396" name="tourism-l"/>
+  <symbol minX="280" maxX="320" minY="356" maxY="396" name="train-l"/>
   <symbol minX="320" maxX="360" minY="356" maxY="396" name="funicular-l"/>
   <symbol minX="360" maxX="400" minY="356" maxY="396" name="heliport-l"/>
-  <symbol minX="400" maxX="440" minY="356" maxY="396" name="train-l"/>
+  <symbol minX="400" maxX="440" minY="356" maxY="396" name="tourism-l"/>
   <symbol minX="440" maxX="480" minY="356" maxY="396" name="furniture-l"/>
   <symbol minX="480" maxX="520" minY="356" maxY="396" name="helipad-l"/>
   <symbol minX="520" maxX="560" minY="356" maxY="396" name="gallery-l"/>
   <symbol minX="560" maxX="600" minY="356" maxY="396" name="hardware-l"/>
-  <symbol minX="600" maxX="640" minY="356" maxY="396" name="hand-m"/>
+  <symbol minX="600" maxX="640" minY="356" maxY="396" name="toys-l"/>
   <symbol minX="640" maxX="680" minY="356" maxY="396" name="garden-l"/>
-  <symbol minX="680" maxX="720" minY="356" maxY="396" name="hand-l"/>
-  <symbol minX="720" maxX="760" minY="356" maxY="396" name="toys-l"/>
+  <symbol minX="680" maxX="720" minY="356" maxY="396" name="hand-m"/>
+  <symbol minX="720" maxX="760" minY="356" maxY="396" name="hand-l"/>
   <symbol minX="760" maxX="800" minY="356" maxY="396" name="garden_center-l"/>
   <symbol minX="800" maxX="840" minY="356" maxY="396" name="hairdresser-l"/>
   <symbol minX="840" maxX="880" minY="356" maxY="396" name="gate-l"/>
-  <symbol minX="880" maxX="920" minY="356" maxY="396" name="townhall-l"/>
+  <symbol minX="880" maxX="920" minY="356" maxY="396" name="grocery-l"/>
   <symbol minX="920" maxX="960" minY="356" maxY="396" name="gift-l"/>
-  <symbol minX="960" maxX="1000" minY="356" maxY="396" name="grocery-l"/>
+  <symbol minX="960" maxX="1000" minY="356" maxY="396" name="greengrocer-l"/>
   <symbol minX="0" maxX="40" minY="396" maxY="436" name="golf-l"/>
-  <symbol minX="40" maxX="80" minY="396" maxY="436" name="greengrocer-l"/>
-  <symbol minX="80" maxX="119" minY="396" maxY="435" name="townhall-m"/>
-  <symbol minX="119" maxX="158" minY="396" maxY="435" name="golf-m"/>
+  <symbol minX="40" maxX="80" minY="396" maxY="436" name="townhall-l"/>
+  <symbol minX="80" maxX="119" minY="396" maxY="435" name="golf-m"/>
+  <symbol minX="119" maxX="158" minY="396" maxY="435" name="gift-m"/>
   <symbol minX="158" maxX="197" minY="396" maxY="435" name="greengrocer-m"/>
-  <symbol minX="197" maxX="236" minY="396" maxY="435" name="gift-m"/>
+  <symbol minX="197" maxX="236" minY="396" maxY="435" name="gate-m"/>
   <symbol minX="236" maxX="275" minY="396" maxY="435" name="grocery-m"/>
-  <symbol minX="275" maxX="314" minY="396" maxY="435" name="gate-m"/>
+  <symbol minX="275" maxX="314" minY="396" maxY="435" name="tourism-m"/>
   <symbol minX="314" maxX="353" minY="396" maxY="435" name="garden_center-m"/>
   <symbol minX="353" maxX="392" minY="396" maxY="435" name="hairdresser-m"/>
-  <symbol minX="392" maxX="431" minY="396" maxY="435" name="garden-m"/>
-  <symbol minX="431" maxX="470" minY="396" maxY="435" name="toys-m"/>
+  <symbol minX="392" maxX="431" minY="396" maxY="435" name="townhall-m"/>
+  <symbol minX="431" maxX="470" minY="396" maxY="435" name="garden-m"/>
   <symbol minX="470" maxX="509" minY="396" maxY="435" name="gallery-m"/>
   <symbol minX="509" maxX="548" minY="396" maxY="435" name="hardware-m"/>
   <symbol minX="548" maxX="587" minY="396" maxY="435" name="furniture-m"/>
   <symbol minX="587" maxX="626" minY="396" maxY="435" name="helipad-m"/>
-  <symbol minX="626" maxX="665" minY="396" maxY="435" name="tourism-m"/>
+  <symbol minX="626" maxX="665" minY="396" maxY="435" name="toys-m"/>
   <symbol minX="665" maxX="704" minY="396" maxY="435" name="funicular-m"/>
   <symbol minX="704" maxX="743" minY="396" maxY="435" name="heliport-m"/>
-  <symbol minX="743" maxX="782" minY="396" maxY="435" name="train-m"/>
+  <symbol minX="743" maxX="782" minY="396" maxY="435" name="tomb-m"/>
   <symbol minX="782" maxX="821" minY="396" maxY="435" name="fuel-m"/>
   <symbol minX="821" maxX="860" minY="396" maxY="435" name="historic-ship-m"/>
-  <symbol minX="860" maxX="899" minY="396" maxY="435" name="fountain-m"/>
+  <symbol minX="860" maxX="899" minY="396" maxY="435" name="train-m"/>
   <symbol minX="899" maxX="938" minY="396" maxY="435" name="hospital-m"/>
-  <symbol minX="938" maxX="977" minY="396" maxY="435" name="tomb-m"/>
+  <symbol minX="938" maxX="977" minY="396" maxY="435" name="fountain-m"/>
   <symbol minX="977" maxX="1016" minY="396" maxY="435" name="florist-m"/>
   <symbol minX="0" maxX="39" minY="436" maxY="475" name="hotel-m"/>
-  <symbol minX="39" maxX="78" minY="436" maxY="475" name="tram-m"/>
+  <symbol minX="39" maxX="78" minY="436" maxY="475" name="toll_booth-m"/>
   <symbol minX="78" maxX="117" minY="436" maxY="475" name="fire_station-m"/>
   <symbol minX="117" maxX="156" minY="436" maxY="475" name="hunting-tower-m"/>
-  <symbol minX="156" maxX="195" minY="436" maxY="475" name="fastfood-m"/>
+  <symbol minX="156" maxX="195" minY="436" maxY="475" name="tram-m"/>
   <symbol minX="195" maxX="234" minY="436" maxY="475" name="information-m"/>
-  <symbol minX="234" maxX="273" minY="436" maxY="475" name="toll_booth-m"/>
+  <symbol minX="234" maxX="273" minY="436" maxY="475" name="fastfood-m"/>
   <symbol minX="273" maxX="312" minY="436" maxY="475" name="vending-m"/>
   <symbol minX="312" maxX="351" minY="436" maxY="475" name="jewelry-m"/>
-  <symbol minX="351" maxX="390" minY="436" maxY="475" name="volcano-m"/>
-  <symbol minX="390" maxX="429" minY="436" maxY="475" name="embassy-m"/>
-  <symbol minX="429" maxX="468" minY="436" maxY="475" name="electronics-m"/>
+  <symbol minX="351" maxX="390" minY="436" maxY="475" name="embassy-m"/>
+  <symbol minX="390" maxX="429" minY="436" maxY="475" name="electronics-m"/>
+  <symbol minX="429" maxX="468" minY="436" maxY="475" name="toilets-m"/>
   <symbol minX="468" maxX="507" minY="436" maxY="475" name="drugs"/>
   <symbol minX="507" maxX="546" minY="436" maxY="475" name="kiosk-m"/>
-  <symbol minX="546" maxX="585" minY="436" maxY="475" name="drinking-water-m"/>
+  <symbol minX="546" maxX="585" minY="436" maxY="475" name="volcano-m"/>
   <symbol minX="585" maxX="624" minY="436" maxY="475" name="laundry-m"/>
-  <symbol minX="624" maxX="663" minY="436" maxY="475" name="waterfall-m"/>
+  <symbol minX="624" maxX="663" minY="436" maxY="475" name="drinking-water-m"/>
   <symbol minX="663" maxX="702" minY="436" maxY="475" name="library-m"/>
-  <symbol minX="702" maxX="741" minY="436" maxY="475" name="toilets-m"/>
-  <symbol minX="741" maxX="780" minY="436" maxY="475" name="wayside_cross-m"/>
+  <symbol minX="702" maxX="741" minY="436" maxY="475" name="waterfall-m"/>
+  <symbol minX="741" maxX="780" minY="436" maxY="475" name="doityourself-m"/>
   <symbol minX="780" maxX="819" minY="436" maxY="475" name="lift_gate-m"/>
-  <symbol minX="819" maxX="858" minY="436" maxY="475" name="doityourself-m"/>
+  <symbol minX="819" maxX="858" minY="436" maxY="475" name="dog_park-m"/>
   <symbol minX="858" maxX="897" minY="436" maxY="475" name="lighthouse-m"/>
-  <symbol minX="897" maxX="936" minY="436" maxY="475" name="dog_park-m"/>
+  <symbol minX="897" maxX="936" minY="436" maxY="475" name="theatre-m"/>
   <symbol minX="936" maxX="975" minY="436" maxY="475" name="diving-m"/>
-  <symbol minX="975" maxX="1014" minY="436" maxY="475" name="australian-football-m"/>
-  <symbol minX="0" maxX="39" minY="475" maxY="514" name="theatre-m"/>
-  <symbol minX="39" maxX="78" minY="475" maxY="514" name="department_store-m"/>
+  <symbol minX="975" maxX="1014" minY="436" maxY="475" name="ship-m"/>
+  <symbol minX="0" maxX="39" minY="475" maxY="514" name="department_store-m"/>
+  <symbol minX="39" maxX="78" minY="475" maxY="514" name="curling-m"/>
   <symbol minX="78" maxX="117" minY="475" maxY="514" name="mail-m"/>
-  <symbol minX="117" maxX="156" minY="475" maxY="514" name="curling-m"/>
+  <symbol minX="117" maxX="156" minY="475" maxY="514" name="tennis-m"/>
   <symbol minX="156" maxX="195" minY="475" maxY="514" name="cricket-m"/>
   <symbol minX="195" maxX="234" minY="475" maxY="514" name="marketplace-m"/>
-  <symbol minX="234" maxX="273" minY="475" maxY="514" name="tennis-m"/>
-  <symbol minX="273" maxX="312" minY="475" maxY="514" name="convenience-m"/>
+  <symbol minX="234" maxX="273" minY="475" maxY="514" name="convenience-m"/>
+  <symbol minX="273" maxX="312" minY="475" maxY="514" name="taxi-m"/>
   <symbol minX="312" maxX="351" minY="475" maxY="514" name="computer-m"/>
   <symbol minX="351" maxX="390" minY="475" maxY="514" name="military-m"/>
-  <symbol minX="390" maxX="429" minY="475" maxY="514" name="taxi-m"/>
+  <symbol minX="390" maxX="429" minY="475" maxY="514" name="wayside_cross-m"/>
   <symbol minX="429" maxX="468" minY="475" maxY="514" name="college-m"/>
   <symbol minX="468" maxX="507" minY="475" maxY="514" name="mobile_phone-m"/>
-  <symbol minX="507" maxX="546" minY="475" maxY="514" name="clothes-m"/>
+  <symbol minX="507" maxX="546" minY="475" maxY="514" name="swimming-m"/>
   <symbol minX="546" maxX="585" minY="475" maxY="514" name="monument-m"/>
-  <symbol minX="585" maxX="624" minY="475" maxY="514" name="swimming-m"/>
-  <symbol minX="624" maxX="663" minY="475" maxY="514" name="wayside_shrine-m"/>
+  <symbol minX="585" maxX="624" minY="475" maxY="514" name="clothes-m"/>
+  <symbol minX="624" maxX="663" minY="475" maxY="514" name="cinema-m"/>
   <symbol minX="663" maxX="702" minY="475" maxY="514" name="motel-m"/>
-  <symbol minX="702" maxX="741" minY="475" maxY="514" name="cinema-m"/>
+  <symbol minX="702" maxX="741" minY="475" maxY="514" name="chemist-m"/>
   <symbol minX="741" maxX="780" minY="475" maxY="514" name="museum-m"/>
-  <symbol minX="780" maxX="819" minY="475" maxY="514" name="chemist-m"/>
-  <symbol minX="819" maxX="858" minY="475" maxY="514" name="sweets-m"/>
-  <symbol minX="858" maxX="897" minY="475" maxY="514" name="cemetery-m"/>
-  <symbol minX="897" maxX="936" minY="475" maxY="514" name="subway-spb-m"/>
-  <symbol minX="936" maxX="975" minY="475" maxY="514" name="windmill-m"/>
-  <symbol minX="975" maxX="1014" minY="475" maxY="514" name="ship-m"/>
-  <symbol minX="0" maxX="39" minY="514" maxY="553" name="cave-m"/>
-  <symbol minX="39" maxX="78" minY="514" maxY="553" name="casino-m"/>
+  <symbol minX="780" maxX="819" minY="475" maxY="514" name="sweets-m"/>
+  <symbol minX="819" maxX="858" minY="475" maxY="514" name="wayside_shrine-m"/>
+  <symbol minX="858" maxX="897" minY="475" maxY="514" name="subway-spb-m"/>
+  <symbol minX="897" maxX="936" minY="475" maxY="514" name="cemetery-m"/>
+  <symbol minX="936" maxX="975" minY="475" maxY="514" name="australian-football-m"/>
+  <symbol minX="975" maxX="1014" minY="475" maxY="514" name="cave-m"/>
+  <symbol minX="0" maxX="39" minY="514" maxY="553" name="subway-newyork-m"/>
+  <symbol minX="39" maxX="78" minY="514" maxY="553" name="windmill-m"/>
   <symbol minX="78" maxX="117" minY="514" maxY="553" name="npark-m"/>
-  <symbol minX="117" maxX="156" minY="514" maxY="553" name="subway-newyork-m"/>
+  <symbol minX="117" maxX="156" minY="514" maxY="553" name="casino-m"/>
   <symbol minX="156" maxX="195" minY="514" maxY="553" name="caravan_site-m"/>
   <symbol minX="195" maxX="234" minY="514" maxY="553" name="nparkf-m"/>
-  <symbol minX="234" maxX="273" minY="514" maxY="553" name="car_sharing-m"/>
-  <symbol minX="273" maxX="312" minY="514" maxY="553" name="zoo-m"/>
+  <symbol minX="234" maxX="273" minY="514" maxY="553" name="bakery-m"/>
+  <symbol minX="273" maxX="312" minY="514" maxY="553" name="car_sharing-m"/>
   <symbol minX="312" maxX="351" minY="514" maxY="553" name="office-m"/>
-  <symbol minX="351" maxX="390" minY="514" maxY="553" name="bakery-m"/>
+  <symbol minX="351" maxX="390" minY="514" maxY="553" name="subway-m"/>
   <symbol minX="390" maxX="429" minY="514" maxY="553" name="car-repair-m"/>
   <symbol minX="429" maxX="468" minY="514" maxY="553" name="optician-m"/>
-  <symbol minX="468" maxX="507" minY="514" maxY="553" name="atm-m"/>
+  <symbol minX="468" maxX="507" minY="514" maxY="553" name="zoo-m"/>
   <symbol minX="507" maxX="546" minY="514" maxY="553" name="park-m"/>
-  <symbol minX="546" maxX="585" minY="514" maxY="553" name="subway-m"/>
-  <symbol minX="585" maxX="624" minY="514" maxY="553" name="shoes-m"/>
-  <symbol minX="624" maxX="663" minY="514" maxY="553" name="campsite-m"/>
-  <symbol minX="663" maxX="702" minY="514" maxY="553" name="cafe-m"/>
+  <symbol minX="546" maxX="585" minY="514" maxY="553" name="campsite-m"/>
+  <symbol minX="585" maxX="624" minY="514" maxY="553" name="school-m"/>
+  <symbol minX="624" maxX="663" minY="514" maxY="553" name="subway-entrance-m"/>
+  <symbol minX="663" maxX="702" minY="514" maxY="553" name="atm-m"/>
   <symbol minX="702" maxX="741" minY="514" maxY="553" name="parking-meter-m"/>
-  <symbol minX="741" maxX="780" minY="514" maxY="553" name="subway-entrance-m"/>
-  <symbol minX="780" maxX="819" minY="514" maxY="553" name="archery-m"/>
+  <symbol minX="741" maxX="780" minY="514" maxY="553" name="cafe-m"/>
+  <symbol minX="780" maxX="819" minY="514" maxY="553" name="cable-car-m"/>
   <symbol minX="819" maxX="858" minY="514" maxY="553" name="peak-m"/>
-  <symbol minX="858" maxX="897" minY="514" maxY="553" name="cable-car-m"/>
-  <symbol minX="897" maxX="936" minY="514" maxY="553" name="subway-entrance-2-m"/>
-  <symbol minX="936" maxX="975" minY="514" maxY="553" name="school-m"/>
-  <symbol minX="975" maxX="1014" minY="514" maxY="553" name="sports-m"/>
-  <symbol minX="0" maxX="39" minY="553" maxY="592" name="butcher-m"/>
+  <symbol minX="858" maxX="897" minY="514" maxY="553" name="subway-entrance-2-m"/>
+  <symbol minX="897" maxX="936" minY="514" maxY="553" name="bank-2-m"/>
+  <symbol minX="936" maxX="975" minY="514" maxY="553" name="sports-m"/>
+  <symbol minX="975" maxX="1014" minY="514" maxY="553" name="butcher-m"/>
+  <symbol minX="0" maxX="39" minY="553" maxY="592" name="archery-m"/>
   <symbol minX="39" maxX="78" minY="553" maxY="592" name="pharmacy-m"/>
-  <symbol minX="78" maxX="117" minY="553" maxY="592" name="bus-m"/>
-  <symbol minX="117" maxX="156" minY="553" maxY="592" name="bowls-m"/>
+  <symbol minX="78" maxX="117" minY="553" maxY="592" name="shoes-m"/>
+  <symbol minX="117" maxX="156" minY="553" maxY="592" name="bus-m"/>
   <symbol minX="156" maxX="195" minY="553" maxY="592" name="phone-m"/>
-  <symbol minX="195" maxX="234" minY="553" maxY="592" name="bank-2-m"/>
-  <symbol minX="234" maxX="273" minY="553" maxY="592" name="boundary_stone-m"/>
+  <symbol minX="195" maxX="234" minY="553" maxY="592" name="soccer-m"/>
+  <symbol minX="234" maxX="273" minY="553" maxY="592" name="bowls-m"/>
   <symbol minX="273" maxX="312" minY="553" maxY="592" name="picnic-m"/>
-  <symbol minX="312" maxX="351" minY="553" maxY="592" name="soccer-m"/>
-  <symbol minX="351" maxX="390" minY="553" maxY="592" name="america-football-m"/>
+  <symbol minX="312" maxX="351" minY="553" maxY="592" name="boundary_stone-m"/>
+  <symbol minX="351" maxX="390" minY="553" maxY="592" name="book-shop-m"/>
   <symbol minX="390" maxX="429" minY="553" maxY="592" name="pitch-m"/>
-  <symbol minX="429" maxX="468" minY="553" maxY="592" name="book-shop-m"/>
-  <symbol minX="468" maxX="507" minY="553" maxY="592" name="bicycle-m"/>
+  <symbol minX="429" maxX="468" minY="553" maxY="592" name="skiing-m"/>
+  <symbol minX="468" maxX="507" minY="553" maxY="592" name="america-football-m"/>
   <symbol minX="507" maxX="546" minY="553" maxY="592" name="place-of-worship-m"/>
-  <symbol minX="546" maxX="585" minY="553" maxY="592" name="skiing-m"/>
+  <symbol minX="546" maxX="585" minY="553" maxY="592" name="bicycle-m"/>
   <symbol minX="585" maxX="624" minY="553" maxY="592" name="alpine_hut-m"/>
   <symbol minX="624" maxX="663" minY="553" maxY="592" name="police-m"/>
-  <symbol minX="663" maxX="702" minY="553" maxY="592" name="beer-m"/>
-  <symbol minX="702" maxX="741" minY="553" maxY="592" name="beauty-m"/>
+  <symbol minX="663" maxX="702" minY="553" maxY="592" name="shop-m"/>
+  <symbol minX="702" maxX="741" minY="553" maxY="592" name="beer-m"/>
   <symbol minX="741" maxX="780" minY="553" maxY="592" name="postbox-m"/>
-  <symbol minX="780" maxX="819" minY="553" maxY="592" name="beach-m"/>
-  <symbol minX="819" maxX="858" minY="553" maxY="592" name="banknote-m"/>
+  <symbol minX="780" maxX="819" minY="553" maxY="592" name="beauty-m"/>
+  <symbol minX="819" maxX="858" minY="553" maxY="592" name="beach-m"/>
   <symbol minX="858" maxX="897" minY="553" maxY="592" name="bcontrol-m"/>
   <symbol minX="897" maxX="936" minY="553" maxY="592" name="pub-m"/>
-  <symbol minX="936" maxX="975" minY="553" maxY="592" name="shop-m"/>
-  <symbol minX="975" maxX="1014" minY="553" maxY="592" name="shop-m copy"/>
-  <symbol minX="0" maxX="39" minY="592" maxY="631" name="bbq-m"/>
+  <symbol minX="936" maxX="975" minY="553" maxY="592" name="shop-m copy"/>
+  <symbol minX="975" maxX="1014" minY="553" maxY="592" name="bbq-m"/>
+  <symbol minX="0" maxX="39" minY="592" maxY="631" name="alcohol-m"/>
   <symbol minX="39" maxX="78" minY="592" maxY="631" name="recycling-m"/>
-  <symbol minX="78" maxX="117" minY="592" maxY="631" name="alcohol-m"/>
-  <symbol minX="117" maxX="156" minY="592" maxY="631" name="basketball-m"/>
+  <symbol minX="78" maxX="117" minY="592" maxY="631" name="basketball-m"/>
+  <symbol minX="117" maxX="156" minY="592" maxY="631" name="baseball-m"/>
   <symbol minX="156" maxX="195" minY="592" maxY="631" name="remains-m"/>
-  <symbol minX="195" maxX="234" minY="592" maxY="631" name="baseball-m"/>
+  <symbol minX="195" maxX="234" minY="592" maxY="631" name="shop-bicycle-m"/>
   <symbol minX="234" maxX="273" minY="592" maxY="631" name="bar-m"/>
   <symbol minX="273" maxX="312" minY="592" maxY="631" name="restaurant-m"/>
-  <symbol minX="312" maxX="351" minY="592" maxY="631" name="shop-bicycle-m"/>
-  <symbol minX="351" maxX="387" minY="592" maxY="628" name="parking-l"/>
-  <symbol minX="387" maxX="423" minY="592" maxY="628" name="speedcam-l"/>
-  <symbol minX="423" maxX="459" minY="592" maxY="628" name="subway-berlin-l"/>
-  <symbol minX="459" maxX="495" minY="592" maxY="628" name="lightrail-berlin-m"/>
-  <symbol minX="495" maxX="535" minY="592" maxY="628" name="subway-moscow-l"/>
-  <symbol minX="535" maxX="571" minY="592" maxY="628" name="subway-rome-l"/>
-  <symbol minX="571" maxX="605" minY="592" maxY="626" name="route_from"/>
-  <symbol minX="605" maxX="638" minY="592" maxY="625" name="no-icon-leisure"/>
-  <symbol minX="638" maxX="671" minY="592" maxY="625" name="subway-rome-m"/>
-  <symbol minX="671" maxX="708" minY="592" maxY="625" name="subway-moscow-m"/>
-  <symbol minX="708" maxX="741" minY="592" maxY="625" name="no-icon-amenity"/>
-  <symbol minX="741" maxX="774" minY="592" maxY="625" name="no-icon-shop"/>
-  <symbol minX="774" maxX="807" minY="592" maxY="625" name="no-icon-tourism"/>
-  <symbol minX="807" maxX="840" minY="592" maxY="625" name="subway-berlin-m"/>
-  <symbol minX="840" maxX="873" minY="592" maxY="625" name="no-icon"/>
-  <symbol minX="873" maxX="906" minY="592" maxY="625" name="subway-paris-m"/>
-  <symbol minX="906" maxX="938" minY="592" maxY="624" name="current-position"/>
-  <symbol minX="938" maxX="978" minY="592" maxY="624" name="subway-london-l"/>
-  <symbol minX="978" maxX="1009" minY="592" maxY="623" name="airport-s"/>
+  <symbol minX="312" maxX="351" minY="592" maxY="631" name="banknote-m"/>
+  <symbol minX="351" maxX="387" minY="592" maxY="628" name="speedcam-l"/>
+  <symbol minX="387" maxX="423" minY="592" maxY="628" name="subway-berlin-l"/>
+  <symbol minX="423" maxX="459" minY="592" maxY="628" name="parking-l"/>
+  <symbol minX="459" maxX="499" minY="592" maxY="628" name="subway-moscow-l"/>
+  <symbol minX="499" maxX="535" minY="592" maxY="628" name="subway-rome-l"/>
+  <symbol minX="535" maxX="571" minY="592" maxY="628" name="lightrail-berlin-m"/>
+  <symbol minX="571" maxX="604" minY="592" maxY="625" name="no-icon-leisure"/>
+  <symbol minX="604" maxX="637" minY="592" maxY="625" name="no-icon-tourism"/>
+  <symbol minX="637" maxX="674" minY="592" maxY="625" name="subway-moscow-m"/>
+  <symbol minX="674" maxX="707" minY="592" maxY="625" name="no-icon-amenity"/>
+  <symbol minX="707" maxX="740" minY="592" maxY="625" name="no-icon-shop"/>
+  <symbol minX="740" maxX="773" minY="592" maxY="625" name="subway-rome-m"/>
+  <symbol minX="773" maxX="806" minY="592" maxY="625" name="subway-berlin-m"/>
+  <symbol minX="806" maxX="839" minY="592" maxY="625" name="subway-paris-m"/>
+  <symbol minX="839" maxX="872" minY="592" maxY="625" name="no-icon"/>
+  <symbol minX="872" maxX="904" minY="592" maxY="624" name="current-position"/>
+  <symbol minX="904" maxX="944" minY="592" maxY="624" name="subway-london-l"/>
+  <symbol minX="944" maxX="975" minY="592" maxY="623" name="airport-s"/>
+  <symbol minX="975" maxX="1005" minY="592" maxY="622" name="pitch-s"/>
   <symbol minX="0" maxX="30" minY="631" maxY="661" name="skiing-s"/>
-  <symbol minX="30" maxX="60" minY="631" maxY="661" name="pitch-s"/>
-  <symbol minX="60" maxX="90" minY="631" maxY="661" name="picnic-s"/>
+  <symbol minX="30" maxX="60" minY="631" maxY="661" name="picnic-s"/>
+  <symbol minX="60" maxX="90" minY="631" maxY="661" name="phone-s"/>
   <symbol minX="90" maxX="120" minY="631" maxY="661" name="soccer-s"/>
-  <symbol minX="120" maxX="150" minY="631" maxY="661" name="phone-s"/>
+  <symbol minX="120" maxX="150" minY="631" maxY="661" name="pharmacy-s"/>
   <symbol minX="150" maxX="180" minY="631" maxY="661" name="speedcam-m"/>
   <symbol minX="180" maxX="210" minY="631" maxY="661" name="atm-s"/>
-  <symbol minX="210" maxX="240" minY="631" maxY="661" name="pharmacy-s"/>
-  <symbol minX="240" maxX="270" minY="631" maxY="661" name="bar-s"/>
-  <symbol minX="270" maxX="300" minY="631" maxY="661" name="school-s"/>
-  <symbol minX="300" maxX="330" minY="631" maxY="661" name="baseball-s"/>
-  <symbol minX="330" maxX="360" minY="631" maxY="661" name="basketball-s"/>
+  <symbol minX="210" maxX="240" minY="631" maxY="661" name="bar-s"/>
+  <symbol minX="240" maxX="270" minY="631" maxY="661" name="school-s"/>
+  <symbol minX="270" maxX="300" minY="631" maxY="661" name="baseball-s"/>
+  <symbol minX="300" maxX="330" minY="631" maxY="661" name="basketball-s"/>
+  <symbol minX="330" maxX="360" minY="631" maxY="661" name="alcohol-s"/>
   <symbol minX="360" maxX="390" minY="631" maxY="661" name="bcontrol-s"/>
-  <symbol minX="390" maxX="420" minY="631" maxY="661" name="alcohol-s"/>
+  <symbol minX="390" maxX="420" minY="631" maxY="661" name="beer-s"/>
   <symbol minX="420" maxX="456" minY="631" maxY="661" name="subway-barcelona-s"/>
-  <symbol minX="456" maxX="486" minY="631" maxY="661" name="beer-s"/>
+  <symbol minX="456" maxX="486" minY="631" maxY="661" name="bicycle-s"/>
   <symbol minX="486" maxX="516" minY="631" maxY="661" name="place-of-worship-s"/>
-  <symbol minX="516" maxX="546" minY="631" maxY="661" name="bicycle-s"/>
-  <symbol minX="546" maxX="576" minY="631" maxY="661" name="book-shop-s"/>
+  <symbol minX="516" maxX="546" minY="631" maxY="661" name="america-football-s"/>
+  <symbol minX="546" maxX="576" minY="631" maxY="661" name="peak-s"/>
   <symbol minX="576" maxX="606" minY="631" maxY="661" name="subway-entrance-2-s"/>
   <symbol minX="606" maxX="636" minY="631" maxY="661" name="subway-entrance-arrow"/>
-  <symbol minX="636" maxX="666" minY="631" maxY="661" name="peak-s"/>
-  <symbol minX="666" maxX="696" minY="631" maxY="661" name="america-football-s"/>
+  <symbol minX="636" maxX="666" minY="631" maxY="661" name="book-shop-s"/>
+  <symbol minX="666" maxX="696" minY="631" maxY="661" name="bus-s"/>
   <symbol minX="696" maxX="726" minY="631" maxY="661" name="subway-entrance-s"/>
-  <symbol minX="726" maxX="756" minY="631" maxY="661" name="bus-s"/>
-  <symbol minX="756" maxX="786" minY="631" maxY="661" name="cable-car-s"/>
-  <symbol minX="786" maxX="816" minY="631" maxY="661" name="cafe-s"/>
-  <symbol minX="816" maxX="846" minY="631" maxY="661" name="campsite-s"/>
-  <symbol minX="846" maxX="876" minY="631" maxY="661" name="police-s"/>
+  <symbol minX="726" maxX="756" minY="631" maxY="661" name="cable-car-s"/>
+  <symbol minX="756" maxX="786" minY="631" maxY="661" name="cafe-s"/>
+  <symbol minX="786" maxX="816" minY="631" maxY="661" name="zoo-s"/>
+  <symbol minX="816" maxX="846" minY="631" maxY="661" name="park-s"/>
+  <symbol minX="846" maxX="876" minY="631" maxY="661" name="shop-s"/>
   <symbol minX="876" maxX="915" minY="631" maxY="661" name="subway-london-m"/>
-  <symbol minX="915" maxX="945" minY="631" maxY="661" name="zoo-s"/>
-  <symbol minX="945" maxX="975" minY="631" maxY="661" name="park-s"/>
+  <symbol minX="915" maxX="945" minY="631" maxY="661" name="campsite-s"/>
+  <symbol minX="945" maxX="975" minY="631" maxY="661" name="office-s"/>
   <symbol minX="975" maxX="1005" minY="631" maxY="661" name="car-repair-s"/>
-  <symbol minX="0" maxX="30" minY="661" maxY="691" name="casino-s"/>
-  <symbol minX="30" maxX="60" minY="661" maxY="691" name="windmill-s"/>
+  <symbol minX="0" maxX="30" minY="661" maxY="691" name="windmill-s"/>
+  <symbol minX="30" maxX="60" minY="661" maxY="691" name="casino-s"/>
   <symbol minX="60" maxX="90" minY="661" maxY="691" name="cave-s"/>
   <symbol minX="90" maxX="120" minY="661" maxY="691" name="cemetery-s"/>
   <symbol minX="120" maxX="150" minY="661" maxY="691" name="cinema-s"/>
-  <symbol minX="150" maxX="180" minY="661" maxY="691" name="office-s"/>
-  <symbol minX="180" maxX="210" minY="661" maxY="691" name="shop-s"/>
+  <symbol minX="150" maxX="180" minY="661" maxY="691" name="nparkf-s"/>
+  <symbol minX="180" maxX="210" minY="661" maxY="691" name="shop-s copy"/>
   <symbol minX="210" maxX="240" minY="661" maxY="691" name="college-s"/>
-  <symbol minX="240" maxX="270" minY="661" maxY="691" name="nparkf-s"/>
-  <symbol minX="270" maxX="300" minY="661" maxY="691" name="npark-s"/>
+  <symbol minX="240" maxX="270" minY="661" maxY="691" name="npark-s"/>
+  <symbol minX="270" maxX="300" minY="661" maxY="691" name="waterfall-s"/>
   <symbol minX="300" maxX="330" minY="661" maxY="691" name="subway-newyork-s"/>
-  <symbol minX="330" maxX="360" minY="661" maxY="691" name="waterfall-s"/>
-  <symbol minX="360" maxX="390" minY="661" maxY="691" name="drinking-water-s"/>
-  <symbol minX="390" maxX="420" minY="661" maxY="691" name="shop-s copy"/>
-  <symbol minX="420" maxX="450" minY="661" maxY="691" name="volcano-s"/>
-  <symbol minX="450" maxX="480" minY="661" maxY="691" name="pub-s"/>
-  <symbol minX="480" maxX="510" minY="661" maxY="691" name="embassy-s"/>
-  <symbol minX="510" maxX="540" minY="661" maxY="691" name="fastfood-s"/>
+  <symbol minX="330" maxX="360" minY="661" maxY="691" name="volcano-s"/>
+  <symbol minX="360" maxX="390" minY="661" maxY="691" name="police-s"/>
+  <symbol minX="390" maxX="420" minY="661" maxY="691" name="pub-s"/>
+  <symbol minX="420" maxX="450" minY="661" maxY="691" name="drinking-water-s"/>
+  <symbol minX="450" maxX="480" minY="661" maxY="691" name="embassy-s"/>
+  <symbol minX="480" maxX="510" minY="661" maxY="691" name="recycling-s"/>
+  <symbol minX="510" maxX="540" minY="661" maxY="691" name="tram-s"/>
   <symbol minX="540" maxX="570" minY="661" maxY="691" name="subway-s"/>
-  <symbol minX="570" maxX="600" minY="661" maxY="691" name="recycling-s"/>
-  <symbol minX="600" maxX="630" minY="661" maxY="691" name="remains-s"/>
+  <symbol minX="570" maxX="600" minY="661" maxY="691" name="remains-s"/>
+  <symbol minX="600" maxX="630" minY="661" maxY="691" name="ship-s"/>
   <symbol minX="630" maxX="660" minY="661" maxY="691" name="subway-spb-s"/>
-  <symbol minX="660" maxX="690" minY="661" maxY="691" name="tram-s"/>
+  <symbol minX="660" maxX="690" minY="661" maxY="691" name="fastfood-s"/>
   <symbol minX="690" maxX="720" minY="661" maxY="691" name="fire_station-s"/>
-  <symbol minX="720" maxX="750" minY="661" maxY="691" name="fountain-s"/>
-  <symbol minX="750" maxX="780" minY="661" maxY="691" name="train-s"/>
+  <symbol minX="720" maxX="750" minY="661" maxY="691" name="train-s"/>
+  <symbol minX="750" maxX="780" minY="661" maxY="691" name="fountain-s"/>
   <symbol minX="780" maxX="810" minY="661" maxY="691" name="fuel-s"/>
-  <symbol minX="810" maxX="840" minY="661" maxY="691" name="ship-s"/>
-  <symbol minX="840" maxX="870" minY="661" maxY="691" name="restaurant-s"/>
-  <symbol minX="870" maxX="900" minY="661" maxY="691" name="museum-s"/>
-  <symbol minX="900" maxX="930" minY="661" maxY="691" name="monument-s"/>
+  <symbol minX="810" maxX="840" minY="661" maxY="691" name="restaurant-s"/>
+  <symbol minX="840" maxX="870" minY="661" maxY="691" name="museum-s"/>
+  <symbol minX="870" maxX="900" minY="661" maxY="691" name="monument-s"/>
+  <symbol minX="900" maxX="930" minY="661" maxY="691" name="atm-s copy 2"/>
   <symbol minX="930" maxX="960" minY="661" maxY="691" name="swimming-s"/>
-  <symbol minX="960" maxX="990" minY="661" maxY="691" name="atm-s copy 2"/>
-  <symbol minX="990" maxX="1020" minY="661" maxY="691" name="military-s"/>
-  <symbol minX="0" maxX="30" minY="691" maxY="721" name="funicular-s"/>
-  <symbol minX="30" maxX="60" minY="691" maxY="721" name="gallery-s"/>
+  <symbol minX="960" maxX="990" minY="661" maxY="691" name="military-s"/>
+  <symbol minX="990" maxX="1020" minY="661" maxY="691" name="funicular-s"/>
+  <symbol minX="0" maxX="30" minY="691" maxY="721" name="gallery-s"/>
+  <symbol minX="30" maxX="60" minY="691" maxY="721" name="mail-s"/>
   <symbol minX="60" maxX="90" minY="691" maxY="721" name="tennis-s"/>
-  <symbol minX="90" maxX="120" minY="691" maxY="721" name="mail-s"/>
-  <symbol minX="120" maxX="150" minY="691" maxY="721" name="garden-s"/>
+  <symbol minX="90" maxX="120" minY="691" maxY="721" name="townhall-s"/>
+  <symbol minX="120" maxX="150" minY="691" maxY="721" name="lighthouse-s"/>
   <symbol minX="150" maxX="180" minY="691" maxY="721" name="theatre-s"/>
-  <symbol minX="180" maxX="210" minY="691" maxY="721" name="lighthouse-s"/>
-  <symbol minX="210" maxX="240" minY="691" maxY="721" name="library-s"/>
+  <symbol minX="180" maxX="210" minY="691" maxY="721" name="library-s"/>
+  <symbol minX="210" maxX="240" minY="691" maxY="721" name="kindergarten-s"/>
   <symbol minX="240" maxX="270" minY="691" maxY="721" name="toilets-s"/>
-  <symbol minX="270" maxX="300" minY="691" maxY="721" name="kindergarten-s"/>
-  <symbol minX="300" maxX="330" minY="691" maxY="721" name="information-s"/>
-  <symbol minX="330" maxX="360" minY="691" maxY="721" name="hotel-s"/>
-  <symbol minX="360" maxX="390" minY="691" maxY="721" name="hospital-s"/>
-  <symbol minX="390" maxX="420" minY="691" maxY="721" name="heliport-s"/>
-  <symbol minX="420" maxX="450" minY="691" maxY="721" name="helipad-s"/>
+  <symbol minX="270" maxX="300" minY="691" maxY="721" name="information-s"/>
+  <symbol minX="300" maxX="330" minY="691" maxY="721" name="hotel-s"/>
+  <symbol minX="330" maxX="360" minY="691" maxY="721" name="hospital-s"/>
+  <symbol minX="360" maxX="390" minY="691" maxY="721" name="heliport-s"/>
+  <symbol minX="390" maxX="420" minY="691" maxY="721" name="helipad-s"/>
+  <symbol minX="420" maxX="450" minY="691" maxY="721" name="grocery-s"/>
   <symbol minX="450" maxX="480" minY="691" maxY="721" name="tourism-s"/>
-  <symbol minX="480" maxX="510" minY="691" maxY="721" name="grocery-s"/>
-  <symbol minX="510" maxX="540" minY="691" maxY="721" name="golf-s"/>
-  <symbol minX="540" maxX="570" minY="691" maxY="721" name="townhall-s"/>
-  <symbol minX="570" maxX="610" minY="691" maxY="720" name="subway-barcelona-l"/>
-  <symbol minX="610" maxX="650" minY="691" maxY="720" name="metro-barcelona-m"/>
-  <symbol minX="650" maxX="690" minY="691" maxY="720" name="subway-barcelona-m"/>
-  <symbol minX="690" maxX="730" minY="691" maxY="720" name="subway-madrid-m"/>
-  <symbol minX="730" maxX="770" minY="691" maxY="720" name="subway-madrid-l"/>
-  <symbol minX="770" maxX="798" minY="691" maxY="719" name="parking-m"/>
-  <symbol minX="798" maxX="825" minY="691" maxY="719" name="s-arrow"/>
-  <symbol minX="825" maxX="861" minY="691" maxY="718" name="subway-madrid-s"/>
-  <symbol minX="861" maxX="888" minY="691" maxY="718" name="lightrail-berlin-s"/>
-  <symbol minX="888" maxX="924" minY="691" maxY="718" name="metro-barcelona-s"/>
-  <symbol minX="924" maxX="963" minY="691" maxY="718" name="subway-kiev-l"/>
-  <symbol minX="963" maxX="1002" minY="691" maxY="718" name="subway-kiev-m"/>
-  <symbol minX="0" maxX="27" minY="721" maxY="748" name="subway-paris-s"/>
-  <symbol minX="27" maxX="52" minY="721" maxY="746" name="subway-moscow-s"/>
-  <symbol minX="52" maxX="77" minY="721" maxY="746" name="api-result"/>
-  <symbol minX="77" maxX="101" minY="721" maxY="745" name="speedcam-s"/>
-  <symbol minX="101" maxX="128" minY="721" maxY="745" name="bench"/>
-  <symbol minX="128" maxX="152" minY="721" maxY="745" name="subway-berlin-s"/>
-  <symbol minX="152" maxX="176" minY="721" maxY="745" name="search-result"/>
-  <symbol minX="176" maxX="200" minY="721" maxY="745" name="star-l"/>
-  <symbol minX="200" maxX="224" minY="721" maxY="745" name="parking-s"/>
-  <symbol minX="224" maxX="248" minY="721" maxY="745" name="subway-rome-s"/>
-  <symbol minX="248" maxX="278" minY="721" maxY="745" name="subway-london-s"/>
-  <symbol minX="278" maxX="317" minY="721" maxY="743" name="subway-minsk-l"/>
-  <symbol minX="317" maxX="339" minY="721" maxY="743" name="star-m"/>
-  <symbol minX="339" maxX="363" minY="721" maxY="743" name="peakt-l"/>
-  <symbol minX="363" maxX="385" minY="721" maxY="743" name="survey_point-l"/>
-  <symbol minX="385" maxX="418" minY="721" maxY="742" name="subway-kiev-s"/>
-  <symbol minX="418" maxX="437" minY="721" maxY="740" name="subway-xs"/>
-  <symbol minX="437" maxX="467" minY="721" maxY="740" name="railway-crossing"/>
-  <symbol minX="467" maxX="486" minY="721" maxY="740" name="subway-newyork-xs"/>
-  <symbol minX="486" maxX="505" minY="721" maxY="740" name="survey_point-m"/>
-  <symbol minX="505" maxX="538" minY="721" maxY="740" name="subway-minsk-m"/>
-  <symbol minX="538" maxX="557" minY="721" maxY="740" name="star-s"/>
-  <symbol minX="557" maxX="587" minY="721" maxY="739" name="subway-minsk-s"/>
-  <symbol minX="587" maxX="605" minY="721" maxY="739" name="subway-xs copy"/>
-  <symbol minX="605" maxX="641" minY="721" maxY="737" name="arrow-m"/>
-  <symbol minX="641" maxX="659" minY="721" maxY="737" name="peakt-m"/>
-  <symbol minX="659" maxX="675" minY="721" maxY="737" name="survey_point-s"/>
-  <symbol minX="675" maxX="690" minY="721" maxY="736" name="entrance-s"/>
-  <symbol minX="690" maxX="703" minY="721" maxY="734" name="dot-m"/>
-  <symbol minX="703" maxX="718" minY="721" maxY="734" name="peakt-s"/>
-  <symbol minX="718" maxX="730" minY="721" maxY="733" name="none"/>
-  <symbol minX="730" maxX="742" minY="721" maxY="733" name="tree-l"/>
-  <symbol minX="742" maxX="769" minY="721" maxY="733" name="arrow-s"/>
-  <symbol minX="769" maxX="779" minY="721" maxY="731" name="tree-m"/>
-  <symbol minX="779" maxX="789" minY="721" maxY="731" name="entrance-xs"/>
-  <symbol minX="789" maxX="799" minY="721" maxY="731" name="dot-s-light"/>
-  <symbol minX="799" maxX="809" minY="721" maxY="731" name="dot-s"/>
-  <symbol minX="809" maxX="818" minY="721" maxY="730" name="tree-s"/>
-  <symbol minX="818" maxX="827" minY="721" maxY="730" name="zero-icon"/>
+  <symbol minX="480" maxX="510" minY="691" maxY="721" name="golf-s"/>
+  <symbol minX="510" maxX="540" minY="691" maxY="721" name="garden-s"/>
+  <symbol minX="540" maxX="580" minY="691" maxY="720" name="subway-madrid-m"/>
+  <symbol minX="580" maxX="620" minY="691" maxY="720" name="metro-barcelona-m"/>
+  <symbol minX="620" maxX="660" minY="691" maxY="720" name="subway-madrid-l"/>
+  <symbol minX="660" maxX="700" minY="691" maxY="720" name="subway-barcelona-l"/>
+  <symbol minX="700" maxX="740" minY="691" maxY="720" name="subway-barcelona-m"/>
+  <symbol minX="740" maxX="768" minY="691" maxY="719" name="parking-m"/>
+  <symbol minX="768" maxX="795" minY="691" maxY="719" name="s-arrow"/>
+  <symbol minX="795" maxX="823" minY="691" maxY="719" name="route_from"/>
+  <symbol minX="823" maxX="850" minY="691" maxY="718" name="lightrail-berlin-s"/>
+  <symbol minX="850" maxX="886" minY="691" maxY="718" name="subway-madrid-s"/>
+  <symbol minX="886" maxX="925" minY="691" maxY="718" name="subway-kiev-l"/>
+  <symbol minX="925" maxX="964" minY="691" maxY="718" name="subway-kiev-m"/>
+  <symbol minX="964" maxX="991" minY="691" maxY="718" name="subway-paris-s"/>
+  <symbol minX="0" maxX="36" minY="721" maxY="748" name="metro-barcelona-s"/>
+  <symbol minX="36" maxX="61" minY="721" maxY="746" name="api-result"/>
+  <symbol minX="61" maxX="86" minY="721" maxY="746" name="subway-moscow-s"/>
+  <symbol minX="86" maxX="110" minY="721" maxY="745" name="parking-s"/>
+  <symbol minX="110" maxX="134" minY="721" maxY="745" name="subway-berlin-s"/>
+  <symbol minX="134" maxX="164" minY="721" maxY="745" name="subway-london-s"/>
+  <symbol minX="164" maxX="188" minY="721" maxY="745" name="subway-rome-s"/>
+  <symbol minX="188" maxX="215" minY="721" maxY="745" name="bench"/>
+  <symbol minX="215" maxX="239" minY="721" maxY="745" name="speedcam-s"/>
+  <symbol minX="239" maxX="263" minY="721" maxY="745" name="star-l"/>
+  <symbol minX="263" maxX="287" minY="721" maxY="745" name="search-result"/>
+  <symbol minX="287" maxX="326" minY="721" maxY="743" name="subway-minsk-l"/>
+  <symbol minX="326" maxX="348" minY="721" maxY="743" name="star-m"/>
+  <symbol minX="348" maxX="370" minY="721" maxY="743" name="survey_point-l"/>
+  <symbol minX="370" maxX="394" minY="721" maxY="743" name="peakt-l"/>
+  <symbol minX="394" maxX="427" minY="721" maxY="742" name="subway-kiev-s"/>
+  <symbol minX="427" maxX="446" minY="721" maxY="740" name="subway-newyork-xs"/>
+  <symbol minX="446" maxX="476" minY="721" maxY="740" name="railway-crossing"/>
+  <symbol minX="476" maxX="509" minY="721" maxY="740" name="subway-minsk-m"/>
+  <symbol minX="509" maxX="528" minY="721" maxY="740" name="star-s"/>
+  <symbol minX="528" maxX="547" minY="721" maxY="740" name="survey_point-m"/>
+  <symbol minX="547" maxX="566" minY="721" maxY="740" name="subway-xs"/>
+  <symbol minX="566" maxX="596" minY="721" maxY="739" name="subway-minsk-s"/>
+  <symbol minX="596" maxX="614" minY="721" maxY="739" name="subway-xs copy"/>
+  <symbol minX="614" maxX="632" minY="721" maxY="737" name="peakt-m"/>
+  <symbol minX="632" maxX="668" minY="721" maxY="737" name="arrow-m"/>
+  <symbol minX="668" maxX="684" minY="721" maxY="737" name="survey_point-s"/>
+  <symbol minX="684" maxX="699" minY="721" maxY="736" name="entrance-s"/>
+  <symbol minX="699" maxX="712" minY="721" maxY="734" name="dot-m"/>
+  <symbol minX="712" maxX="727" minY="721" maxY="734" name="peakt-s"/>
+  <symbol minX="727" maxX="739" minY="721" maxY="733" name="tree-l"/>
+  <symbol minX="739" maxX="766" minY="721" maxY="733" name="arrow-s"/>
+  <symbol minX="766" maxX="778" minY="721" maxY="733" name="none"/>
+  <symbol minX="778" maxX="788" minY="721" maxY="731" name="entrance-xs"/>
+  <symbol minX="788" maxX="798" minY="721" maxY="731" name="tree-m"/>
+  <symbol minX="798" maxX="808" minY="721" maxY="731" name="dot-s-light"/>
+  <symbol minX="808" maxX="818" minY="721" maxY="731" name="dot-s"/>
+  <symbol minX="818" maxX="827" minY="721" maxY="730" name="tree-s"/>
+  <symbol minX="827" maxX="836" minY="721" maxY="730" name="zero-icon"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi/symbols.png b/data/resources-xxhdpi/symbols.png
index 368eed2cca..7f25684bd1 100644
--- a/data/resources-xxhdpi/symbols.png
+++ b/data/resources-xxhdpi/symbols.png
diff --git a/data/resources-xxhdpi/symbols.sdf b/data/resources-xxhdpi/symbols.sdf
index 1a064a9313..c4da6c5053 100644
--- a/data/resources-xxhdpi/symbols.sdf
+++ b/data/resources-xxhdpi/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="1024" width="1024">
+ <file width="1024" height="1024">
   <symbol minX="0" maxX="205" minY="0" maxY="205" name="route_to"/>
   <symbol minX="205" maxX="609" minY="0" maxY="196" name="route-arrow"/>
   <symbol minX="609" maxX="781" minY="0" maxY="172" name="compass-image"/>
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/resources-xxhdpi_clear/symbols.png
index 222a6d6279..5c0737d45a 100644
--- a/data/resources-xxhdpi_clear/symbols.png
+++ b/data/resources-xxhdpi_clear/symbols.png
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/resources-xxhdpi_clear/symbols.sdf
index 04ef1cefc0..223cc9010d 100644
--- a/data/resources-xxhdpi_clear/symbols.sdf
+++ b/data/resources-xxhdpi_clear/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="1024" width="2048">
+ <file width="2048" height="1024">
   <symbol minX="0" maxX="205" minY="0" maxY="205" name="route_to"/>
   <symbol minX="205" maxX="609" minY="0" maxY="196" name="route-arrow"/>
   <symbol minX="609" maxX="781" minY="0" maxY="172" name="compass-image"/>
@@ -38,429 +38,429 @@
   <symbol minX="692" maxX="750" minY="205" maxY="263" name="wayside_shrine-l"/>
   <symbol minX="750" maxX="808" minY="205" maxY="263" name="bbq-l"/>
   <symbol minX="808" maxX="866" minY="205" maxY="263" name="wayside_cross-l"/>
-  <symbol minX="866" maxX="923" minY="205" maxY="263" name="bcontrol-l"/>
-  <symbol minX="923" maxX="979" minY="205" maxY="263" name="bcontrol-m"/>
-  <symbol minX="979" maxX="1035" minY="205" maxY="263" name="waterfall-m"/>
-  <symbol minX="1035" maxX="1093" minY="205" maxY="263" name="beach-l"/>
-  <symbol minX="1093" maxX="1150" minY="205" maxY="263" name="waterfall-l"/>
-  <symbol minX="1150" maxX="1208" minY="205" maxY="263" name="beauty-l"/>
-  <symbol minX="1208" maxX="1266" minY="205" maxY="263" name="volcano-l"/>
-  <symbol minX="1266" maxX="1323" minY="205" maxY="263" name="beer-l"/>
-  <symbol minX="1323" maxX="1379" minY="205" maxY="263" name="beer-m"/>
-  <symbol minX="1379" maxX="1437" minY="205" maxY="263" name="vending-l"/>
-  <symbol minX="1437" maxX="1495" minY="205" maxY="263" name="tram-l"/>
-  <symbol minX="1495" maxX="1553" minY="205" maxY="263" name="bicycle-l"/>
-  <symbol minX="1553" maxX="1611" minY="205" maxY="263" name="train-l"/>
-  <symbol minX="1611" maxX="1669" minY="205" maxY="263" name="toys-l"/>
-  <symbol minX="1669" maxX="1727" minY="205" maxY="263" name="book-shop-l"/>
-  <symbol minX="1727" maxX="1785" minY="205" maxY="263" name="townhall-l"/>
-  <symbol minX="1785" maxX="1843" minY="205" maxY="263" name="tourism-l"/>
-  <symbol minX="1843" maxX="1901" minY="205" maxY="263" name="boundary_stone-l"/>
-  <symbol minX="1901" maxX="1959" minY="205" maxY="263" name="tomb-l"/>
-  <symbol minX="1959" maxX="2017" minY="205" maxY="263" name="bowls-l"/>
-  <symbol minX="0" maxX="58" minY="263" maxY="321" name="toll_booth-l"/>
+  <symbol minX="866" maxX="924" minY="205" maxY="263" name="bcontrol-l"/>
+  <symbol minX="924" maxX="980" minY="205" maxY="263" name="waterfall-m"/>
+  <symbol minX="980" maxX="1037" minY="205" maxY="263" name="waterfall-l"/>
+  <symbol minX="1037" maxX="1095" minY="205" maxY="263" name="beach-l"/>
+  <symbol minX="1095" maxX="1153" minY="205" maxY="263" name="volcano-l"/>
+  <symbol minX="1153" maxX="1211" minY="205" maxY="263" name="beauty-l"/>
+  <symbol minX="1211" maxX="1269" minY="205" maxY="263" name="vending-l"/>
+  <symbol minX="1269" maxX="1327" minY="205" maxY="263" name="beer-l"/>
+  <symbol minX="1327" maxX="1385" minY="205" maxY="263" name="tram-l"/>
+  <symbol minX="1385" maxX="1443" minY="205" maxY="263" name="train-l"/>
+  <symbol minX="1443" maxX="1501" minY="205" maxY="263" name="toys-l"/>
+  <symbol minX="1501" maxX="1559" minY="205" maxY="263" name="bicycle-l"/>
+  <symbol minX="1559" maxX="1617" minY="205" maxY="263" name="townhall-l"/>
+  <symbol minX="1617" maxX="1675" minY="205" maxY="263" name="tourism-l"/>
+  <symbol minX="1675" maxX="1733" minY="205" maxY="263" name="book-shop-l"/>
+  <symbol minX="1733" maxX="1791" minY="205" maxY="263" name="tomb-l"/>
+  <symbol minX="1791" maxX="1849" minY="205" maxY="263" name="toll_booth-l"/>
+  <symbol minX="1849" maxX="1907" minY="205" maxY="263" name="boundary_stone-l"/>
+  <symbol minX="1907" maxX="1965" minY="205" maxY="263" name="toilets-l"/>
+  <symbol minX="1965" maxX="2023" minY="205" maxY="263" name="bowls-l"/>
+  <symbol minX="0" maxX="58" minY="263" maxY="321" name="theatre-l"/>
   <symbol minX="58" maxX="116" minY="263" maxY="321" name="bus-l"/>
-  <symbol minX="116" maxX="174" minY="263" maxY="321" name="toilets-l"/>
-  <symbol minX="174" maxX="232" minY="263" maxY="321" name="theatre-l"/>
+  <symbol minX="116" maxX="174" minY="263" maxY="321" name="tennis-l"/>
+  <symbol minX="174" maxX="232" minY="263" maxY="321" name="taxi-l"/>
   <symbol minX="232" maxX="290" minY="263" maxY="321" name="butcher-l"/>
-  <symbol minX="290" maxX="348" minY="263" maxY="321" name="tennis-l"/>
+  <symbol minX="290" maxX="348" minY="263" maxY="321" name="swimming-l"/>
   <symbol minX="348" maxX="406" minY="263" maxY="321" name="cable-car-l"/>
-  <symbol minX="406" maxX="464" minY="263" maxY="321" name="taxi-l"/>
-  <symbol minX="464" maxX="522" minY="263" maxY="321" name="swimming-l"/>
+  <symbol minX="406" maxX="464" minY="263" maxY="321" name="sweets-l"/>
+  <symbol minX="464" maxX="522" minY="263" maxY="321" name="subway-spb-l"/>
   <symbol minX="522" maxX="580" minY="263" maxY="321" name="cafe-l"/>
-  <symbol minX="580" maxX="638" minY="263" maxY="321" name="sweets-l"/>
-  <symbol minX="638" maxX="696" minY="263" maxY="321" name="subway-spb-l"/>
+  <symbol minX="580" maxX="638" minY="263" maxY="321" name="subway-paris-l"/>
+  <symbol minX="638" maxX="696" minY="263" maxY="321" name="subway-newyork-l"/>
   <symbol minX="696" maxX="754" minY="263" maxY="321" name="campsite-l"/>
-  <symbol minX="754" maxX="812" minY="263" maxY="321" name="subway-paris-l"/>
-  <symbol minX="812" maxX="870" minY="263" maxY="321" name="subway-newyork-l"/>
-  <symbol minX="870" maxX="927" minY="263" maxY="321" name="car-repair-l"/>
-  <symbol minX="927" maxX="983" minY="263" maxY="321" name="car-repair-m"/>
-  <symbol minX="983" maxX="1041" minY="263" maxY="321" name="subway-l"/>
-  <symbol minX="1041" maxX="1099" minY="263" maxY="321" name="car_sharing-l"/>
-  <symbol minX="1099" maxX="1157" minY="263" maxY="321" name="subway-entrance-l"/>
-  <symbol minX="1157" maxX="1215" minY="263" maxY="321" name="caravan_site-l"/>
-  <symbol minX="1215" maxX="1273" minY="263" maxY="321" name="sports-l"/>
-  <symbol minX="1273" maxX="1331" minY="263" maxY="321" name="casino-l"/>
-  <symbol minX="1331" maxX="1389" minY="263" maxY="321" name="soccer-l"/>
-  <symbol minX="1389" maxX="1447" minY="263" maxY="321" name="skiing-l"/>
-  <symbol minX="1447" maxX="1505" minY="263" maxY="321" name="cave-l"/>
-  <symbol minX="1505" maxX="1563" minY="263" maxY="321" name="shop-l"/>
-  <symbol minX="1563" maxX="1621" minY="263" maxY="321" name="shop-bicycle-l"/>
-  <symbol minX="1621" maxX="1679" minY="263" maxY="321" name="cemetery-l"/>
-  <symbol minX="1679" maxX="1737" minY="263" maxY="321" name="shoes-l"/>
-  <symbol minX="1737" maxX="1795" minY="263" maxY="321" name="ship-l"/>
-  <symbol minX="1795" maxX="1853" minY="263" maxY="321" name="chemist-l"/>
-  <symbol minX="1853" maxX="1911" minY="263" maxY="321" name="school-l"/>
-  <symbol minX="1911" maxX="1969" minY="263" maxY="321" name="cinema-l"/>
-  <symbol minX="1969" maxX="2027" minY="263" maxY="321" name="restaurant-l"/>
-  <symbol minX="0" maxX="56" minY="321" maxY="379" name="remains-m"/>
-  <symbol minX="56" maxX="114" minY="321" maxY="379" name="clothes-l"/>
-  <symbol minX="114" maxX="171" minY="321" maxY="379" name="remains-l"/>
-  <symbol minX="171" maxX="229" minY="321" maxY="379" name="college-l"/>
-  <symbol minX="229" maxX="287" minY="321" maxY="379" name="recycling-l"/>
-  <symbol minX="287" maxX="345" minY="321" maxY="379" name="pub-l"/>
-  <symbol minX="345" maxX="403" minY="321" maxY="379" name="computer-l"/>
-  <symbol minX="403" maxX="461" minY="321" maxY="379" name="power-m"/>
-  <symbol minX="461" maxX="519" minY="321" maxY="379" name="convenience-l"/>
-  <symbol minX="519" maxX="577" minY="321" maxY="379" name="power-l"/>
-  <symbol minX="577" maxX="635" minY="321" maxY="379" name="cricket-l"/>
-  <symbol minX="635" maxX="693" minY="321" maxY="379" name="postbox-l"/>
-  <symbol minX="693" maxX="751" minY="321" maxY="379" name="police-l"/>
-  <symbol minX="751" maxX="809" minY="321" maxY="379" name="place-of-worship-l"/>
-  <symbol minX="809" maxX="867" minY="321" maxY="379" name="pitch-l"/>
-  <symbol minX="867" maxX="925" minY="321" maxY="379" name="curling-l"/>
-  <symbol minX="925" maxX="981" minY="321" maxY="379" name="picnic-m"/>
-  <symbol minX="981" maxX="1039" minY="321" maxY="379" name="department_store-l"/>
-  <symbol minX="1039" maxX="1096" minY="321" maxY="379" name="picnic-l"/>
-  <symbol minX="1096" maxX="1154" minY="321" maxY="379" name="diving-l"/>
-  <symbol minX="1154" maxX="1212" minY="321" maxY="379" name="phone-l"/>
-  <symbol minX="1212" maxX="1270" minY="321" maxY="379" name="dog_park-l"/>
-  <symbol minX="1270" maxX="1328" minY="321" maxY="379" name="pharmacy-l"/>
-  <symbol minX="1328" maxX="1386" minY="321" maxY="379" name="doityourself-l"/>
-  <symbol minX="1386" maxX="1444" minY="321" maxY="379" name="parking-meter-l"/>
-  <symbol minX="1444" maxX="1502" minY="321" maxY="379" name="park-l"/>
-  <symbol minX="1502" maxX="1560" minY="321" maxY="379" name="optician-l"/>
-  <symbol minX="1560" maxX="1616" minY="321" maxY="379" name="office-m"/>
-  <symbol minX="1616" maxX="1674" minY="321" maxY="379" name="drinking-water-l"/>
-  <symbol minX="1674" maxX="1731" minY="321" maxY="379" name="office-l"/>
-  <symbol minX="1731" maxX="1789" minY="321" maxY="379" name="nparkf-l"/>
-  <symbol minX="1789" maxX="1847" minY="321" maxY="379" name="npark-l"/>
-  <symbol minX="1847" maxX="1905" minY="321" maxY="379" name="electronics-l"/>
-  <symbol minX="1905" maxX="1963" minY="321" maxY="379" name="mobile_phone-l"/>
-  <symbol minX="1963" maxX="2021" minY="321" maxY="379" name="embassy-l"/>
-  <symbol minX="0" maxX="58" minY="379" maxY="437" name="museum-l"/>
-  <symbol minX="58" maxX="116" minY="379" maxY="437" name="motel-l"/>
-  <symbol minX="116" maxX="174" minY="379" maxY="437" name="monument-l"/>
-  <symbol minX="174" maxX="232" minY="379" maxY="437" name="military-l"/>
+  <symbol minX="754" maxX="812" minY="263" maxY="321" name="subway-l"/>
+  <symbol minX="812" maxX="870" minY="263" maxY="321" name="subway-entrance-l"/>
+  <symbol minX="870" maxX="928" minY="263" maxY="321" name="car-repair-l"/>
+  <symbol minX="928" maxX="986" minY="263" maxY="321" name="sports-l"/>
+  <symbol minX="986" maxX="1044" minY="263" maxY="321" name="soccer-l"/>
+  <symbol minX="1044" maxX="1102" minY="263" maxY="321" name="car_sharing-l"/>
+  <symbol minX="1102" maxX="1160" minY="263" maxY="321" name="skiing-l"/>
+  <symbol minX="1160" maxX="1218" minY="263" maxY="321" name="caravan_site-l"/>
+  <symbol minX="1218" maxX="1276" minY="263" maxY="321" name="shop-l"/>
+  <symbol minX="1276" maxX="1334" minY="263" maxY="321" name="casino-l"/>
+  <symbol minX="1334" maxX="1392" minY="263" maxY="321" name="shop-bicycle-l"/>
+  <symbol minX="1392" maxX="1450" minY="263" maxY="321" name="shoes-l"/>
+  <symbol minX="1450" maxX="1508" minY="263" maxY="321" name="cave-l"/>
+  <symbol minX="1508" maxX="1566" minY="263" maxY="321" name="ship-l"/>
+  <symbol minX="1566" maxX="1624" minY="263" maxY="321" name="school-l"/>
+  <symbol minX="1624" maxX="1682" minY="263" maxY="321" name="cemetery-l"/>
+  <symbol minX="1682" maxX="1740" minY="263" maxY="321" name="restaurant-l"/>
+  <symbol minX="1740" maxX="1798" minY="263" maxY="321" name="remains-l"/>
+  <symbol minX="1798" maxX="1856" minY="263" maxY="321" name="chemist-l"/>
+  <symbol minX="1856" maxX="1914" minY="263" maxY="321" name="recycling-l"/>
+  <symbol minX="1914" maxX="1972" minY="263" maxY="321" name="cinema-l"/>
+  <symbol minX="1972" maxX="2030" minY="263" maxY="321" name="pub-l"/>
+  <symbol minX="0" maxX="58" minY="321" maxY="379" name="power-m"/>
+  <symbol minX="58" maxX="116" minY="321" maxY="379" name="clothes-l"/>
+  <symbol minX="116" maxX="174" minY="321" maxY="379" name="power-l"/>
+  <symbol minX="174" maxX="232" minY="321" maxY="379" name="college-l"/>
+  <symbol minX="232" maxX="290" minY="321" maxY="379" name="postbox-l"/>
+  <symbol minX="290" maxX="348" minY="321" maxY="379" name="police-l"/>
+  <symbol minX="348" maxX="406" minY="321" maxY="379" name="computer-l"/>
+  <symbol minX="406" maxX="464" minY="321" maxY="379" name="place-of-worship-l"/>
+  <symbol minX="464" maxX="522" minY="321" maxY="379" name="convenience-l"/>
+  <symbol minX="522" maxX="580" minY="321" maxY="379" name="pitch-l"/>
+  <symbol minX="580" maxX="638" minY="321" maxY="379" name="cricket-l"/>
+  <symbol minX="638" maxX="696" minY="321" maxY="379" name="picnic-l"/>
+  <symbol minX="696" maxX="754" minY="321" maxY="379" name="phone-l"/>
+  <symbol minX="754" maxX="812" minY="321" maxY="379" name="pharmacy-l"/>
+  <symbol minX="812" maxX="870" minY="321" maxY="379" name="peak-l"/>
+  <symbol minX="870" maxX="928" minY="321" maxY="379" name="curling-l"/>
+  <symbol minX="928" maxX="986" minY="321" maxY="379" name="parking-meter-l"/>
+  <symbol minX="986" maxX="1044" minY="321" maxY="379" name="department_store-l"/>
+  <symbol minX="1044" maxX="1102" minY="321" maxY="379" name="park-l"/>
+  <symbol minX="1102" maxX="1160" minY="321" maxY="379" name="diving-l"/>
+  <symbol minX="1160" maxX="1218" minY="321" maxY="379" name="optician-l"/>
+  <symbol minX="1218" maxX="1276" minY="321" maxY="379" name="dog_park-l"/>
+  <symbol minX="1276" maxX="1334" minY="321" maxY="379" name="office-l"/>
+  <symbol minX="1334" maxX="1392" minY="321" maxY="379" name="doityourself-l"/>
+  <symbol minX="1392" maxX="1450" minY="321" maxY="379" name="nparkf-l"/>
+  <symbol minX="1450" maxX="1508" minY="321" maxY="379" name="npark-l"/>
+  <symbol minX="1508" maxX="1566" minY="321" maxY="379" name="mobile_phone-l"/>
+  <symbol minX="1566" maxX="1624" minY="321" maxY="379" name="museum-l"/>
+  <symbol minX="1624" maxX="1682" minY="321" maxY="379" name="drinking-water-l"/>
+  <symbol minX="1682" maxX="1740" minY="321" maxY="379" name="motel-l"/>
+  <symbol minX="1740" maxX="1798" minY="321" maxY="379" name="monument-l"/>
+  <symbol minX="1798" maxX="1856" minY="321" maxY="379" name="military-l"/>
+  <symbol minX="1856" maxX="1914" minY="321" maxY="379" name="electronics-l"/>
+  <symbol minX="1914" maxX="1972" minY="321" maxY="379" name="marketplace-l"/>
+  <symbol minX="1972" maxX="2030" minY="321" maxY="379" name="embassy-l"/>
+  <symbol minX="0" maxX="58" minY="379" maxY="437" name="mail-l"/>
+  <symbol minX="58" maxX="116" minY="379" maxY="437" name="lightrail-berlin-l"/>
+  <symbol minX="116" maxX="174" minY="379" maxY="437" name="lighthouse-l"/>
+  <symbol minX="174" maxX="232" minY="379" maxY="437" name="lift_gate-l"/>
   <symbol minX="232" maxX="290" minY="379" maxY="437" name="equestrian-l"/>
   <symbol minX="290" maxX="348" minY="379" maxY="437" name="equestrian-m"/>
-  <symbol minX="348" maxX="406" minY="379" maxY="437" name="marketplace-l"/>
+  <symbol minX="348" maxX="406" minY="379" maxY="437" name="library-l"/>
   <symbol minX="406" maxX="464" minY="379" maxY="437" name="fastfood-l"/>
-  <symbol minX="464" maxX="522" minY="379" maxY="437" name="mail-l"/>
-  <symbol minX="522" maxX="580" minY="379" maxY="437" name="lightrail-berlin-l"/>
+  <symbol minX="464" maxX="522" minY="379" maxY="437" name="laundry-l"/>
+  <symbol minX="522" maxX="580" minY="379" maxY="437" name="kiosk-l"/>
   <symbol minX="580" maxX="638" minY="379" maxY="437" name="fire_station-l"/>
-  <symbol minX="638" maxX="696" minY="379" maxY="437" name="lighthouse-l"/>
-  <symbol minX="696" maxX="754" minY="379" maxY="437" name="lift_gate-l"/>
+  <symbol minX="638" maxX="696" minY="379" maxY="437" name="kindergarten-m"/>
+  <symbol minX="696" maxX="754" minY="379" maxY="437" name="kindergarten-l"/>
   <symbol minX="754" maxX="812" minY="379" maxY="437" name="florist-l"/>
-  <symbol minX="812" maxX="870" minY="379" maxY="437" name="library-l"/>
+  <symbol minX="812" maxX="870" minY="379" maxY="437" name="jewelry-l"/>
   <symbol minX="870" maxX="928" minY="379" maxY="437" name="fountain-l"/>
-  <symbol minX="928" maxX="984" minY="379" maxY="437" name="laundry-m"/>
-  <symbol minX="984" maxX="1041" minY="379" maxY="437" name="laundry-l"/>
-  <symbol minX="1041" maxX="1099" minY="379" maxY="437" name="fuel-l"/>
-  <symbol minX="1099" maxX="1157" minY="379" maxY="437" name="kiosk-l"/>
-  <symbol minX="1157" maxX="1215" minY="379" maxY="437" name="kindergarten-m"/>
-  <symbol minX="1215" maxX="1273" minY="379" maxY="437" name="funicular-l"/>
-  <symbol minX="1273" maxX="1331" minY="379" maxY="437" name="kindergarten-l"/>
-  <symbol minX="1331" maxX="1389" minY="379" maxY="437" name="jewelry-l"/>
-  <symbol minX="1389" maxX="1447" minY="379" maxY="437" name="furniture-l"/>
-  <symbol minX="1447" maxX="1505" minY="379" maxY="437" name="information-l"/>
-  <symbol minX="1505" maxX="1563" minY="379" maxY="437" name="gallery-l"/>
-  <symbol minX="1563" maxX="1619" minY="379" maxY="437" name="hunting-tower-m"/>
-  <symbol minX="1619" maxX="1676" minY="379" maxY="437" name="hunting-tower-l"/>
-  <symbol minX="1676" maxX="1734" minY="379" maxY="437" name="garden-l"/>
-  <symbol minX="1734" maxX="1792" minY="379" maxY="437" name="hotel-l"/>
-  <symbol minX="1792" maxX="1850" minY="379" maxY="437" name="hospital-l"/>
-  <symbol minX="1850" maxX="1908" minY="379" maxY="437" name="garden_center-l"/>
-  <symbol minX="1908" maxX="1966" minY="379" maxY="437" name="historic-ship-l"/>
-  <symbol minX="1966" maxX="2024" minY="379" maxY="437" name="gate-l"/>
-  <symbol minX="0" maxX="56" minY="437" maxY="495" name="heliport-m"/>
-  <symbol minX="56" maxX="114" minY="437" maxY="495" name="gift-l"/>
-  <symbol minX="114" maxX="171" minY="437" maxY="495" name="heliport-l"/>
-  <symbol minX="171" maxX="229" minY="437" maxY="495" name="golf-l"/>
-  <symbol minX="229" maxX="287" minY="437" maxY="495" name="helipad-l"/>
-  <symbol minX="287" maxX="345" minY="437" maxY="495" name="hardware-l"/>
-  <symbol minX="345" maxX="403" minY="437" maxY="495" name="greengrocer-l"/>
-  <symbol minX="403" maxX="461" minY="437" maxY="495" name="hand-m"/>
-  <symbol minX="461" maxX="519" minY="437" maxY="495" name="grocery-l"/>
-  <symbol minX="519" maxX="577" minY="437" maxY="495" name="hand-l"/>
-  <symbol minX="577" maxX="635" minY="437" maxY="495" name="hairdresser-l"/>
-  <symbol minX="635" maxX="691" minY="437" maxY="493" name="shoes-m"/>
-  <symbol minX="691" maxX="747" minY="437" maxY="493" name="hairdresser-m"/>
-  <symbol minX="747" maxX="803" minY="437" maxY="493" name="grocery-m"/>
-  <symbol minX="803" maxX="859" minY="437" maxY="493" name="greengrocer-m"/>
-  <symbol minX="859" maxX="915" minY="437" maxY="493" name="australian-football-m"/>
-  <symbol minX="915" maxX="971" minY="437" maxY="493" name="casino-m"/>
-  <symbol minX="971" maxX="1027" minY="437" maxY="493" name="hardware-m"/>
-  <symbol minX="1027" maxX="1083" minY="437" maxY="493" name="golf-m"/>
-  <symbol minX="1083" maxX="1139" minY="437" maxY="493" name="helipad-m"/>
-  <symbol minX="1139" maxX="1195" minY="437" maxY="493" name="bakery-m"/>
-  <symbol minX="1195" maxX="1251" minY="437" maxY="493" name="gift-m"/>
-  <symbol minX="1251" maxX="1307" minY="437" maxY="493" name="gate-m"/>
-  <symbol minX="1307" maxX="1363" minY="437" maxY="493" name="skiing-m"/>
-  <symbol minX="1363" maxX="1419" minY="437" maxY="493" name="garden_center-m"/>
-  <symbol minX="1419" maxX="1475" minY="437" maxY="493" name="historic-ship-m"/>
-  <symbol minX="1475" maxX="1531" minY="437" maxY="493" name="alcohol-m"/>
-  <symbol minX="1531" maxX="1587" minY="437" maxY="493" name="hospital-m"/>
-  <symbol minX="1587" maxX="1643" minY="437" maxY="493" name="soccer-m"/>
-  <symbol minX="1643" maxX="1699" minY="437" maxY="493" name="garden-m"/>
-  <symbol minX="1699" maxX="1755" minY="437" maxY="493" name="hotel-m"/>
-  <symbol minX="1755" maxX="1811" minY="437" maxY="493" name="banknote-m"/>
-  <symbol minX="1811" maxX="1867" minY="437" maxY="493" name="alpine_hut-m"/>
-  <symbol minX="1867" maxX="1923" minY="437" maxY="493" name="gallery-m"/>
-  <symbol minX="1923" maxX="1979" minY="437" maxY="493" name="shop-m"/>
-  <symbol minX="1979" maxX="2035" minY="437" maxY="493" name="furniture-m"/>
+  <symbol minX="928" maxX="986" minY="379" maxY="437" name="information-l"/>
+  <symbol minX="986" maxX="1044" minY="379" maxY="437" name="hunting-tower-l"/>
+  <symbol minX="1044" maxX="1102" minY="379" maxY="437" name="fuel-l"/>
+  <symbol minX="1102" maxX="1160" minY="379" maxY="437" name="hotel-l"/>
+  <symbol minX="1160" maxX="1218" minY="379" maxY="437" name="hospital-l"/>
+  <symbol minX="1218" maxX="1276" minY="379" maxY="437" name="funicular-l"/>
+  <symbol minX="1276" maxX="1334" minY="379" maxY="437" name="historic-ship-l"/>
+  <symbol minX="1334" maxX="1392" minY="379" maxY="437" name="heliport-l"/>
+  <symbol minX="1392" maxX="1450" minY="379" maxY="437" name="furniture-l"/>
+  <symbol minX="1450" maxX="1508" minY="379" maxY="437" name="helipad-l"/>
+  <symbol minX="1508" maxX="1566" minY="379" maxY="437" name="gallery-l"/>
+  <symbol minX="1566" maxX="1624" minY="379" maxY="437" name="hardware-l"/>
+  <symbol minX="1624" maxX="1682" minY="379" maxY="437" name="hand-m"/>
+  <symbol minX="1682" maxX="1740" minY="379" maxY="437" name="garden-l"/>
+  <symbol minX="1740" maxX="1798" minY="379" maxY="437" name="hand-l"/>
+  <symbol minX="1798" maxX="1856" minY="379" maxY="437" name="hairdresser-l"/>
+  <symbol minX="1856" maxX="1914" minY="379" maxY="437" name="garden_center-l"/>
+  <symbol minX="1914" maxX="1972" minY="379" maxY="437" name="grocery-l"/>
+  <symbol minX="1972" maxX="2030" minY="379" maxY="437" name="gate-l"/>
+  <symbol minX="0" maxX="58" minY="437" maxY="495" name="greengrocer-l"/>
+  <symbol minX="58" maxX="116" minY="437" maxY="495" name="gift-l"/>
+  <symbol minX="116" maxX="174" minY="437" maxY="495" name="golf-l"/>
+  <symbol minX="174" maxX="230" minY="437" maxY="493" name="gift-m"/>
+  <symbol minX="230" maxX="286" minY="437" maxY="493" name="golf-m"/>
+  <symbol minX="286" maxX="342" minY="437" maxY="493" name="australian-football-m"/>
+  <symbol minX="342" maxX="398" minY="437" maxY="493" name="gate-m"/>
+  <symbol minX="398" maxX="454" minY="437" maxY="493" name="greengrocer-m"/>
+  <symbol minX="454" maxX="510" minY="437" maxY="493" name="garden_center-m"/>
+  <symbol minX="510" maxX="566" minY="437" maxY="493" name="grocery-m"/>
+  <symbol minX="566" maxX="622" minY="437" maxY="493" name="bakery-m"/>
+  <symbol minX="622" maxX="678" minY="437" maxY="493" name="alcohol-m"/>
+  <symbol minX="678" maxX="734" minY="437" maxY="493" name="hairdresser-m"/>
+  <symbol minX="734" maxX="790" minY="437" maxY="493" name="garden-m"/>
+  <symbol minX="790" maxX="846" minY="437" maxY="493" name="banknote-m"/>
+  <symbol minX="846" maxX="902" minY="437" maxY="493" name="alpine_hut-m"/>
+  <symbol minX="902" maxX="958" minY="437" maxY="493" name="gallery-m"/>
+  <symbol minX="958" maxX="1014" minY="437" maxY="493" name="hardware-m"/>
+  <symbol minX="1014" maxX="1070" minY="437" maxY="493" name="furniture-m"/>
+  <symbol minX="1070" maxX="1126" minY="437" maxY="493" name="helipad-m"/>
+  <symbol minX="1126" maxX="1182" minY="437" maxY="493" name="bar-m"/>
+  <symbol minX="1182" maxX="1238" minY="437" maxY="493" name="america-football-m"/>
+  <symbol minX="1238" maxX="1294" minY="437" maxY="493" name="heliport-m"/>
+  <symbol minX="1294" maxX="1350" minY="437" maxY="493" name="archery-m"/>
+  <symbol minX="1350" maxX="1406" minY="437" maxY="493" name="funicular-m"/>
+  <symbol minX="1406" maxX="1462" minY="437" maxY="493" name="historic-ship-m"/>
+  <symbol minX="1462" maxX="1518" minY="437" maxY="493" name="baseball-m"/>
+  <symbol minX="1518" maxX="1574" minY="437" maxY="493" name="hospital-m"/>
+  <symbol minX="1574" maxX="1630" minY="437" maxY="493" name="atm-m"/>
+  <symbol minX="1630" maxX="1686" minY="437" maxY="493" name="fuel-m"/>
+  <symbol minX="1686" maxX="1742" minY="437" maxY="493" name="hotel-m"/>
+  <symbol minX="1742" maxX="1798" minY="437" maxY="493" name="zoo-m"/>
+  <symbol minX="1798" maxX="1854" minY="437" maxY="493" name="windmill-m"/>
+  <symbol minX="1854" maxX="1910" minY="437" maxY="493" name="hunting-tower-m"/>
+  <symbol minX="1910" maxX="1966" minY="437" maxY="493" name="basketball-m"/>
+  <symbol minX="1966" maxX="2022" minY="437" maxY="493" name="fountain-m"/>
   <symbol minX="0" maxX="56" minY="495" maxY="551" name="information-m"/>
-  <symbol minX="56" maxX="112" minY="495" maxY="551" name="bar-m"/>
-  <symbol minX="112" maxX="168" minY="495" maxY="551" name="america-football-m"/>
+  <symbol minX="56" maxX="112" minY="495" maxY="551" name="wayside_shrine-m"/>
+  <symbol minX="112" maxX="168" minY="495" maxY="551" name="florist-m"/>
   <symbol minX="168" maxX="224" minY="495" maxY="551" name="jewelry-m"/>
-  <symbol minX="224" maxX="280" minY="495" maxY="551" name="funicular-m"/>
-  <symbol minX="280" maxX="336" minY="495" maxY="551" name="archery-m"/>
-  <symbol minX="336" maxX="392" minY="495" maxY="551" name="cave-m"/>
-  <symbol minX="392" maxX="448" minY="495" maxY="551" name="fuel-m"/>
+  <symbol minX="224" maxX="280" minY="495" maxY="551" name="wayside_cross-m"/>
+  <symbol minX="280" maxX="336" minY="495" maxY="551" name="fire_station-m"/>
+  <symbol minX="336" maxX="392" minY="495" maxY="551" name="bbq-m"/>
+  <symbol minX="392" maxX="448" minY="495" maxY="551" name="bcontrol-m"/>
   <symbol minX="448" maxX="504" minY="495" maxY="551" name="kiosk-m"/>
-  <symbol minX="504" maxX="560" minY="495" maxY="551" name="baseball-m"/>
-  <symbol minX="560" maxX="616" minY="495" maxY="551" name="fountain-m"/>
-  <symbol minX="616" maxX="672" minY="495" maxY="551" name="florist-m"/>
+  <symbol minX="504" maxX="560" minY="495" maxY="551" name="fastfood-m"/>
+  <symbol minX="560" maxX="616" minY="495" maxY="551" name="laundry-m"/>
+  <symbol minX="616" maxX="672" minY="495" maxY="551" name="volcano-m"/>
   <symbol minX="672" maxX="728" minY="495" maxY="551" name="library-m"/>
-  <symbol minX="728" maxX="784" minY="495" maxY="551" name="atm-m"/>
-  <symbol minX="784" maxX="840" minY="495" maxY="551" name="zoo-m"/>
+  <symbol minX="728" maxX="784" minY="495" maxY="551" name="beach-m"/>
+  <symbol minX="784" maxX="840" minY="495" maxY="551" name="vending-m"/>
   <symbol minX="840" maxX="896" minY="495" maxY="551" name="lift_gate-m"/>
-  <symbol minX="896" maxX="952" minY="495" maxY="551" name="fire_station-m"/>
+  <symbol minX="896" maxX="952" minY="495" maxY="551" name="beauty-m"/>
   <symbol minX="952" maxX="1008" minY="495" maxY="551" name="lighthouse-m"/>
-  <symbol minX="1008" maxX="1064" minY="495" maxY="551" name="windmill-m"/>
-  <symbol minX="1064" maxX="1120" minY="495" maxY="551" name="basketball-m"/>
-  <symbol minX="1120" maxX="1176" minY="495" maxY="551" name="shop-bicycle-m"/>
-  <symbol minX="1176" maxX="1232" minY="495" maxY="551" name="wayside_shrine-m"/>
-  <symbol minX="1232" maxX="1288" minY="495" maxY="551" name="fastfood-m"/>
+  <symbol minX="1008" maxX="1064" minY="495" maxY="551" name="tram-m"/>
+  <symbol minX="1064" maxX="1120" minY="495" maxY="551" name="beer-m"/>
+  <symbol minX="1120" maxX="1176" minY="495" maxY="551" name="train-m"/>
+  <symbol minX="1176" maxX="1232" minY="495" maxY="551" name="toys-m"/>
+  <symbol minX="1232" maxX="1288" minY="495" maxY="551" name="embassy-m"/>
   <symbol minX="1288" maxX="1344" minY="495" maxY="551" name="mail-m"/>
-  <symbol minX="1344" maxX="1400" minY="495" maxY="551" name="wayside_cross-m"/>
-  <symbol minX="1400" maxX="1456" minY="495" maxY="551" name="bbq-m"/>
+  <symbol minX="1344" maxX="1400" minY="495" maxY="551" name="townhall-m"/>
+  <symbol minX="1400" maxX="1456" minY="495" maxY="551" name="electronics-m"/>
   <symbol minX="1456" maxX="1512" minY="495" maxY="551" name="marketplace-m"/>
-  <symbol minX="1512" maxX="1568" minY="495" maxY="551" name="caravan_site-m"/>
-  <symbol minX="1568" maxX="1624" minY="495" maxY="551" name="sports-m"/>
-  <symbol minX="1624" maxX="1680" minY="495" maxY="551" name="beach-m"/>
+  <symbol minX="1512" maxX="1568" minY="495" maxY="551" name="bicycle-m"/>
+  <symbol minX="1568" maxX="1624" minY="495" maxY="551" name="tourism-m"/>
+  <symbol minX="1624" maxX="1680" minY="495" maxY="551" name="drugs"/>
   <symbol minX="1680" maxX="1736" minY="495" maxY="551" name="military-m"/>
-  <symbol minX="1736" maxX="1792" minY="495" maxY="551" name="volcano-m"/>
-  <symbol minX="1792" maxX="1848" minY="495" maxY="551" name="beauty-m"/>
+  <symbol minX="1736" maxX="1792" minY="495" maxY="551" name="tomb-m"/>
+  <symbol minX="1792" maxX="1848" minY="495" maxY="551" name="book-shop-m"/>
   <symbol minX="1848" maxX="1904" minY="495" maxY="551" name="mobile_phone-m"/>
-  <symbol minX="1904" maxX="1960" minY="495" maxY="551" name="vending-m"/>
+  <symbol minX="1904" maxX="1960" minY="495" maxY="551" name="toll_booth-m"/>
   <symbol minX="1960" maxX="2016" minY="495" maxY="551" name="monument-m"/>
-  <symbol minX="0" maxX="56" minY="551" maxY="607" name="cemetery-m"/>
-  <symbol minX="56" maxX="112" minY="551" maxY="607" name="tram-m"/>
+  <symbol minX="0" maxX="56" minY="551" maxY="607" name="toilets-m"/>
+  <symbol minX="56" maxX="112" minY="551" maxY="607" name="drinking-water-m"/>
   <symbol minX="112" maxX="168" minY="551" maxY="607" name="motel-m"/>
-  <symbol minX="168" maxX="224" minY="551" maxY="607" name="embassy-m"/>
+  <symbol minX="168" maxX="224" minY="551" maxY="607" name="boundary_stone-m"/>
   <symbol minX="224" maxX="280" minY="551" maxY="607" name="museum-m"/>
-  <symbol minX="280" maxX="336" minY="551" maxY="607" name="electronics-m"/>
-  <symbol minX="336" maxX="392" minY="551" maxY="607" name="ship-m"/>
-  <symbol minX="392" maxX="448" minY="551" maxY="607" name="subway-entrance-2-m"/>
-  <symbol minX="448" maxX="504" minY="551" maxY="607" name="school-m"/>
-  <symbol minX="504" maxX="560" minY="551" maxY="607" name="chemist-m"/>
-  <symbol minX="560" maxX="616" minY="551" maxY="607" name="car_sharing-m"/>
-  <symbol minX="616" maxX="672" minY="551" maxY="607" name="train-m"/>
-  <symbol minX="672" maxX="728" minY="551" maxY="607" name="drugs"/>
+  <symbol minX="280" maxX="336" minY="551" maxY="607" name="theatre-m"/>
+  <symbol minX="336" maxX="392" minY="551" maxY="607" name="bowls-m"/>
+  <symbol minX="392" maxX="448" minY="551" maxY="607" name="tennis-m"/>
+  <symbol minX="448" maxX="504" minY="551" maxY="607" name="bus-m"/>
+  <symbol minX="504" maxX="560" minY="551" maxY="607" name="taxi-m"/>
+  <symbol minX="560" maxX="616" minY="551" maxY="607" name="swimming-m"/>
+  <symbol minX="616" maxX="672" minY="551" maxY="607" name="butcher-m"/>
+  <symbol minX="672" maxX="728" minY="551" maxY="607" name="sweets-m"/>
   <symbol minX="728" maxX="784" minY="551" maxY="607" name="npark-m"/>
-  <symbol minX="784" maxX="840" minY="551" maxY="607" name="bicycle-m"/>
-  <symbol minX="840" maxX="896" minY="551" maxY="607" name="toys-m"/>
+  <symbol minX="784" maxX="840" minY="551" maxY="607" name="cable-car-m"/>
+  <symbol minX="840" maxX="896" minY="551" maxY="607" name="doityourself-m"/>
   <symbol minX="896" maxX="952" minY="551" maxY="607" name="nparkf-m "/>
   <symbol minX="952" maxX="1008" minY="551" maxY="607" name="nparkf-m"/>
-  <symbol minX="1008" maxX="1064" minY="551" maxY="607" name="townhall-m"/>
-  <symbol minX="1064" maxX="1120" minY="551" maxY="607" name="drinking-water-m"/>
-  <symbol minX="1120" maxX="1176" minY="551" maxY="607" name="book-shop-m"/>
-  <symbol minX="1176" maxX="1232" minY="551" maxY="607" name="subway-entrance-m"/>
-  <symbol minX="1232" maxX="1288" minY="551" maxY="607" name="tourism-m"/>
+  <symbol minX="1008" maxX="1064" minY="551" maxY="607" name="subway-spb-m"/>
+  <symbol minX="1064" maxX="1120" minY="551" maxY="607" name="dog_park-m"/>
+  <symbol minX="1120" maxX="1176" minY="551" maxY="607" name="office-m"/>
+  <symbol minX="1176" maxX="1232" minY="551" maxY="607" name="cafe-m"/>
+  <symbol minX="1232" maxX="1288" minY="551" maxY="607" name="diving-m"/>
   <symbol minX="1288" maxX="1344" minY="551" maxY="607" name="optician-m"/>
-  <symbol minX="1344" maxX="1400" minY="551" maxY="607" name="tomb-m"/>
+  <symbol minX="1344" maxX="1400" minY="551" maxY="607" name="department_store-m"/>
   <symbol minX="1400" maxX="1456" minY="551" maxY="607" name="park-m"/>
-  <symbol minX="1456" maxX="1512" minY="551" maxY="607" name="boundary_stone-m"/>
-  <symbol minX="1512" maxX="1568" minY="551" maxY="607" name="restaurant-m"/>
-  <symbol minX="1568" maxX="1624" minY="551" maxY="607" name="toll_booth-m"/>
-  <symbol minX="1624" maxX="1680" minY="551" maxY="607" name="doityourself-m"/>
+  <symbol minX="1456" maxX="1512" minY="551" maxY="607" name="subway-newyork-m"/>
+  <symbol minX="1512" maxX="1568" minY="551" maxY="607" name="subway-m"/>
+  <symbol minX="1568" maxX="1624" minY="551" maxY="607" name="campsite-m"/>
+  <symbol minX="1624" maxX="1680" minY="551" maxY="607" name="curling-m"/>
   <symbol minX="1680" maxX="1736" minY="551" maxY="607" name="parking-meter-m"/>
-  <symbol minX="1736" maxX="1792" minY="551" maxY="607" name="bowls-m"/>
-  <symbol minX="1792" maxX="1848" minY="551" maxY="607" name="toilets-m"/>
-  <symbol minX="1848" maxX="1904" minY="551" maxY="607" name="bus-m"/>
-  <symbol minX="1904" maxX="1960" minY="551" maxY="607" name="theatre-m"/>
-  <symbol minX="1960" maxX="2016" minY="551" maxY="607" name="tennis-m"/>
-  <symbol minX="0" maxX="56" minY="607" maxY="663" name="butcher-m"/>
-  <symbol minX="56" maxX="112" minY="607" maxY="663" name="taxi-m"/>
+  <symbol minX="1736" maxX="1792" minY="551" maxY="607" name="subway-entrance-m"/>
+  <symbol minX="1792" maxX="1848" minY="551" maxY="607" name="subway-entrance-2-m"/>
+  <symbol minX="1848" maxX="1904" minY="551" maxY="607" name="peak-m"/>
+  <symbol minX="1904" maxX="1960" minY="551" maxY="607" name="sports-m"/>
+  <symbol minX="1960" maxX="2016" minY="551" maxY="607" name="car-repair-m"/>
+  <symbol minX="0" maxX="56" minY="607" maxY="663" name="soccer-m"/>
+  <symbol minX="56" maxX="112" minY="607" maxY="663" name="skiing-m"/>
   <symbol minX="112" maxX="168" minY="607" maxY="663" name="pharmacy-2-m"/>
-  <symbol minX="168" maxX="224" minY="607" maxY="663" name="dog_park-m"/>
+  <symbol minX="168" maxX="224" minY="607" maxY="663" name="car_sharing-m"/>
   <symbol minX="224" maxX="280" minY="607" maxY="663" name="pharmacy-m"/>
-  <symbol minX="280" maxX="336" minY="607" maxY="663" name="cable-car-m"/>
-  <symbol minX="336" maxX="392" minY="607" maxY="663" name="diving-m"/>
+  <symbol minX="280" maxX="336" minY="607" maxY="663" name="shop-m"/>
+  <symbol minX="336" maxX="392" minY="607" maxY="663" name="caravan_site-m"/>
   <symbol minX="392" maxX="448" minY="607" maxY="663" name="phone-m"/>
-  <symbol minX="448" maxX="504" minY="607" maxY="663" name="swimming-m"/>
-  <symbol minX="504" maxX="560" minY="607" maxY="663" name="department_store-m"/>
-  <symbol minX="560" maxX="616" minY="607" maxY="663" name="curling-m"/>
-  <symbol minX="616" maxX="672" minY="607" maxY="663" name="cinema-m"/>
-  <symbol minX="672" maxX="728" minY="607" maxY="663" name="sweets-m"/>
+  <symbol minX="448" maxX="504" minY="607" maxY="663" name="shop-bicycle-m"/>
+  <symbol minX="504" maxX="560" minY="607" maxY="663" name="cricket-m"/>
+  <symbol minX="560" maxX="616" minY="607" maxY="663" name="picnic-m"/>
+  <symbol minX="616" maxX="672" minY="607" maxY="663" name="casino-m"/>
+  <symbol minX="672" maxX="728" minY="607" maxY="663" name="convenience-m"/>
   <symbol minX="728" maxX="784" minY="607" maxY="663" name="pitch-m"/>
-  <symbol minX="784" maxX="840" minY="607" maxY="663" name="cafe-m"/>
-  <symbol minX="840" maxX="896" minY="607" maxY="663" name="subway-spb-m"/>
+  <symbol minX="784" maxX="840" minY="607" maxY="663" name="shoes-m"/>
+  <symbol minX="840" maxX="896" minY="607" maxY="663" name="computer-m"/>
   <symbol minX="896" maxX="952" minY="607" maxY="663" name="place-of-worship-m"/>
-  <symbol minX="952" maxX="1008" minY="607" maxY="663" name="clothes-m"/>
-  <symbol minX="1008" maxX="1064" minY="607" maxY="663" name="subway-m"/>
+  <symbol minX="952" maxX="1008" minY="607" maxY="663" name="ship-m"/>
+  <symbol minX="1008" maxX="1064" minY="607" maxY="663" name="cave-m"/>
   <symbol minX="1064" maxX="1120" minY="607" maxY="663" name="police-m"/>
-  <symbol minX="1120" maxX="1176" minY="607" maxY="663" name="recycling-m"/>
-  <symbol minX="1176" maxX="1232" minY="607" maxY="663" name="cricket-m"/>
+  <symbol minX="1120" maxX="1176" minY="607" maxY="663" name="school-m"/>
+  <symbol minX="1176" maxX="1232" minY="607" maxY="663" name="college-m"/>
   <symbol minX="1232" maxX="1288" minY="607" maxY="663" name="postbox-m"/>
-  <symbol minX="1288" maxX="1344" minY="607" maxY="663" name="convenience-m"/>
-  <symbol minX="1344" maxX="1400" minY="607" maxY="663" name="computer-m"/>
-  <symbol minX="1400" maxX="1456" minY="607" maxY="663" name="campsite-m"/>
-  <symbol minX="1456" maxX="1512" minY="607" maxY="663" name="subway-newyork-m"/>
+  <symbol minX="1288" maxX="1344" minY="607" maxY="663" name="clothes-m"/>
+  <symbol minX="1344" maxX="1400" minY="607" maxY="663" name="restaurant-m"/>
+  <symbol minX="1400" maxX="1456" minY="607" maxY="663" name="cemetery-m"/>
+  <symbol minX="1456" maxX="1512" minY="607" maxY="663" name="cinema-m"/>
   <symbol minX="1512" maxX="1568" minY="607" maxY="663" name="pub-m"/>
-  <symbol minX="1568" maxX="1624" minY="607" maxY="663" name="college-m"/>
-  <symbol minX="1624" maxX="1682" minY="607" maxY="658" name="subway-moscow-l"/>
-  <symbol minX="1682" maxX="1733" minY="607" maxY="658" name="parking-l"/>
-  <symbol minX="1733" maxX="1784" minY="607" maxY="658" name="speedcam-l"/>
-  <symbol minX="1784" maxX="1835" minY="607" maxY="658" name="subway-rome-l"/>
-  <symbol minX="1835" maxX="1886" minY="607" maxY="658" name="lightrail-berlin-m"/>
-  <symbol minX="1886" maxX="1937" minY="607" maxY="658" name="subway-berlin-l"/>
-  <symbol minX="1937" maxX="1986" minY="607" maxY="656" name="route_from"/>
-  <symbol minX="1986" maxX="2033" minY="607" maxY="654" name="no-icon-leisure"/>
-  <symbol minX="0" maxX="54" minY="663" maxY="710" name="subway-moscow-m"/>
-  <symbol minX="54" maxX="101" minY="663" maxY="710" name="subway-paris-m"/>
-  <symbol minX="101" maxX="148" minY="663" maxY="710" name="no-icon"/>
-  <symbol minX="148" maxX="195" minY="663" maxY="710" name="no-icon-tourism"/>
-  <symbol minX="195" maxX="242" minY="663" maxY="710" name="no-icon-shop"/>
-  <symbol minX="242" maxX="289" minY="663" maxY="710" name="subway-rome-m"/>
-  <symbol minX="289" maxX="336" minY="663" maxY="710" name="subway-berlin-m"/>
-  <symbol minX="336" maxX="383" minY="663" maxY="710" name="no-icon-amenity"/>
-  <symbol minX="383" maxX="429" minY="663" maxY="709" name="current-position"/>
-  <symbol minX="429" maxX="471" minY="663" maxY="708" name="beer-s"/>
-  <symbol minX="471" maxX="513" minY="663" maxY="708" name="bcontrol-s"/>
-  <symbol minX="513" maxX="555" minY="663" maxY="708" name="waterfall-s"/>
-  <symbol minX="555" maxX="613" minY="663" maxY="708" name="subway-london-l"/>
-  <symbol minX="613" maxX="655" minY="663" maxY="708" name="picnic-s"/>
-  <symbol minX="655" maxX="697" minY="663" maxY="708" name="hunting-tower-s"/>
-  <symbol minX="697" maxX="739" minY="663" maxY="708" name="office-s"/>
-  <symbol minX="739" maxX="781" minY="663" maxY="708" name="remains-s"/>
-  <symbol minX="781" maxX="823" minY="663" maxY="708" name="heliport-s"/>
-  <symbol minX="823" maxX="868" minY="663" maxY="708" name="airport-s"/>
-  <symbol minX="868" maxX="910" minY="663" maxY="705" name="skiing-s"/>
-  <symbol minX="910" maxX="952" minY="663" maxY="705" name="casino-s"/>
-  <symbol minX="952" maxX="994" minY="663" maxY="705" name="soccer-s"/>
-  <symbol minX="994" maxX="1036" minY="663" maxY="705" name="shop-s"/>
-  <symbol minX="1036" maxX="1078" minY="663" maxY="705" name="speedcam-m"/>
-  <symbol minX="1078" maxX="1120" minY="663" maxY="705" name="museum-s"/>
-  <symbol minX="1120" maxX="1162" minY="663" maxY="705" name="cave-s"/>
-  <symbol minX="1162" maxX="1204" minY="663" maxY="705" name="grocery-s"/>
-  <symbol minX="1204" maxX="1246" minY="663" maxY="705" name="hand-s"/>
-  <symbol minX="1246" maxX="1288" minY="663" maxY="705" name="golf-s"/>
-  <symbol minX="1288" maxX="1330" minY="663" maxY="705" name="helipad-s"/>
-  <symbol minX="1330" maxX="1372" minY="663" maxY="705" name="garden-s"/>
-  <symbol minX="1372" maxX="1430" minY="663" maxY="705" name="subway-barcelona-m"/>
-  <symbol minX="1430" maxX="1481" minY="663" maxY="705" name="subway-barcelona-s"/>
-  <symbol minX="1481" maxX="1523" minY="663" maxY="705" name="ship-s"/>
-  <symbol minX="1523" maxX="1565" minY="663" maxY="705" name="cemetery-s"/>
-  <symbol minX="1565" maxX="1607" minY="663" maxY="705" name="hospital-s"/>
-  <symbol minX="1607" maxX="1649" minY="663" maxY="705" name="school-s"/>
-  <symbol minX="1649" maxX="1691" minY="663" maxY="705" name="subway-entrance-2-s"/>
-  <symbol minX="1691" maxX="1733" minY="663" maxY="705" name="subway-entrance-arrow"/>
-  <symbol minX="1733" maxX="1775" minY="663" maxY="705" name="alcohol-s"/>
-  <symbol minX="1775" maxX="1817" minY="663" maxY="705" name="restaurant-s"/>
-  <symbol minX="1817" maxX="1859" minY="663" maxY="705" name="subway-entrance-s"/>
-  <symbol minX="1859" maxX="1901" minY="663" maxY="705" name="hotel-s"/>
-  <symbol minX="1901" maxX="1943" minY="663" maxY="705" name="gallery-s"/>
-  <symbol minX="1943" maxX="1985" minY="663" maxY="705" name="information-s"/>
-  <symbol minX="1985" maxX="2027" minY="663" maxY="705" name="car-repair-s"/>
-  <symbol minX="0" maxX="42" minY="710" maxY="752" name="cinema-s"/>
-  <symbol minX="42" maxX="98" minY="710" maxY="752" name="subway-london-m"/>
-  <symbol minX="98" maxX="140" minY="710" maxY="752" name="funicular-s"/>
-  <symbol minX="140" maxX="182" minY="710" maxY="752" name="recycling-s"/>
-  <symbol minX="182" maxX="224" minY="710" maxY="752" name="america-football-s"/>
-  <symbol minX="224" maxX="282" minY="710" maxY="752" name="subway-madrid-m"/>
-  <symbol minX="282" maxX="324" minY="710" maxY="752" name="bar-s"/>
-  <symbol minX="324" maxX="366" minY="710" maxY="752" name="fuel-s"/>
-  <symbol minX="366" maxX="408" minY="710" maxY="752" name="kindergarten-s"/>
-  <symbol minX="408" maxX="450" minY="710" maxY="752" name="fountain-s"/>
-  <symbol minX="450" maxX="492" minY="710" maxY="752" name="library-s"/>
-  <symbol minX="492" maxX="534" minY="710" maxY="752" name="pub-s"/>
-  <symbol minX="534" maxX="576" minY="710" maxY="752" name="zoo-s"/>
-  <symbol minX="576" maxX="618" minY="710" maxY="752" name="campsite-s"/>
-  <symbol minX="618" maxX="660" minY="710" maxY="752" name="college-s"/>
-  <symbol minX="660" maxX="702" minY="710" maxY="752" name="subway-newyork-s"/>
-  <symbol minX="702" maxX="744" minY="710" maxY="752" name="fire_station-s"/>
-  <symbol minX="744" maxX="786" minY="710" maxY="752" name="power-s"/>
-  <symbol minX="786" maxX="828" minY="710" maxY="752" name="police-s"/>
-  <symbol minX="828" maxX="870" minY="710" maxY="752" name="baseball-s"/>
-  <symbol minX="870" maxX="912" minY="710" maxY="752" name="windmill-s"/>
-  <symbol minX="912" maxX="954" minY="710" maxY="752" name="place-of-worship-s"/>
-  <symbol minX="954" maxX="996" minY="710" maxY="752" name="lighthouse-s"/>
-  <symbol minX="996" maxX="1038" minY="710" maxY="752" name="subway-s"/>
-  <symbol minX="1038" maxX="1080" minY="710" maxY="752" name="cafe-s"/>
-  <symbol minX="1080" maxX="1122" minY="710" maxY="752" name="fastfood-s"/>
-  <symbol minX="1122" maxX="1164" minY="710" maxY="752" name="subway-spb-s"/>
-  <symbol minX="1164" maxX="1206" minY="710" maxY="752" name="basketball-s"/>
-  <symbol minX="1206" maxX="1248" minY="710" maxY="752" name="mail-s"/>
-  <symbol minX="1248" maxX="1290" minY="710" maxY="752" name="equestrian-s"/>
-  <symbol minX="1290" maxX="1348" minY="710" maxY="752" name="metro-barcelona-m"/>
-  <symbol minX="1348" maxX="1390" minY="710" maxY="752" name="pitch-s"/>
-  <symbol minX="1390" maxX="1432" minY="710" maxY="752" name="volcano-s"/>
-  <symbol minX="1432" maxX="1474" minY="710" maxY="752" name="cable-car-s"/>
-  <symbol minX="1474" maxX="1516" minY="710" maxY="752" name="phone-s"/>
-  <symbol minX="1516" maxX="1558" minY="710" maxY="752" name="swimming-s"/>
-  <symbol minX="1558" maxX="1600" minY="710" maxY="752" name="pharmacy-s"/>
-  <symbol minX="1600" maxX="1642" minY="710" maxY="752" name="military-s"/>
-  <symbol minX="1642" maxX="1684" minY="710" maxY="752" name="atm-s"/>
-  <symbol minX="1684" maxX="1726" minY="710" maxY="752" name="monument-s"/>
-  <symbol minX="1726" maxX="1768" minY="710" maxY="752" name="tennis-s"/>
-  <symbol minX="1768" maxX="1810" minY="710" maxY="752" name="bus-s"/>
-  <symbol minX="1810" maxX="1852" minY="710" maxY="752" name="tram-s"/>
-  <symbol minX="1852" maxX="1894" minY="710" maxY="752" name="theatre-s"/>
-  <symbol minX="1894" maxX="1936" minY="710" maxY="752" name="embassy-s"/>
-  <symbol minX="1936" maxX="1978" minY="710" maxY="752" name="train-s"/>
-  <symbol minX="1978" maxX="2020" minY="710" maxY="752" name="toilets-s"/>
-  <symbol minX="0" maxX="42" minY="752" maxY="794" name="npark-s"/>
-  <symbol minX="42" maxX="84" minY="752" maxY="794" name="drinking-water-s"/>
-  <symbol minX="84" maxX="126" minY="752" maxY="794" name="park-s"/>
-  <symbol minX="126" maxX="168" minY="752" maxY="794" name="bicycle-s"/>
-  <symbol minX="168" maxX="210" minY="752" maxY="794" name="book-shop-s"/>
-  <symbol minX="210" maxX="252" minY="752" maxY="794" name="townhall-s"/>
-  <symbol minX="252" maxX="294" minY="752" maxY="794" name="tourism-s"/>
-  <symbol minX="294" maxX="336" minY="752" maxY="794" name="nparkf-s"/>
-  <symbol minX="336" maxX="394" minY="752" maxY="793" name="subway-madrid-l"/>
-  <symbol minX="394" maxX="452" minY="752" maxY="793" name="subway-barcelona-l"/>
-  <symbol minX="452" maxX="490" minY="752" maxY="792" name="s-arrow"/>
-  <symbol minX="490" maxX="530" minY="752" maxY="792" name="parking-m"/>
-  <symbol minX="530" maxX="586" minY="752" maxY="790" name="subway-kiev-l"/>
-  <symbol minX="586" maxX="642" minY="752" maxY="790" name="subway-kiev-m"/>
-  <symbol minX="642" maxX="680" minY="752" maxY="790" name="peak-l"/>
-  <symbol minX="680" maxX="731" minY="752" maxY="790" name="metro-barcelona-s"/>
-  <symbol minX="731" maxX="782" minY="752" maxY="790" name="subway-madrid-s"/>
-  <symbol minX="782" maxX="820" minY="752" maxY="790" name="lightrail-berlin-s"/>
-  <symbol minX="820" maxX="858" minY="752" maxY="790" name="subway-paris-s"/>
-  <symbol minX="858" maxX="894" minY="752" maxY="788" name="subway-moscow-s"/>
-  <symbol minX="894" maxX="930" minY="752" maxY="788" name="api-result"/>
-  <symbol minX="930" maxX="964" minY="752" maxY="786" name="search-result"/>
-  <symbol minX="964" maxX="997" minY="752" maxY="785" name="speedcam-s"/>
-  <symbol minX="997" maxX="1030" minY="752" maxY="785" name="parking-s"/>
-  <symbol minX="1030" maxX="1063" minY="752" maxY="785" name="subway-berlin-s"/>
-  <symbol minX="1063" maxX="1105" minY="752" maxY="785" name="subway-london-s"/>
-  <symbol minX="1105" maxX="1138" minY="752" maxY="785" name="subway-rome-s"/>
-  <symbol minX="1138" maxX="1176" minY="752" maxY="785" name="bench"/>
-  <symbol minX="1176" maxX="1232" minY="752" maxY="783" name="subway-minsk-l"/>
-  <symbol minX="1232" maxX="1265" minY="752" maxY="783" name="peakt-l"/>
-  <symbol minX="1265" maxX="1296" minY="752" maxY="783" name="survey_point-l"/>
-  <symbol minX="1296" maxX="1327" minY="752" maxY="783" name="star-l"/>
-  <symbol minX="1327" maxX="1356" minY="752" maxY="781" name="star-m"/>
-  <symbol minX="1356" maxX="1403" minY="752" maxY="781" name="subway-kiev-s"/>
-  <symbol minX="1403" maxX="1450" minY="752" maxY="779" name="subway-minsk-m"/>
-  <symbol minX="1450" maxX="1479" minY="752" maxY="779" name="peak-m"/>
-  <symbol minX="1479" maxX="1506" minY="752" maxY="779" name="subway-xs"/>
-  <symbol minX="1506" maxX="1533" minY="752" maxY="779" name="survey_point-m"/>
-  <symbol minX="1533" maxX="1560" minY="752" maxY="779" name="subway-newyork-xs"/>
-  <symbol minX="1560" maxX="1602" minY="752" maxY="779" name="railway-crossing"/>
-  <symbol minX="1602" maxX="1626" minY="752" maxY="776" name="star-s"/>
-  <symbol minX="1626" maxX="1650" minY="752" maxY="776" name="crossing-l"/>
-  <symbol minX="1650" maxX="1692" minY="752" maxY="776" name="subway-minsk-s"/>
-  <symbol minX="1692" maxX="1716" minY="752" maxY="774" name="peakt-m"/>
-  <symbol minX="1716" maxX="1767" minY="752" maxY="774" name="arrow-m"/>
-  <symbol minX="1767" maxX="1791" minY="752" maxY="774" name="peak-s"/>
-  <symbol minX="1791" maxX="1813" minY="752" maxY="774" name="survey_point-s"/>
-  <symbol minX="1813" maxX="1833" minY="752" maxY="772" name="crossing-m"/>
-  <symbol minX="1833" maxX="1853" minY="752" maxY="772" name="entrance-s"/>
-  <symbol minX="1853" maxX="1873" minY="752" maxY="770" name="peakt-s"/>
-  <symbol minX="1873" maxX="1911" minY="752" maxY="767" name="arrow-s"/>
-  <symbol minX="1911" maxX="1926" minY="752" maxY="767" name="none"/>
-  <symbol minX="1926" maxX="1941" minY="752" maxY="767" name="tree-l"/>
-  <symbol minX="1941" maxX="1956" minY="752" maxY="767" name="dot-m"/>
-  <symbol minX="1956" maxX="1971" minY="752" maxY="767" name="crossing-s"/>
-  <symbol minX="1971" maxX="1984" minY="752" maxY="765" name="tree-m"/>
-  <symbol minX="1984" maxX="1997" minY="752" maxY="765" name="entrance-xs"/>
-  <symbol minX="1997" maxX="2008" minY="752" maxY="763" name="dot-s-light"/>
-  <symbol minX="2008" maxX="2019" minY="752" maxY="763" name="tree-s"/>
-  <symbol minX="2019" maxX="2030" minY="752" maxY="763" name="zero-icon"/>
-  <symbol minX="2030" maxX="2041" minY="752" maxY="763" name="dot-s"/>
+  <symbol minX="1568" maxX="1624" minY="607" maxY="663" name="remains-m"/>
+  <symbol minX="1624" maxX="1680" minY="607" maxY="663" name="recycling-m"/>
+  <symbol minX="1680" maxX="1736" minY="607" maxY="663" name="chemist-m"/>
+  <symbol minX="1736" maxX="1787" minY="607" maxY="658" name="parking-l"/>
+  <symbol minX="1787" maxX="1838" minY="607" maxY="658" name="speedcam-l"/>
+  <symbol minX="1838" maxX="1889" minY="607" maxY="658" name="lightrail-berlin-m"/>
+  <symbol minX="1889" maxX="1940" minY="607" maxY="658" name="subway-berlin-l"/>
+  <symbol minX="1940" maxX="1998" minY="607" maxY="658" name="subway-moscow-l"/>
+  <symbol minX="0" maxX="51" minY="663" maxY="714" name="subway-rome-l"/>
+  <symbol minX="51" maxX="98" minY="663" maxY="710" name="no-icon-shop"/>
+  <symbol minX="98" maxX="145" minY="663" maxY="710" name="no-icon-tourism"/>
+  <symbol minX="145" maxX="192" minY="663" maxY="710" name="subway-rome-m"/>
+  <symbol minX="192" maxX="239" minY="663" maxY="710" name="no-icon"/>
+  <symbol minX="239" maxX="286" minY="663" maxY="710" name="subway-berlin-m"/>
+  <symbol minX="286" maxX="333" minY="663" maxY="710" name="no-icon-leisure"/>
+  <symbol minX="333" maxX="380" minY="663" maxY="710" name="subway-paris-m"/>
+  <symbol minX="380" maxX="434" minY="663" maxY="710" name="subway-moscow-m"/>
+  <symbol minX="434" maxX="481" minY="663" maxY="710" name="no-icon-amenity"/>
+  <symbol minX="481" maxX="527" minY="663" maxY="709" name="current-position"/>
+  <symbol minX="527" maxX="585" minY="663" maxY="708" name="subway-london-l"/>
+  <symbol minX="585" maxX="627" minY="663" maxY="708" name="waterfall-s"/>
+  <symbol minX="627" maxX="669" minY="663" maxY="708" name="beer-s"/>
+  <symbol minX="669" maxX="711" minY="663" maxY="708" name="hunting-tower-s"/>
+  <symbol minX="711" maxX="756" minY="663" maxY="708" name="airport-s"/>
+  <symbol minX="756" maxX="798" minY="663" maxY="705" name="shop-s"/>
+  <symbol minX="798" maxX="840" minY="663" maxY="705" name="pharmacy-s"/>
+  <symbol minX="840" maxX="882" minY="663" maxY="705" name="fire_station-s"/>
+  <symbol minX="882" maxX="924" minY="663" maxY="705" name="skiing-s"/>
+  <symbol minX="924" maxX="966" minY="663" maxY="705" name="car-repair-s"/>
+  <symbol minX="966" maxX="1008" minY="663" maxY="705" name="grocery-s"/>
+  <symbol minX="1008" maxX="1050" minY="663" maxY="705" name="soccer-s"/>
+  <symbol minX="1050" maxX="1092" minY="663" maxY="705" name="golf-s"/>
+  <symbol minX="1092" maxX="1134" minY="663" maxY="705" name="speedcam-m"/>
+  <symbol minX="1134" maxX="1176" minY="663" maxY="705" name="kindergarten-s"/>
+  <symbol minX="1176" maxX="1218" minY="663" maxY="705" name="garden-s"/>
+  <symbol minX="1218" maxX="1260" minY="663" maxY="705" name="peak-s"/>
+  <symbol minX="1260" maxX="1302" minY="663" maxY="705" name="museum-s"/>
+  <symbol minX="1302" maxX="1344" minY="663" maxY="705" name="fastfood-s"/>
+  <symbol minX="1344" maxX="1386" minY="663" maxY="705" name="alcohol-s"/>
+  <symbol minX="1386" maxX="1428" minY="663" maxY="705" name="bcontrol-s"/>
+  <symbol minX="1428" maxX="1486" minY="663" maxY="705" name="subway-barcelona-m"/>
+  <symbol minX="1486" maxX="1537" minY="663" maxY="705" name="subway-barcelona-s"/>
+  <symbol minX="1537" maxX="1579" minY="663" maxY="705" name="phone-s"/>
+  <symbol minX="1579" maxX="1621" minY="663" maxY="705" name="picnic-s"/>
+  <symbol minX="1621" maxX="1663" minY="663" maxY="705" name="volcano-s"/>
+  <symbol minX="1663" maxX="1705" minY="663" maxY="705" name="gallery-s"/>
+  <symbol minX="1705" maxX="1747" minY="663" maxY="705" name="subway-entrance-2-s"/>
+  <symbol minX="1747" maxX="1789" minY="663" maxY="705" name="subway-entrance-arrow"/>
+  <symbol minX="1789" maxX="1831" minY="663" maxY="705" name="campsite-s"/>
+  <symbol minX="1831" maxX="1873" minY="663" maxY="705" name="equestrian-s"/>
+  <symbol minX="1873" maxX="1915" minY="663" maxY="705" name="subway-entrance-s"/>
+  <symbol minX="1915" maxX="1957" minY="663" maxY="705" name="library-s"/>
+  <symbol minX="1957" maxX="1999" minY="663" maxY="705" name="basketball-s"/>
+  <symbol minX="1999" maxX="2041" minY="663" maxY="705" name="hand-s"/>
+  <symbol minX="0" maxX="42" minY="714" maxY="756" name="information-s"/>
+  <symbol minX="42" maxX="84" minY="714" maxY="756" name="pitch-s"/>
+  <symbol minX="84" maxX="140" minY="714" maxY="756" name="subway-london-m"/>
+  <symbol minX="140" maxX="182" minY="714" maxY="756" name="recycling-s"/>
+  <symbol minX="182" maxX="224" minY="714" maxY="756" name="casino-s"/>
+  <symbol minX="224" maxX="266" minY="714" maxY="756" name="fountain-s"/>
+  <symbol minX="266" maxX="324" minY="714" maxY="756" name="subway-madrid-m"/>
+  <symbol minX="324" maxX="366" minY="714" maxY="756" name="windmill-s"/>
+  <symbol minX="366" maxX="408" minY="714" maxY="756" name="helipad-s"/>
+  <symbol minX="408" maxX="450" minY="714" maxY="756" name="funicular-s"/>
+  <symbol minX="450" maxX="492" minY="714" maxY="756" name="america-football-s"/>
+  <symbol minX="492" maxX="534" minY="714" maxY="756" name="ship-s"/>
+  <symbol minX="534" maxX="576" minY="714" maxY="756" name="place-of-worship-s"/>
+  <symbol minX="576" maxX="618" minY="714" maxY="756" name="tram-s"/>
+  <symbol minX="618" maxX="660" minY="714" maxY="756" name="cafe-s"/>
+  <symbol minX="660" maxX="702" minY="714" maxY="756" name="park-s"/>
+  <symbol minX="702" maxX="744" minY="714" maxY="756" name="subway-newyork-s"/>
+  <symbol minX="744" maxX="786" minY="714" maxY="756" name="bar-s"/>
+  <symbol minX="786" maxX="828" minY="714" maxY="756" name="office-s"/>
+  <symbol minX="828" maxX="870" minY="714" maxY="756" name="college-s"/>
+  <symbol minX="870" maxX="912" minY="714" maxY="756" name="lighthouse-s"/>
+  <symbol minX="912" maxX="954" minY="714" maxY="756" name="school-s"/>
+  <symbol minX="954" maxX="996" minY="714" maxY="756" name="police-s"/>
+  <symbol minX="996" maxX="1038" minY="714" maxY="756" name="embassy-s"/>
+  <symbol minX="1038" maxX="1080" minY="714" maxY="756" name="subway-s"/>
+  <symbol minX="1080" maxX="1122" minY="714" maxY="756" name="cable-car-s"/>
+  <symbol minX="1122" maxX="1164" minY="714" maxY="756" name="nparkf-s"/>
+  <symbol minX="1164" maxX="1206" minY="714" maxY="756" name="subway-spb-s"/>
+  <symbol minX="1206" maxX="1248" minY="714" maxY="756" name="heliport-s"/>
+  <symbol minX="1248" maxX="1290" minY="714" maxY="756" name="cave-s"/>
+  <symbol minX="1290" maxX="1332" minY="714" maxY="756" name="fuel-s"/>
+  <symbol minX="1332" maxX="1374" minY="714" maxY="756" name="hospital-s"/>
+  <symbol minX="1374" maxX="1416" minY="714" maxY="756" name="npark-s"/>
+  <symbol minX="1416" maxX="1458" minY="714" maxY="756" name="train-s"/>
+  <symbol minX="1458" maxX="1500" minY="714" maxY="756" name="zoo-s"/>
+  <symbol minX="1500" maxX="1542" minY="714" maxY="756" name="cemetery-s"/>
+  <symbol minX="1542" maxX="1584" minY="714" maxY="756" name="swimming-s"/>
+  <symbol minX="1584" maxX="1626" minY="714" maxY="756" name="bus-s"/>
+  <symbol minX="1626" maxX="1668" minY="714" maxY="756" name="restaurant-s"/>
+  <symbol minX="1668" maxX="1710" minY="714" maxY="756" name="cinema-s"/>
+  <symbol minX="1710" maxX="1752" minY="714" maxY="756" name="power-s"/>
+  <symbol minX="1752" maxX="1794" minY="714" maxY="756" name="tennis-s"/>
+  <symbol minX="1794" maxX="1836" minY="714" maxY="756" name="remains-s"/>
+  <symbol minX="1836" maxX="1878" minY="714" maxY="756" name="hotel-s"/>
+  <symbol minX="1878" maxX="1920" minY="714" maxY="756" name="theatre-s"/>
+  <symbol minX="1920" maxX="1962" minY="714" maxY="756" name="baseball-s"/>
+  <symbol minX="1962" maxX="2004" minY="714" maxY="756" name="monument-s"/>
+  <symbol minX="2004" maxX="2046" minY="714" maxY="756" name="toilets-s"/>
+  <symbol minX="0" maxX="42" minY="756" maxY="798" name="book-shop-s"/>
+  <symbol minX="42" maxX="84" minY="756" maxY="798" name="drinking-water-s"/>
+  <symbol minX="84" maxX="126" minY="756" maxY="798" name="atm-s"/>
+  <symbol minX="126" maxX="168" minY="756" maxY="798" name="military-s"/>
+  <symbol minX="168" maxX="210" minY="756" maxY="798" name="bicycle-s"/>
+  <symbol minX="210" maxX="252" minY="756" maxY="798" name="pub-s"/>
+  <symbol minX="252" maxX="294" minY="756" maxY="798" name="tourism-s"/>
+  <symbol minX="294" maxX="352" minY="756" maxY="798" name="metro-barcelona-m"/>
+  <symbol minX="352" maxX="394" minY="756" maxY="798" name="mail-s"/>
+  <symbol minX="394" maxX="436" minY="756" maxY="798" name="townhall-s"/>
+  <symbol minX="436" maxX="494" minY="756" maxY="797" name="subway-barcelona-l"/>
+  <symbol minX="494" maxX="552" minY="756" maxY="797" name="subway-madrid-l"/>
+  <symbol minX="552" maxX="592" minY="756" maxY="796" name="route_from"/>
+  <symbol minX="592" maxX="630" minY="756" maxY="796" name="s-arrow"/>
+  <symbol minX="630" maxX="670" minY="756" maxY="796" name="parking-m"/>
+  <symbol minX="670" maxX="721" minY="756" maxY="794" name="metro-barcelona-s"/>
+  <symbol minX="721" maxX="759" minY="756" maxY="794" name="subway-paris-s"/>
+  <symbol minX="759" maxX="815" minY="756" maxY="794" name="subway-kiev-m"/>
+  <symbol minX="815" maxX="866" minY="756" maxY="794" name="subway-madrid-s"/>
+  <symbol minX="866" maxX="904" minY="756" maxY="794" name="lightrail-berlin-s"/>
+  <symbol minX="904" maxX="960" minY="756" maxY="794" name="subway-kiev-l"/>
+  <symbol minX="960" maxX="996" minY="756" maxY="792" name="subway-moscow-s"/>
+  <symbol minX="996" maxX="1032" minY="756" maxY="792" name="api-result"/>
+  <symbol minX="1032" maxX="1066" minY="756" maxY="790" name="search-result"/>
+  <symbol minX="1066" maxX="1099" minY="756" maxY="789" name="parking-s"/>
+  <symbol minX="1099" maxX="1132" minY="756" maxY="789" name="subway-berlin-s"/>
+  <symbol minX="1132" maxX="1170" minY="756" maxY="789" name="bench"/>
+  <symbol minX="1170" maxX="1203" minY="756" maxY="789" name="subway-rome-s"/>
+  <symbol minX="1203" maxX="1236" minY="756" maxY="789" name="star-l"/>
+  <symbol minX="1236" maxX="1269" minY="756" maxY="789" name="speedcam-s"/>
+  <symbol minX="1269" maxX="1311" minY="756" maxY="789" name="subway-london-s"/>
+  <symbol minX="1311" maxX="1342" minY="756" maxY="787" name="survey_point-l"/>
+  <symbol minX="1342" maxX="1375" minY="756" maxY="787" name="peakt-l"/>
+  <symbol minX="1375" maxX="1406" minY="756" maxY="787" name="star-m"/>
+  <symbol minX="1406" maxX="1462" minY="756" maxY="787" name="subway-minsk-l"/>
+  <symbol minX="1462" maxX="1509" minY="756" maxY="785" name="subway-kiev-s"/>
+  <symbol minX="1509" maxX="1551" minY="756" maxY="783" name="railway-crossing"/>
+  <symbol minX="1551" maxX="1598" minY="756" maxY="783" name="subway-minsk-m"/>
+  <symbol minX="1598" maxX="1625" minY="756" maxY="783" name="subway-newyork-xs"/>
+  <symbol minX="1625" maxX="1652" minY="756" maxY="783" name="star-s"/>
+  <symbol minX="1652" maxX="1679" minY="756" maxY="783" name="subway-xs"/>
+  <symbol minX="1679" maxX="1706" minY="756" maxY="783" name="survey_point-m"/>
+  <symbol minX="1706" maxX="1748" minY="756" maxY="780" name="subway-minsk-s"/>
+  <symbol minX="1748" maxX="1772" minY="756" maxY="780" name="crossing-l"/>
+  <symbol minX="1772" maxX="1794" minY="756" maxY="778" name="survey_point-s"/>
+  <symbol minX="1794" maxX="1818" minY="756" maxY="778" name="peakt-m"/>
+  <symbol minX="1818" maxX="1869" minY="756" maxY="778" name="arrow-m"/>
+  <symbol minX="1869" maxX="1889" minY="756" maxY="776" name="entrance-s"/>
+  <symbol minX="1889" maxX="1909" minY="756" maxY="776" name="crossing-m"/>
+  <symbol minX="1909" maxX="1929" minY="756" maxY="774" name="peakt-s"/>
+  <symbol minX="1929" maxX="1947" minY="756" maxY="774" name="dot-m"/>
+  <symbol minX="1947" maxX="1962" minY="756" maxY="771" name="tree-l"/>
+  <symbol minX="1962" maxX="1977" minY="756" maxY="771" name="crossing-s"/>
+  <symbol minX="1977" maxX="1992" minY="756" maxY="771" name="none"/>
+  <symbol minX="1992" maxX="2030" minY="756" maxY="771" name="arrow-s"/>
+  <symbol minX="2030" maxX="2043" minY="756" maxY="769" name="dot-s"/>
+  <symbol minX="0" maxX="13" minY="798" maxY="811" name="entrance-xs"/>
+  <symbol minX="13" maxX="26" minY="798" maxY="811" name="tree-m"/>
+  <symbol minX="26" maxX="39" minY="798" maxY="811" name="dot-s-light"/>
+  <symbol minX="39" maxX="50" minY="798" maxY="809" name="zero-icon"/>
+  <symbol minX="50" maxX="61" minY="798" maxY="809" name="tree-s"/>
  </file>
 </root>
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/resources-xxhdpi_dark/symbols.png
index 8519b20e1b..0ace0c103c 100644
--- a/data/resources-xxhdpi_dark/symbols.png
+++ b/data/resources-xxhdpi_dark/symbols.png
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/resources-xxhdpi_dark/symbols.sdf
index f78eeaac46..10823b1491 100644
--- a/data/resources-xxhdpi_dark/symbols.sdf
+++ b/data/resources-xxhdpi_dark/symbols.sdf
@@ -1,464 +1,464 @@
 <!DOCTYPE skin>
 <root>
- <file width="2048" height="1024">
-  <symbol minX="0" maxX="205" minY="0" maxY="205" name="route_to"/>
-  <symbol minX="205" maxX="609" minY="0" maxY="196" name="route-arrow"/>
-  <symbol minX="609" maxX="781" minY="0" maxY="172" name="compass-image"/>
-  <symbol minX="781" maxX="893" minY="0" maxY="154" name="watch-search-result"/>
-  <symbol minX="893" maxX="1017" minY="0" maxY="136" name="watch-my-direction"/>
-  <symbol minX="1017" maxX="1102" minY="0" maxY="109" name="current-position-compas"/>
-  <symbol minX="1102" maxX="1187" minY="0" maxY="109" name="current-routing-compas"/>
-  <symbol minX="1187" maxX="1287" minY="0" maxY="100" name="watch-my-position"/>
-  <symbol minX="1287" maxX="1384" minY="0" maxY="97" name="search-result-active"/>
-  <symbol minX="1384" maxX="1427" minY="0" maxY="85" name="placemark-pink"/>
-  <symbol minX="1427" maxX="1470" minY="0" maxY="85" name="placemark-orange"/>
-  <symbol minX="1470" maxX="1513" minY="0" maxY="85" name="placemark-green"/>
-  <symbol minX="1513" maxX="1556" minY="0" maxY="85" name="placemark-brown"/>
-  <symbol minX="1556" maxX="1599" minY="0" maxY="85" name="placemark-blue"/>
-  <symbol minX="1599" maxX="1642" minY="0" maxY="85" name="placemark-red"/>
-  <symbol minX="1642" maxX="1685" minY="0" maxY="85" name="placemark-yellow"/>
-  <symbol minX="1685" maxX="1728" minY="0" maxY="85" name="placemark-purple"/>
-  <symbol minX="1728" maxX="1786" minY="0" maxY="58" name="airport-l"/>
-  <symbol minX="1786" maxX="1844" minY="0" maxY="58" name="monument-l"/>
-  <symbol minX="1844" maxX="1902" minY="0" maxY="58" name="australian-football-l"/>
-  <symbol minX="1902" maxX="1960" minY="0" maxY="58" name="shoes-l"/>
-  <symbol minX="1960" maxX="2018" minY="0" maxY="58" name="bakery-l"/>
-  <symbol minX="0" maxX="58" minY="205" maxY="263" name="ship-l"/>
-  <symbol minX="58" maxX="116" minY="205" maxY="263" name="school-l"/>
-  <symbol minX="116" maxX="173" minY="205" maxY="263" name="bank-l"/>
-  <symbol minX="173" maxX="229" minY="205" maxY="263" name="bank-m"/>
-  <symbol minX="229" maxX="286" minY="205" maxY="263" name="banknote-l"/>
-  <symbol minX="286" maxX="344" minY="205" maxY="263" name="shop-bicycle-l"/>
-  <symbol minX="344" maxX="402" minY="205" maxY="263" name="bar-l"/>
-  <symbol minX="402" maxX="460" minY="205" maxY="263" name="restaurant-l"/>
-  <symbol minX="460" maxX="518" minY="205" maxY="263" name="airport-m"/>
-  <symbol minX="518" maxX="576" minY="205" maxY="263" name="baseball-l"/>
-  <symbol minX="576" maxX="634" minY="205" maxY="263" name="shop-l copy"/>
-  <symbol minX="634" maxX="692" minY="205" maxY="263" name="alcohol-l"/>
-  <symbol minX="692" maxX="750" minY="205" maxY="263" name="basketball-l"/>
-  <symbol minX="750" maxX="808" minY="205" maxY="263" name="remains-l"/>
-  <symbol minX="808" maxX="866" minY="205" maxY="263" name="shop-l"/>
-  <symbol minX="866" maxX="924" minY="205" maxY="263" name="bbq-l"/>
-  <symbol minX="924" maxX="982" minY="205" maxY="263" name="recycling-l"/>
-  <symbol minX="982" maxX="1040" minY="205" maxY="263" name="bcontrol-l"/>
-  <symbol minX="1040" maxX="1098" minY="205" maxY="263" name="pub-l"/>
-  <symbol minX="1098" maxX="1156" minY="205" maxY="263" name="power-m"/>
-  <symbol minX="1156" maxX="1214" minY="205" maxY="263" name="beach-l"/>
-  <symbol minX="1214" maxX="1272" minY="205" maxY="263" name="power-l"/>
-  <symbol minX="1272" maxX="1330" minY="205" maxY="263" name="beauty-l"/>
-  <symbol minX="1330" maxX="1388" minY="205" maxY="263" name="postbox-l"/>
-  <symbol minX="1388" maxX="1446" minY="205" maxY="263" name="beer-l"/>
-  <symbol minX="1446" maxX="1504" minY="205" maxY="263" name="skiing-l"/>
-  <symbol minX="1504" maxX="1562" minY="205" maxY="263" name="alpine_hut-l"/>
-  <symbol minX="1562" maxX="1620" minY="205" maxY="263" name="police-l"/>
-  <symbol minX="1620" maxX="1678" minY="205" maxY="263" name="bicycle-l"/>
-  <symbol minX="1678" maxX="1736" minY="205" maxY="263" name="place-of-worship-l"/>
-  <symbol minX="1736" maxX="1794" minY="205" maxY="263" name="america-football-l"/>
-  <symbol minX="1794" maxX="1852" minY="205" maxY="263" name="book-shop-l"/>
-  <symbol minX="1852" maxX="1910" minY="205" maxY="263" name="soccer-l"/>
-  <symbol minX="1910" maxX="1968" minY="205" maxY="263" name="pitch-l"/>
-  <symbol minX="1968" maxX="2026" minY="205" maxY="263" name="boundary_stone-l"/>
-  <symbol minX="0" maxX="58" minY="263" maxY="321" name="picnic-l"/>
-  <symbol minX="58" maxX="116" minY="263" maxY="321" name="bowls-l"/>
-  <symbol minX="116" maxX="174" minY="263" maxY="321" name="phone-l"/>
-  <symbol minX="174" maxX="232" minY="263" maxY="321" name="bus-l"/>
-  <symbol minX="232" maxX="290" minY="263" maxY="321" name="sports-l"/>
-  <symbol minX="290" maxX="348" minY="263" maxY="321" name="archery-l"/>
-  <symbol minX="348" maxX="406" minY="263" maxY="321" name="butcher-l"/>
-  <symbol minX="406" maxX="464" minY="263" maxY="321" name="pharmacy-l"/>
-  <symbol minX="464" maxX="522" minY="263" maxY="321" name="cable-car-l"/>
-  <symbol minX="522" maxX="580" minY="263" maxY="321" name="subway-entrance-l"/>
-  <symbol minX="580" maxX="638" minY="263" maxY="321" name="peak-l"/>
-  <symbol minX="638" maxX="696" minY="263" maxY="321" name="cafe-l"/>
-  <symbol minX="696" maxX="754" minY="263" maxY="321" name="parking-meter-l"/>
-  <symbol minX="754" maxX="812" minY="263" maxY="321" name="atm-l"/>
-  <symbol minX="812" maxX="870" minY="263" maxY="321" name="campsite-l"/>
-  <symbol minX="870" maxX="928" minY="263" maxY="321" name="subway-l"/>
-  <symbol minX="928" maxX="986" minY="263" maxY="321" name="park-l"/>
-  <symbol minX="986" maxX="1044" minY="263" maxY="321" name="car-repair-l"/>
-  <symbol minX="1044" maxX="1102" minY="263" maxY="321" name="optician-l"/>
-  <symbol minX="1102" maxX="1160" minY="263" maxY="321" name="office-l"/>
-  <symbol minX="1160" maxX="1218" minY="263" maxY="321" name="car_sharing-l"/>
-  <symbol minX="1218" maxX="1276" minY="263" maxY="321" name="subway-newyork-l"/>
-  <symbol minX="1276" maxX="1334" minY="263" maxY="321" name="caravan_site-l"/>
-  <symbol minX="1334" maxX="1392" minY="263" maxY="321" name="nparkf-l"/>
-  <symbol minX="1392" maxX="1450" minY="263" maxY="321" name="casino-l"/>
-  <symbol minX="1450" maxX="1508" minY="263" maxY="321" name="npark-l"/>
-  <symbol minX="1508" maxX="1566" minY="263" maxY="321" name="zoo-l"/>
-  <symbol minX="1566" maxX="1624" minY="263" maxY="321" name="cave-l"/>
-  <symbol minX="1624" maxX="1682" minY="263" maxY="321" name="subway-paris-l"/>
-  <symbol minX="1682" maxX="1740" minY="263" maxY="321" name="subway-spb-l"/>
-  <symbol minX="1740" maxX="1798" minY="263" maxY="321" name="cemetery-l"/>
-  <symbol minX="1798" maxX="1856" minY="263" maxY="321" name="sweets-l"/>
-  <symbol minX="1856" maxX="1914" minY="263" maxY="321" name="windmill-l"/>
-  <symbol minX="1914" maxX="1972" minY="263" maxY="321" name="chemist-l"/>
-  <symbol minX="1972" maxX="2030" minY="263" maxY="321" name="swimming-l"/>
-  <symbol minX="0" maxX="58" minY="321" maxY="379" name="cinema-l"/>
-  <symbol minX="58" maxX="116" minY="321" maxY="379" name="museum-l"/>
-  <symbol minX="116" maxX="174" minY="321" maxY="379" name="motel-l"/>
-  <symbol minX="174" maxX="232" minY="321" maxY="379" name="clothes-l"/>
-  <symbol minX="232" maxX="290" minY="321" maxY="379" name="taxi-l"/>
-  <symbol minX="290" maxX="348" minY="321" maxY="379" name="college-l"/>
-  <symbol minX="348" maxX="406" minY="321" maxY="379" name="mobile_phone-l"/>
-  <symbol minX="406" maxX="464" minY="321" maxY="379" name="wayside_shrine-l"/>
-  <symbol minX="464" maxX="522" minY="321" maxY="379" name="computer-l"/>
-  <symbol minX="522" maxX="580" minY="321" maxY="379" name="military-l"/>
-  <symbol minX="580" maxX="638" minY="321" maxY="379" name="convenience-l"/>
-  <symbol minX="638" maxX="696" minY="321" maxY="379" name="tennis-l"/>
-  <symbol minX="696" maxX="754" minY="321" maxY="379" name="cricket-l"/>
-  <symbol minX="754" maxX="812" minY="321" maxY="379" name="marketplace-l"/>
-  <symbol minX="812" maxX="870" minY="321" maxY="379" name="curling-l"/>
-  <symbol minX="870" maxX="928" minY="321" maxY="379" name="theatre-l"/>
-  <symbol minX="928" maxX="986" minY="321" maxY="379" name="department_store-l"/>
-  <symbol minX="986" maxX="1044" minY="321" maxY="379" name="mail-l"/>
-  <symbol minX="1044" maxX="1102" minY="321" maxY="379" name="diving-l"/>
-  <symbol minX="1102" maxX="1160" minY="321" maxY="379" name="lightrail-berlin-l"/>
-  <symbol minX="1160" maxX="1218" minY="321" maxY="379" name="dog_park-l"/>
-  <symbol minX="1218" maxX="1276" minY="321" maxY="379" name="toilets-l"/>
-  <symbol minX="1276" maxX="1334" minY="321" maxY="379" name="doityourself-l"/>
-  <symbol minX="1334" maxX="1392" minY="321" maxY="379" name="lighthouse-l"/>
-  <symbol minX="1392" maxX="1450" minY="321" maxY="379" name="lift_gate-l"/>
-  <symbol minX="1450" maxX="1508" minY="321" maxY="379" name="wayside_cross-l"/>
-  <symbol minX="1508" maxX="1566" minY="321" maxY="379" name="library-l"/>
-  <symbol minX="1566" maxX="1624" minY="321" maxY="379" name="drinking-water-l"/>
-  <symbol minX="1624" maxX="1682" minY="321" maxY="379" name="laundry-l"/>
-  <symbol minX="1682" maxX="1740" minY="321" maxY="379" name="waterfall-l"/>
-  <symbol minX="1740" maxX="1798" minY="321" maxY="379" name="kiosk-l"/>
-  <symbol minX="1798" maxX="1856" minY="321" maxY="379" name="electronics-l"/>
-  <symbol minX="1856" maxX="1914" minY="321" maxY="379" name="toll_booth-l"/>
-  <symbol minX="1914" maxX="1972" minY="321" maxY="379" name="embassy-l"/>
-  <symbol minX="1972" maxX="2030" minY="321" maxY="379" name="kindergarten-m"/>
-  <symbol minX="0" maxX="58" minY="379" maxY="437" name="kindergarten-l"/>
-  <symbol minX="58" maxX="116" minY="379" maxY="437" name="volcano-l"/>
-  <symbol minX="116" maxX="174" minY="379" maxY="437" name="jewelry-l"/>
-  <symbol minX="174" maxX="232" minY="379" maxY="437" name="equestrian-l"/>
-  <symbol minX="232" maxX="290" minY="379" maxY="437" name="equestrian-m"/>
-  <symbol minX="290" maxX="348" minY="379" maxY="437" name="fastfood-l"/>
-  <symbol minX="348" maxX="406" minY="379" maxY="437" name="information-l"/>
-  <symbol minX="406" maxX="464" minY="379" maxY="437" name="vending-l"/>
-  <symbol minX="464" maxX="522" minY="379" maxY="437" name="fire_station-l"/>
-  <symbol minX="522" maxX="580" minY="379" maxY="437" name="hunting-tower-l"/>
-  <symbol minX="580" maxX="638" minY="379" maxY="437" name="tomb-l"/>
-  <symbol minX="638" maxX="696" minY="379" maxY="437" name="florist-l"/>
-  <symbol minX="696" maxX="754" minY="379" maxY="437" name="hotel-l"/>
-  <symbol minX="754" maxX="812" minY="379" maxY="437" name="fountain-l"/>
-  <symbol minX="812" maxX="870" minY="379" maxY="437" name="hospital-l"/>
-  <symbol minX="870" maxX="928" minY="379" maxY="437" name="tram-l"/>
-  <symbol minX="928" maxX="986" minY="379" maxY="437" name="fuel-l copy"/>
-  <symbol minX="986" maxX="1044" minY="379" maxY="437" name="fuel-l"/>
-  <symbol minX="1044" maxX="1102" minY="379" maxY="437" name="historic-ship-l"/>
-  <symbol minX="1102" maxX="1160" minY="379" maxY="437" name="tourism-l"/>
-  <symbol minX="1160" maxX="1218" minY="379" maxY="437" name="funicular-l"/>
-  <symbol minX="1218" maxX="1276" minY="379" maxY="437" name="heliport-l"/>
-  <symbol minX="1276" maxX="1334" minY="379" maxY="437" name="train-l"/>
-  <symbol minX="1334" maxX="1392" minY="379" maxY="437" name="furniture-l"/>
-  <symbol minX="1392" maxX="1450" minY="379" maxY="437" name="helipad-l"/>
-  <symbol minX="1450" maxX="1508" minY="379" maxY="437" name="gallery-l"/>
-  <symbol minX="1508" maxX="1566" minY="379" maxY="437" name="hardware-l"/>
-  <symbol minX="1566" maxX="1624" minY="379" maxY="437" name="hand-m"/>
-  <symbol minX="1624" maxX="1682" minY="379" maxY="437" name="garden-l"/>
-  <symbol minX="1682" maxX="1740" minY="379" maxY="437" name="hand-l"/>
-  <symbol minX="1740" maxX="1798" minY="379" maxY="437" name="toys-l"/>
-  <symbol minX="1798" maxX="1856" minY="379" maxY="437" name="garden_center-l"/>
-  <symbol minX="1856" maxX="1914" minY="379" maxY="437" name="hairdresser-l"/>
-  <symbol minX="1914" maxX="1972" minY="379" maxY="437" name="gate-l"/>
-  <symbol minX="1972" maxX="2030" minY="379" maxY="437" name="townhall-l"/>
-  <symbol minX="0" maxX="58" minY="437" maxY="495" name="gift-l"/>
-  <symbol minX="58" maxX="116" minY="437" maxY="495" name="grocery-l"/>
-  <symbol minX="116" maxX="174" minY="437" maxY="495" name="golf-l"/>
-  <symbol minX="174" maxX="232" minY="437" maxY="495" name="greengrocer-l"/>
-  <symbol minX="232" maxX="288" minY="437" maxY="493" name="townhall-m"/>
-  <symbol minX="288" maxX="344" minY="437" maxY="493" name="golf-m"/>
-  <symbol minX="344" maxX="400" minY="437" maxY="493" name="greengrocer-m"/>
-  <symbol minX="400" maxX="456" minY="437" maxY="493" name="gift-m"/>
-  <symbol minX="456" maxX="512" minY="437" maxY="493" name="grocery-m"/>
-  <symbol minX="512" maxX="568" minY="437" maxY="493" name="gate-m"/>
-  <symbol minX="568" maxX="624" minY="437" maxY="493" name="garden_center-m"/>
-  <symbol minX="624" maxX="680" minY="437" maxY="493" name="hairdresser-m"/>
-  <symbol minX="680" maxX="736" minY="437" maxY="493" name="garden-m"/>
-  <symbol minX="736" maxX="792" minY="437" maxY="493" name="toys-m"/>
-  <symbol minX="792" maxX="848" minY="437" maxY="493" name="gallery-m"/>
-  <symbol minX="848" maxX="904" minY="437" maxY="493" name="hardware-m"/>
-  <symbol minX="904" maxX="960" minY="437" maxY="493" name="furniture-m"/>
-  <symbol minX="960" maxX="1016" minY="437" maxY="493" name="helipad-m"/>
-  <symbol minX="1016" maxX="1072" minY="437" maxY="493" name="tourism-m"/>
-  <symbol minX="1072" maxX="1128" minY="437" maxY="493" name="funicular-m"/>
-  <symbol minX="1128" maxX="1184" minY="437" maxY="493" name="heliport-m"/>
-  <symbol minX="1184" maxX="1240" minY="437" maxY="493" name="train-m"/>
-  <symbol minX="1240" maxX="1296" minY="437" maxY="493" name="fuel-m"/>
-  <symbol minX="1296" maxX="1352" minY="437" maxY="493" name="historic-ship-m"/>
-  <symbol minX="1352" maxX="1408" minY="437" maxY="493" name="fountain-m"/>
-  <symbol minX="1408" maxX="1464" minY="437" maxY="493" name="hospital-m"/>
-  <symbol minX="1464" maxX="1520" minY="437" maxY="493" name="tomb-m"/>
-  <symbol minX="1520" maxX="1576" minY="437" maxY="493" name="florist-m"/>
-  <symbol minX="1576" maxX="1632" minY="437" maxY="493" name="hotel-m"/>
-  <symbol minX="1632" maxX="1688" minY="437" maxY="493" name="tram-m"/>
-  <symbol minX="1688" maxX="1744" minY="437" maxY="493" name="fire_station-m"/>
-  <symbol minX="1744" maxX="1800" minY="437" maxY="493" name="hunting-tower-m"/>
-  <symbol minX="1800" maxX="1856" minY="437" maxY="493" name="fastfood-m"/>
-  <symbol minX="1856" maxX="1912" minY="437" maxY="493" name="information-m"/>
-  <symbol minX="1912" maxX="1968" minY="437" maxY="493" name="toll_booth-m"/>
-  <symbol minX="1968" maxX="2024" minY="437" maxY="493" name="vending-m"/>
-  <symbol minX="0" maxX="56" minY="495" maxY="551" name="jewelry-m"/>
-  <symbol minX="56" maxX="112" minY="495" maxY="551" name="volcano-m"/>
-  <symbol minX="112" maxX="168" minY="495" maxY="551" name="embassy-m"/>
-  <symbol minX="168" maxX="224" minY="495" maxY="551" name="electronics-m"/>
-  <symbol minX="224" maxX="280" minY="495" maxY="551" name="drugs"/>
-  <symbol minX="280" maxX="336" minY="495" maxY="551" name="kiosk-m"/>
-  <symbol minX="336" maxX="392" minY="495" maxY="551" name="drinking-water-m"/>
-  <symbol minX="392" maxX="448" minY="495" maxY="551" name="laundry-m"/>
-  <symbol minX="448" maxX="504" minY="495" maxY="551" name="waterfall-m"/>
-  <symbol minX="504" maxX="560" minY="495" maxY="551" name="library-m"/>
-  <symbol minX="560" maxX="616" minY="495" maxY="551" name="toilets-m"/>
-  <symbol minX="616" maxX="672" minY="495" maxY="551" name="wayside_cross-m"/>
-  <symbol minX="672" maxX="728" minY="495" maxY="551" name="lift_gate-m"/>
-  <symbol minX="728" maxX="784" minY="495" maxY="551" name="doityourself-m"/>
-  <symbol minX="784" maxX="840" minY="495" maxY="551" name="lighthouse-m"/>
-  <symbol minX="840" maxX="896" minY="495" maxY="551" name="dog_park-m"/>
-  <symbol minX="896" maxX="952" minY="495" maxY="551" name="diving-m"/>
-  <symbol minX="952" maxX="1008" minY="495" maxY="551" name="australian-football-m"/>
-  <symbol minX="1008" maxX="1064" minY="495" maxY="551" name="theatre-m"/>
-  <symbol minX="1064" maxX="1120" minY="495" maxY="551" name="department_store-m"/>
-  <symbol minX="1120" maxX="1176" minY="495" maxY="551" name="mail-m"/>
-  <symbol minX="1176" maxX="1232" minY="495" maxY="551" name="curling-m"/>
-  <symbol minX="1232" maxX="1288" minY="495" maxY="551" name="cricket-m"/>
-  <symbol minX="1288" maxX="1344" minY="495" maxY="551" name="marketplace-m"/>
-  <symbol minX="1344" maxX="1400" minY="495" maxY="551" name="tennis-m"/>
-  <symbol minX="1400" maxX="1456" minY="495" maxY="551" name="convenience-m"/>
-  <symbol minX="1456" maxX="1512" minY="495" maxY="551" name="computer-m"/>
-  <symbol minX="1512" maxX="1568" minY="495" maxY="551" name="military-m"/>
-  <symbol minX="1568" maxX="1624" minY="495" maxY="551" name="taxi-m"/>
-  <symbol minX="1624" maxX="1680" minY="495" maxY="551" name="college-m"/>
-  <symbol minX="1680" maxX="1736" minY="495" maxY="551" name="mobile_phone-m"/>
-  <symbol minX="1736" maxX="1792" minY="495" maxY="551" name="clothes-m"/>
-  <symbol minX="1792" maxX="1848" minY="495" maxY="551" name="monument-m"/>
-  <symbol minX="1848" maxX="1904" minY="495" maxY="551" name="swimming-m"/>
-  <symbol minX="1904" maxX="1960" minY="495" maxY="551" name="wayside_shrine-m"/>
-  <symbol minX="1960" maxX="2016" minY="495" maxY="551" name="motel-m"/>
-  <symbol minX="0" maxX="56" minY="551" maxY="607" name="cinema-m"/>
-  <symbol minX="56" maxX="112" minY="551" maxY="607" name="museum-m"/>
-  <symbol minX="112" maxX="168" minY="551" maxY="607" name="chemist-m"/>
-  <symbol minX="168" maxX="224" minY="551" maxY="607" name="sweets-m"/>
-  <symbol minX="224" maxX="280" minY="551" maxY="607" name="cemetery-m"/>
-  <symbol minX="280" maxX="336" minY="551" maxY="607" name="subway-spb-m"/>
-  <symbol minX="336" maxX="392" minY="551" maxY="607" name="windmill-m"/>
-  <symbol minX="392" maxX="448" minY="551" maxY="607" name="ship-m"/>
-  <symbol minX="448" maxX="504" minY="551" maxY="607" name="cave-m"/>
-  <symbol minX="504" maxX="560" minY="551" maxY="607" name="casino-m"/>
-  <symbol minX="560" maxX="616" minY="551" maxY="607" name="npark-m"/>
-  <symbol minX="616" maxX="672" minY="551" maxY="607" name="subway-newyork-m"/>
-  <symbol minX="672" maxX="728" minY="551" maxY="607" name="caravan_site-m"/>
-  <symbol minX="728" maxX="784" minY="551" maxY="607" name="nparkf-m"/>
-  <symbol minX="784" maxX="840" minY="551" maxY="607" name="car_sharing-m"/>
-  <symbol minX="840" maxX="896" minY="551" maxY="607" name="zoo-m"/>
-  <symbol minX="896" maxX="952" minY="551" maxY="607" name="office-m"/>
-  <symbol minX="952" maxX="1008" minY="551" maxY="607" name="bakery-m"/>
-  <symbol minX="1008" maxX="1064" minY="551" maxY="607" name="car-repair-m"/>
-  <symbol minX="1064" maxX="1120" minY="551" maxY="607" name="optician-m"/>
-  <symbol minX="1120" maxX="1176" minY="551" maxY="607" name="atm-m"/>
-  <symbol minX="1176" maxX="1232" minY="551" maxY="607" name="park-m"/>
-  <symbol minX="1232" maxX="1288" minY="551" maxY="607" name="subway-m"/>
-  <symbol minX="1288" maxX="1344" minY="551" maxY="607" name="shoes-m"/>
-  <symbol minX="1344" maxX="1400" minY="551" maxY="607" name="campsite-m"/>
-  <symbol minX="1400" maxX="1456" minY="551" maxY="607" name="cafe-m"/>
-  <symbol minX="1456" maxX="1512" minY="551" maxY="607" name="parking-meter-m"/>
-  <symbol minX="1512" maxX="1568" minY="551" maxY="607" name="subway-entrance-m"/>
-  <symbol minX="1568" maxX="1624" minY="551" maxY="607" name="archery-m"/>
-  <symbol minX="1624" maxX="1680" minY="551" maxY="607" name="peak-m"/>
-  <symbol minX="1680" maxX="1736" minY="551" maxY="607" name="cable-car-m"/>
-  <symbol minX="1736" maxX="1792" minY="551" maxY="607" name="subway-entrance-2-m"/>
-  <symbol minX="1792" maxX="1848" minY="551" maxY="607" name="school-m"/>
-  <symbol minX="1848" maxX="1904" minY="551" maxY="607" name="sports-m"/>
-  <symbol minX="1904" maxX="1960" minY="551" maxY="607" name="butcher-m"/>
-  <symbol minX="1960" maxX="2016" minY="551" maxY="607" name="pharmacy-m"/>
-  <symbol minX="0" maxX="56" minY="607" maxY="663" name="bus-m"/>
-  <symbol minX="56" maxX="112" minY="607" maxY="663" name="bowls-m"/>
-  <symbol minX="112" maxX="168" minY="607" maxY="663" name="phone-m"/>
-  <symbol minX="168" maxX="224" minY="607" maxY="663" name="bank-2-m"/>
-  <symbol minX="224" maxX="280" minY="607" maxY="663" name="boundary_stone-m"/>
-  <symbol minX="280" maxX="336" minY="607" maxY="663" name="picnic-m"/>
-  <symbol minX="336" maxX="392" minY="607" maxY="663" name="soccer-m"/>
-  <symbol minX="392" maxX="448" minY="607" maxY="663" name="america-football-m"/>
-  <symbol minX="448" maxX="504" minY="607" maxY="663" name="pitch-m"/>
-  <symbol minX="504" maxX="560" minY="607" maxY="663" name="book-shop-m"/>
-  <symbol minX="560" maxX="616" minY="607" maxY="663" name="bicycle-m"/>
-  <symbol minX="616" maxX="672" minY="607" maxY="663" name="place-of-worship-m"/>
-  <symbol minX="672" maxX="728" minY="607" maxY="663" name="skiing-m"/>
-  <symbol minX="728" maxX="784" minY="607" maxY="663" name="alpine_hut-m"/>
-  <symbol minX="784" maxX="840" minY="607" maxY="663" name="police-m"/>
-  <symbol minX="840" maxX="896" minY="607" maxY="663" name="beer-m"/>
-  <symbol minX="896" maxX="952" minY="607" maxY="663" name="beauty-m"/>
-  <symbol minX="952" maxX="1008" minY="607" maxY="663" name="postbox-m"/>
-  <symbol minX="1008" maxX="1064" minY="607" maxY="663" name="beach-m"/>
-  <symbol minX="1064" maxX="1120" minY="607" maxY="663" name="banknote-m"/>
-  <symbol minX="1120" maxX="1176" minY="607" maxY="663" name="bcontrol-m"/>
-  <symbol minX="1176" maxX="1232" minY="607" maxY="663" name="pub-m"/>
-  <symbol minX="1232" maxX="1288" minY="607" maxY="663" name="shop-m"/>
-  <symbol minX="1288" maxX="1344" minY="607" maxY="663" name="shop-m copy"/>
-  <symbol minX="1344" maxX="1400" minY="607" maxY="663" name="bbq-m"/>
-  <symbol minX="1400" maxX="1456" minY="607" maxY="663" name="recycling-m"/>
-  <symbol minX="1456" maxX="1512" minY="607" maxY="663" name="alcohol-m"/>
-  <symbol minX="1512" maxX="1568" minY="607" maxY="663" name="basketball-m"/>
-  <symbol minX="1568" maxX="1624" minY="607" maxY="663" name="remains-m"/>
-  <symbol minX="1624" maxX="1680" minY="607" maxY="663" name="baseball-m"/>
-  <symbol minX="1680" maxX="1736" minY="607" maxY="663" name="bar-m"/>
-  <symbol minX="1736" maxX="1792" minY="607" maxY="663" name="restaurant-m"/>
-  <symbol minX="1792" maxX="1848" minY="607" maxY="663" name="shop-bicycle-m"/>
-  <symbol minX="1848" maxX="1899" minY="607" maxY="658" name="parking-l"/>
-  <symbol minX="1899" maxX="1950" minY="607" maxY="658" name="speedcam-l"/>
-  <symbol minX="1950" maxX="2001" minY="607" maxY="658" name="subway-berlin-l"/>
-  <symbol minX="0" maxX="51" minY="663" maxY="714" name="lightrail-berlin-m"/>
-  <symbol minX="51" maxX="109" minY="663" maxY="714" name="subway-moscow-l"/>
-  <symbol minX="109" maxX="160" minY="663" maxY="714" name="subway-rome-l"/>
-  <symbol minX="160" maxX="209" minY="663" maxY="712" name="route_from"/>
-  <symbol minX="209" maxX="256" minY="663" maxY="710" name="no-icon-leisure"/>
-  <symbol minX="256" maxX="303" minY="663" maxY="710" name="subway-rome-m"/>
-  <symbol minX="303" maxX="357" minY="663" maxY="710" name="subway-moscow-m"/>
-  <symbol minX="357" maxX="404" minY="663" maxY="710" name="no-icon-amenity"/>
-  <symbol minX="404" maxX="451" minY="663" maxY="710" name="no-icon-shop"/>
-  <symbol minX="451" maxX="498" minY="663" maxY="710" name="no-icon-tourism"/>
-  <symbol minX="498" maxX="545" minY="663" maxY="710" name="subway-berlin-m"/>
-  <symbol minX="545" maxX="592" minY="663" maxY="710" name="no-icon"/>
-  <symbol minX="592" maxX="639" minY="663" maxY="710" name="subway-paris-m"/>
-  <symbol minX="639" maxX="685" minY="663" maxY="709" name="current-position"/>
-  <symbol minX="685" maxX="743" minY="663" maxY="708" name="subway-london-l"/>
-  <symbol minX="743" maxX="788" minY="663" maxY="708" name="airport-s"/>
-  <symbol minX="788" maxX="830" minY="663" maxY="705" name="skiing-s"/>
-  <symbol minX="830" maxX="872" minY="663" maxY="705" name="pitch-s"/>
-  <symbol minX="872" maxX="914" minY="663" maxY="705" name="picnic-s"/>
-  <symbol minX="914" maxX="956" minY="663" maxY="705" name="soccer-s"/>
-  <symbol minX="956" maxX="998" minY="663" maxY="705" name="phone-s"/>
-  <symbol minX="998" maxX="1040" minY="663" maxY="705" name="speedcam-m"/>
-  <symbol minX="1040" maxX="1082" minY="663" maxY="705" name="atm-s"/>
-  <symbol minX="1082" maxX="1124" minY="663" maxY="705" name="pharmacy-s"/>
-  <symbol minX="1124" maxX="1166" minY="663" maxY="705" name="bar-s"/>
-  <symbol minX="1166" maxX="1208" minY="663" maxY="705" name="school-s"/>
-  <symbol minX="1208" maxX="1250" minY="663" maxY="705" name="baseball-s"/>
-  <symbol minX="1250" maxX="1292" minY="663" maxY="705" name="basketball-s"/>
-  <symbol minX="1292" maxX="1334" minY="663" maxY="705" name="bcontrol-s"/>
-  <symbol minX="1334" maxX="1392" minY="663" maxY="705" name="subway-barcelona-m"/>
-  <symbol minX="1392" maxX="1443" minY="663" maxY="705" name="subway-barcelona-s"/>
-  <symbol minX="1443" maxX="1485" minY="663" maxY="705" name="alcohol-s"/>
-  <symbol minX="1485" maxX="1527" minY="663" maxY="705" name="place-of-worship-s"/>
-  <symbol minX="1527" maxX="1569" minY="663" maxY="705" name="beer-s"/>
-  <symbol minX="1569" maxX="1611" minY="663" maxY="705" name="bicycle-s"/>
-  <symbol minX="1611" maxX="1653" minY="663" maxY="705" name="subway-entrance-2-s"/>
-  <symbol minX="1653" maxX="1695" minY="663" maxY="705" name="subway-entrance-arrow"/>
-  <symbol minX="1695" maxX="1737" minY="663" maxY="705" name="peak-s"/>
-  <symbol minX="1737" maxX="1779" minY="663" maxY="705" name="book-shop-s"/>
-  <symbol minX="1779" maxX="1821" minY="663" maxY="705" name="subway-entrance-s"/>
-  <symbol minX="1821" maxX="1863" minY="663" maxY="705" name="america-football-s"/>
-  <symbol minX="1863" maxX="1905" minY="663" maxY="705" name="bus-s"/>
-  <symbol minX="1905" maxX="1947" minY="663" maxY="705" name="cable-car-s"/>
-  <symbol minX="1947" maxX="1989" minY="663" maxY="705" name="cafe-s"/>
-  <symbol minX="1989" maxX="2031" minY="663" maxY="705" name="police-s"/>
-  <symbol minX="0" maxX="56" minY="714" maxY="756" name="subway-london-m"/>
-  <symbol minX="56" maxX="98" minY="714" maxY="756" name="campsite-s"/>
-  <symbol minX="98" maxX="140" minY="714" maxY="756" name="park-s"/>
-  <symbol minX="140" maxX="182" minY="714" maxY="756" name="zoo-s"/>
-  <symbol minX="182" maxX="240" minY="714" maxY="756" name="subway-madrid-m"/>
-  <symbol minX="240" maxX="282" minY="714" maxY="756" name="car-repair-s"/>
-  <symbol minX="282" maxX="324" minY="714" maxY="756" name="casino-s"/>
-  <symbol minX="324" maxX="366" minY="714" maxY="756" name="windmill-s"/>
-  <symbol minX="366" maxX="408" minY="714" maxY="756" name="cave-s"/>
-  <symbol minX="408" maxX="450" minY="714" maxY="756" name="office-s"/>
-  <symbol minX="450" maxX="492" minY="714" maxY="756" name="shop-s"/>
-  <symbol minX="492" maxX="534" minY="714" maxY="756" name="cemetery-s"/>
-  <symbol minX="534" maxX="576" minY="714" maxY="756" name="nparkf-s"/>
-  <symbol minX="576" maxX="618" minY="714" maxY="756" name="npark-s"/>
-  <symbol minX="618" maxX="660" minY="714" maxY="756" name="subway-newyork-s"/>
-  <symbol minX="660" maxX="702" minY="714" maxY="756" name="cinema-s"/>
-  <symbol minX="702" maxX="744" minY="714" maxY="756" name="college-s"/>
-  <symbol minX="744" maxX="786" minY="714" maxY="756" name="shop-s copy"/>
-  <symbol minX="786" maxX="828" minY="714" maxY="756" name="waterfall-s"/>
-  <symbol minX="828" maxX="870" minY="714" maxY="756" name="pub-s"/>
-  <symbol minX="870" maxX="912" minY="714" maxY="756" name="drinking-water-s"/>
-  <symbol minX="912" maxX="954" minY="714" maxY="756" name="volcano-s"/>
-  <symbol minX="954" maxX="996" minY="714" maxY="756" name="subway-s"/>
-  <symbol minX="996" maxX="1038" minY="714" maxY="756" name="recycling-s"/>
-  <symbol minX="1038" maxX="1080" minY="714" maxY="756" name="remains-s"/>
-  <symbol minX="1080" maxX="1122" minY="714" maxY="756" name="subway-spb-s"/>
-  <symbol minX="1122" maxX="1164" minY="714" maxY="756" name="embassy-s"/>
-  <symbol minX="1164" maxX="1206" minY="714" maxY="756" name="fastfood-s"/>
-  <symbol minX="1206" maxX="1248" minY="714" maxY="756" name="tram-s"/>
-  <symbol minX="1248" maxX="1290" minY="714" maxY="756" name="fire_station-s"/>
-  <symbol minX="1290" maxX="1332" minY="714" maxY="756" name="fountain-s"/>
-  <symbol minX="1332" maxX="1374" minY="714" maxY="756" name="ship-s"/>
-  <symbol minX="1374" maxX="1416" minY="714" maxY="756" name="restaurant-s"/>
-  <symbol minX="1416" maxX="1458" minY="714" maxY="756" name="museum-s"/>
-  <symbol minX="1458" maxX="1500" minY="714" maxY="756" name="monument-s"/>
-  <symbol minX="1500" maxX="1542" minY="714" maxY="756" name="swimming-s"/>
-  <symbol minX="1542" maxX="1584" minY="714" maxY="756" name="atm-s copy 2"/>
-  <symbol minX="1584" maxX="1626" minY="714" maxY="756" name="military-s"/>
-  <symbol minX="1626" maxX="1668" minY="714" maxY="756" name="train-s"/>
-  <symbol minX="1668" maxX="1726" minY="714" maxY="756" name="metro-barcelona-m"/>
-  <symbol minX="1726" maxX="1768" minY="714" maxY="756" name="tennis-s"/>
-  <symbol minX="1768" maxX="1810" minY="714" maxY="756" name="mail-s"/>
-  <symbol minX="1810" maxX="1852" minY="714" maxY="756" name="fuel-s"/>
-  <symbol minX="1852" maxX="1894" minY="714" maxY="756" name="theatre-s"/>
-  <symbol minX="1894" maxX="1936" minY="714" maxY="756" name="lighthouse-s"/>
-  <symbol minX="1936" maxX="1978" minY="714" maxY="756" name="library-s"/>
-  <symbol minX="1978" maxX="2020" minY="714" maxY="756" name="toilets-s"/>
-  <symbol minX="0" maxX="42" minY="756" maxY="798" name="kindergarten-s"/>
-  <symbol minX="42" maxX="84" minY="756" maxY="798" name="information-s"/>
-  <symbol minX="84" maxX="126" minY="756" maxY="798" name="hotel-s"/>
-  <symbol minX="126" maxX="168" minY="756" maxY="798" name="hospital-s"/>
-  <symbol minX="168" maxX="210" minY="756" maxY="798" name="heliport-s"/>
-  <symbol minX="210" maxX="252" minY="756" maxY="798" name="helipad-s"/>
-  <symbol minX="252" maxX="294" minY="756" maxY="798" name="tourism-s"/>
-  <symbol minX="294" maxX="336" minY="756" maxY="798" name="grocery-s"/>
-  <symbol minX="336" maxX="378" minY="756" maxY="798" name="golf-s"/>
-  <symbol minX="378" maxX="420" minY="756" maxY="798" name="townhall-s"/>
-  <symbol minX="420" maxX="462" minY="756" maxY="798" name="garden-s"/>
-  <symbol minX="462" maxX="504" minY="756" maxY="798" name="gallery-s"/>
-  <symbol minX="504" maxX="546" minY="756" maxY="798" name="funicular-s"/>
-  <symbol minX="546" maxX="604" minY="756" maxY="797" name="subway-madrid-l"/>
-  <symbol minX="604" maxX="662" minY="756" maxY="797" name="subway-barcelona-l"/>
-  <symbol minX="662" maxX="700" minY="756" maxY="796" name="s-arrow"/>
-  <symbol minX="700" maxX="740" minY="756" maxY="796" name="parking-m"/>
-  <symbol minX="740" maxX="796" minY="756" maxY="794" name="subway-kiev-l"/>
-  <symbol minX="796" maxX="852" minY="756" maxY="794" name="subway-kiev-m"/>
-  <symbol minX="852" maxX="890" minY="756" maxY="794" name="lightrail-berlin-s"/>
-  <symbol minX="890" maxX="928" minY="756" maxY="794" name="subway-paris-s"/>
-  <symbol minX="928" maxX="979" minY="756" maxY="794" name="subway-madrid-s"/>
-  <symbol minX="979" maxX="1030" minY="756" maxY="794" name="metro-barcelona-s"/>
-  <symbol minX="1030" maxX="1066" minY="756" maxY="792" name="api-result"/>
-  <symbol minX="1066" maxX="1102" minY="756" maxY="792" name="subway-moscow-s"/>
-  <symbol minX="1102" maxX="1136" minY="756" maxY="790" name="search-result"/>
-  <symbol minX="1136" maxX="1169" minY="756" maxY="789" name="speedcam-s"/>
-  <symbol minX="1169" maxX="1207" minY="756" maxY="789" name="bench"/>
-  <symbol minX="1207" maxX="1240" minY="756" maxY="789" name="subway-rome-s"/>
-  <symbol minX="1240" maxX="1273" minY="756" maxY="789" name="parking-s"/>
-  <symbol minX="1273" maxX="1306" minY="756" maxY="789" name="subway-berlin-s"/>
-  <symbol minX="1306" maxX="1339" minY="756" maxY="789" name="star-l"/>
-  <symbol minX="1339" maxX="1381" minY="756" maxY="789" name="subway-london-s"/>
-  <symbol minX="1381" maxX="1437" minY="756" maxY="787" name="subway-minsk-l"/>
-  <symbol minX="1437" maxX="1468" minY="756" maxY="787" name="star-m"/>
-  <symbol minX="1468" maxX="1501" minY="756" maxY="787" name="peakt-l"/>
-  <symbol minX="1501" maxX="1532" minY="756" maxY="787" name="survey_point-l"/>
-  <symbol minX="1532" maxX="1579" minY="756" maxY="785" name="subway-kiev-s"/>
-  <symbol minX="1579" maxX="1606" minY="756" maxY="783" name="survey_point-m"/>
-  <symbol minX="1606" maxX="1653" minY="756" maxY="783" name="subway-minsk-m"/>
-  <symbol minX="1653" maxX="1680" minY="756" maxY="783" name="subway-xs"/>
-  <symbol minX="1680" maxX="1707" minY="756" maxY="783" name="subway-newyork-xs"/>
-  <symbol minX="1707" maxX="1734" minY="756" maxY="783" name="star-s"/>
-  <symbol minX="1734" maxX="1776" minY="756" maxY="783" name="railway-crossing"/>
-  <symbol minX="1776" maxX="1818" minY="756" maxY="780" name="subway-minsk-s"/>
-  <symbol minX="1818" maxX="1842" minY="756" maxY="780" name="subway-xs copy"/>
-  <symbol minX="1842" maxX="1864" minY="756" maxY="778" name="survey_point-s"/>
-  <symbol minX="1864" maxX="1888" minY="756" maxY="778" name="peakt-m"/>
-  <symbol minX="1888" maxX="1939" minY="756" maxY="778" name="arrow-m"/>
-  <symbol minX="1939" maxX="1959" minY="756" maxY="776" name="entrance-s"/>
-  <symbol minX="1959" maxX="1977" minY="756" maxY="774" name="dot-m"/>
-  <symbol minX="1977" maxX="1997" minY="756" maxY="774" name="peakt-s"/>
-  <symbol minX="1997" maxX="2012" minY="756" maxY="771" name="tree-l"/>
-  <symbol minX="0" maxX="38" minY="798" maxY="813" name="arrow-s"/>
-  <symbol minX="38" maxX="53" minY="798" maxY="813" name="none"/>
-  <symbol minX="53" maxX="66" minY="798" maxY="811" name="dot-s"/>
-  <symbol minX="66" maxX="79" minY="798" maxY="811" name="entrance-xs"/>
-  <symbol minX="79" maxX="92" minY="798" maxY="811" name="tree-m"/>
-  <symbol minX="92" maxX="105" minY="798" maxY="811" name="dot-s-light"/>
-  <symbol minX="105" maxX="116" minY="798" maxY="809" name="tree-s"/>
-  <symbol minX="116" maxX="127" minY="798" maxY="809" name="zero-icon"/>
+ <file height="1024" width="2048">
+  <symbol minY="0" maxY="205" name="route_to" minX="0" maxX="205"/>
+  <symbol minY="0" maxY="196" name="route-arrow" minX="205" maxX="609"/>
+  <symbol minY="0" maxY="172" name="compass-image" minX="609" maxX="781"/>
+  <symbol minY="0" maxY="154" name="watch-search-result" minX="781" maxX="893"/>
+  <symbol minY="0" maxY="136" name="watch-my-direction" minX="893" maxX="1017"/>
+  <symbol minY="0" maxY="109" name="current-position-compas" minX="1017" maxX="1102"/>
+  <symbol minY="0" maxY="109" name="current-routing-compas" minX="1102" maxX="1187"/>
+  <symbol minY="0" maxY="100" name="watch-my-position" minX="1187" maxX="1287"/>
+  <symbol minY="0" maxY="97" name="search-result-active" minX="1287" maxX="1384"/>
+  <symbol minY="0" maxY="85" name="placemark-pink" minX="1384" maxX="1427"/>
+  <symbol minY="0" maxY="85" name="placemark-orange" minX="1427" maxX="1470"/>
+  <symbol minY="0" maxY="85" name="placemark-green" minX="1470" maxX="1513"/>
+  <symbol minY="0" maxY="85" name="placemark-brown" minX="1513" maxX="1556"/>
+  <symbol minY="0" maxY="85" name="placemark-blue" minX="1556" maxX="1599"/>
+  <symbol minY="0" maxY="85" name="placemark-red" minX="1599" maxX="1642"/>
+  <symbol minY="0" maxY="85" name="placemark-yellow" minX="1642" maxX="1685"/>
+  <symbol minY="0" maxY="85" name="placemark-purple" minX="1685" maxX="1728"/>
+  <symbol minY="0" maxY="58" name="airport-l" minX="1728" maxX="1786"/>
+  <symbol minY="0" maxY="58" name="monument-l" minX="1786" maxX="1844"/>
+  <symbol minY="0" maxY="58" name="australian-football-l" minX="1844" maxX="1902"/>
+  <symbol minY="0" maxY="58" name="ship-l" minX="1902" maxX="1960"/>
+  <symbol minY="0" maxY="58" name="bakery-l" minX="1960" maxX="2018"/>
+  <symbol minY="205" maxY="263" name="shoes-l" minX="0" maxX="58"/>
+  <symbol minY="205" maxY="263" name="school-l" minX="58" maxX="116"/>
+  <symbol minY="205" maxY="263" name="bank-l" minX="116" maxX="173"/>
+  <symbol minY="205" maxY="263" name="bank-m" minX="173" maxX="229"/>
+  <symbol minY="205" maxY="263" name="banknote-l" minX="229" maxX="286"/>
+  <symbol minY="205" maxY="263" name="shop-bicycle-l" minX="286" maxX="344"/>
+  <symbol minY="205" maxY="263" name="bar-l" minX="344" maxX="402"/>
+  <symbol minY="205" maxY="263" name="restaurant-l" minX="402" maxX="460"/>
+  <symbol minY="205" maxY="263" name="airport-m" minX="460" maxX="518"/>
+  <symbol minY="205" maxY="263" name="baseball-l" minX="518" maxX="576"/>
+  <symbol minY="205" maxY="263" name="remains-l" minX="576" maxX="634"/>
+  <symbol minY="205" maxY="263" name="alcohol-l" minX="634" maxX="692"/>
+  <symbol minY="205" maxY="263" name="basketball-l" minX="692" maxX="750"/>
+  <symbol minY="205" maxY="263" name="shop-l copy" minX="750" maxX="808"/>
+  <symbol minY="205" maxY="263" name="recycling-l" minX="808" maxX="866"/>
+  <symbol minY="205" maxY="263" name="bbq-l" minX="866" maxX="924"/>
+  <symbol minY="205" maxY="263" name="shop-l" minX="924" maxX="982"/>
+  <symbol minY="205" maxY="263" name="bcontrol-l" minX="982" maxX="1040"/>
+  <symbol minY="205" maxY="263" name="pub-l" minX="1040" maxX="1098"/>
+  <symbol minY="205" maxY="263" name="alpine_hut-l" minX="1098" maxX="1156"/>
+  <symbol minY="205" maxY="263" name="beach-l" minX="1156" maxX="1214"/>
+  <symbol minY="205" maxY="263" name="power-m" minX="1214" maxX="1272"/>
+  <symbol minY="205" maxY="263" name="beauty-l" minX="1272" maxX="1330"/>
+  <symbol minY="205" maxY="263" name="power-l" minX="1330" maxX="1388"/>
+  <symbol minY="205" maxY="263" name="beer-l" minX="1388" maxX="1446"/>
+  <symbol minY="205" maxY="263" name="postbox-l" minX="1446" maxX="1504"/>
+  <symbol minY="205" maxY="263" name="police-l" minX="1504" maxX="1562"/>
+  <symbol minY="205" maxY="263" name="america-football-l" minX="1562" maxX="1620"/>
+  <symbol minY="205" maxY="263" name="bicycle-l" minX="1620" maxX="1678"/>
+  <symbol minY="205" maxY="263" name="skiing-l" minX="1678" maxX="1736"/>
+  <symbol minY="205" maxY="263" name="place-of-worship-l" minX="1736" maxX="1794"/>
+  <symbol minY="205" maxY="263" name="book-shop-l" minX="1794" maxX="1852"/>
+  <symbol minY="205" maxY="263" name="pitch-l" minX="1852" maxX="1910"/>
+  <symbol minY="205" maxY="263" name="archery-l" minX="1910" maxX="1968"/>
+  <symbol minY="205" maxY="263" name="boundary_stone-l" minX="1968" maxX="2026"/>
+  <symbol minY="263" maxY="321" name="soccer-l" minX="0" maxX="58"/>
+  <symbol minY="263" maxY="321" name="bowls-l" minX="58" maxX="116"/>
+  <symbol minY="263" maxY="321" name="picnic-l" minX="116" maxX="174"/>
+  <symbol minY="263" maxY="321" name="bus-l" minX="174" maxX="232"/>
+  <symbol minY="263" maxY="321" name="phone-l" minX="232" maxX="290"/>
+  <symbol minY="263" maxY="321" name="pharmacy-l" minX="290" maxX="348"/>
+  <symbol minY="263" maxY="321" name="butcher-l" minX="348" maxX="406"/>
+  <symbol minY="263" maxY="321" name="sports-l" minX="406" maxX="464"/>
+  <symbol minY="263" maxY="321" name="cable-car-l" minX="464" maxX="522"/>
+  <symbol minY="263" maxY="321" name="peak-l" minX="522" maxX="580"/>
+  <symbol minY="263" maxY="321" name="atm-l" minX="580" maxX="638"/>
+  <symbol minY="263" maxY="321" name="cafe-l" minX="638" maxX="696"/>
+  <symbol minY="263" maxY="321" name="subway-entrance-l" minX="696" maxX="754"/>
+  <symbol minY="263" maxY="321" name="parking-meter-l" minX="754" maxX="812"/>
+  <symbol minY="263" maxY="321" name="campsite-l" minX="812" maxX="870"/>
+  <symbol minY="263" maxY="321" name="subway-l" minX="870" maxX="928"/>
+  <symbol minY="263" maxY="321" name="park-l" minX="928" maxX="986"/>
+  <symbol minY="263" maxY="321" name="car-repair-l" minX="986" maxX="1044"/>
+  <symbol minY="263" maxY="321" name="optician-l" minX="1044" maxX="1102"/>
+  <symbol minY="263" maxY="321" name="zoo-l" minX="1102" maxX="1160"/>
+  <symbol minY="263" maxY="321" name="car_sharing-l" minX="1160" maxX="1218"/>
+  <symbol minY="263" maxY="321" name="office-l" minX="1218" maxX="1276"/>
+  <symbol minY="263" maxY="321" name="caravan_site-l" minX="1276" maxX="1334"/>
+  <symbol minY="263" maxY="321" name="nparkf-l" minX="1334" maxX="1392"/>
+  <symbol minY="263" maxY="321" name="casino-l" minX="1392" maxX="1450"/>
+  <symbol minY="263" maxY="321" name="subway-newyork-l" minX="1450" maxX="1508"/>
+  <symbol minY="263" maxY="321" name="npark-l" minX="1508" maxX="1566"/>
+  <symbol minY="263" maxY="321" name="cave-l" minX="1566" maxX="1624"/>
+  <symbol minY="263" maxY="321" name="subway-paris-l" minX="1624" maxX="1682"/>
+  <symbol minY="263" maxY="321" name="windmill-l" minX="1682" maxX="1740"/>
+  <symbol minY="263" maxY="321" name="cemetery-l" minX="1740" maxX="1798"/>
+  <symbol minY="263" maxY="321" name="subway-spb-l" minX="1798" maxX="1856"/>
+  <symbol minY="263" maxY="321" name="sweets-l" minX="1856" maxX="1914"/>
+  <symbol minY="263" maxY="321" name="chemist-l" minX="1914" maxX="1972"/>
+  <symbol minY="263" maxY="321" name="museum-l" minX="1972" maxX="2030"/>
+  <symbol minY="321" maxY="379" name="cinema-l" minX="0" maxX="58"/>
+  <symbol minY="321" maxY="379" name="motel-l" minX="58" maxX="116"/>
+  <symbol minY="321" maxY="379" name="wayside_shrine-l" minX="116" maxX="174"/>
+  <symbol minY="321" maxY="379" name="clothes-l" minX="174" maxX="232"/>
+  <symbol minY="321" maxY="379" name="swimming-l" minX="232" maxX="290"/>
+  <symbol minY="321" maxY="379" name="college-l" minX="290" maxX="348"/>
+  <symbol minY="321" maxY="379" name="mobile_phone-l" minX="348" maxX="406"/>
+  <symbol minY="321" maxY="379" name="taxi-l" minX="406" maxX="464"/>
+  <symbol minY="321" maxY="379" name="computer-l" minX="464" maxX="522"/>
+  <symbol minY="321" maxY="379" name="military-l" minX="522" maxX="580"/>
+  <symbol minY="321" maxY="379" name="convenience-l" minX="580" maxX="638"/>
+  <symbol minY="321" maxY="379" name="tennis-l" minX="638" maxX="696"/>
+  <symbol minY="321" maxY="379" name="cricket-l" minX="696" maxX="754"/>
+  <symbol minY="321" maxY="379" name="marketplace-l" minX="754" maxX="812"/>
+  <symbol minY="321" maxY="379" name="curling-l" minX="812" maxX="870"/>
+  <symbol minY="321" maxY="379" name="mail-l" minX="870" maxX="928"/>
+  <symbol minY="321" maxY="379" name="department_store-l" minX="928" maxX="986"/>
+  <symbol minY="321" maxY="379" name="theatre-l" minX="986" maxX="1044"/>
+  <symbol minY="321" maxY="379" name="diving-l" minX="1044" maxX="1102"/>
+  <symbol minY="321" maxY="379" name="lightrail-berlin-l" minX="1102" maxX="1160"/>
+  <symbol minY="321" maxY="379" name="dog_park-l" minX="1160" maxX="1218"/>
+  <symbol minY="321" maxY="379" name="lighthouse-l" minX="1218" maxX="1276"/>
+  <symbol minY="321" maxY="379" name="doityourself-l" minX="1276" maxX="1334"/>
+  <symbol minY="321" maxY="379" name="lift_gate-l" minX="1334" maxX="1392"/>
+  <symbol minY="321" maxY="379" name="wayside_cross-l" minX="1392" maxX="1450"/>
+  <symbol minY="321" maxY="379" name="toilets-l" minX="1450" maxX="1508"/>
+  <symbol minY="321" maxY="379" name="waterfall-l" minX="1508" maxX="1566"/>
+  <symbol minY="321" maxY="379" name="drinking-water-l" minX="1566" maxX="1624"/>
+  <symbol minY="321" maxY="379" name="library-l" minX="1624" maxX="1682"/>
+  <symbol minY="321" maxY="379" name="laundry-l" minX="1682" maxX="1740"/>
+  <symbol minY="321" maxY="379" name="kiosk-l" minX="1740" maxX="1798"/>
+  <symbol minY="321" maxY="379" name="electronics-l" minX="1798" maxX="1856"/>
+  <symbol minY="321" maxY="379" name="kindergarten-m" minX="1856" maxX="1914"/>
+  <symbol minY="321" maxY="379" name="embassy-l" minX="1914" maxX="1972"/>
+  <symbol minY="321" maxY="379" name="kindergarten-l" minX="1972" maxX="2030"/>
+  <symbol minY="379" maxY="437" name="volcano-l" minX="0" maxX="58"/>
+  <symbol minY="379" maxY="437" name="jewelry-l" minX="58" maxX="116"/>
+  <symbol minY="379" maxY="437" name="vending-l" minX="116" maxX="174"/>
+  <symbol minY="379" maxY="437" name="equestrian-l" minX="174" maxX="232"/>
+  <symbol minY="379" maxY="437" name="equestrian-m" minX="232" maxX="290"/>
+  <symbol minY="379" maxY="437" name="fastfood-l" minX="290" maxX="348"/>
+  <symbol minY="379" maxY="437" name="toll_booth-l" minX="348" maxX="406"/>
+  <symbol minY="379" maxY="437" name="information-l" minX="406" maxX="464"/>
+  <symbol minY="379" maxY="437" name="fire_station-l" minX="464" maxX="522"/>
+  <symbol minY="379" maxY="437" name="hunting-tower-l" minX="522" maxX="580"/>
+  <symbol minY="379" maxY="437" name="tram-l" minX="580" maxX="638"/>
+  <symbol minY="379" maxY="437" name="florist-l" minX="638" maxX="696"/>
+  <symbol minY="379" maxY="437" name="hotel-l" minX="696" maxX="754"/>
+  <symbol minY="379" maxY="437" name="fountain-l" minX="754" maxX="812"/>
+  <symbol minY="379" maxY="437" name="tomb-l" minX="812" maxX="870"/>
+  <symbol minY="379" maxY="437" name="hospital-l" minX="870" maxX="928"/>
+  <symbol minY="379" maxY="437" name="fuel-l copy" minX="928" maxX="986"/>
+  <symbol minY="379" maxY="437" name="fuel-l" minX="986" maxX="1044"/>
+  <symbol minY="379" maxY="437" name="historic-ship-l" minX="1044" maxX="1102"/>
+  <symbol minY="379" maxY="437" name="train-l" minX="1102" maxX="1160"/>
+  <symbol minY="379" maxY="437" name="funicular-l" minX="1160" maxX="1218"/>
+  <symbol minY="379" maxY="437" name="heliport-l" minX="1218" maxX="1276"/>
+  <symbol minY="379" maxY="437" name="tourism-l" minX="1276" maxX="1334"/>
+  <symbol minY="379" maxY="437" name="furniture-l" minX="1334" maxX="1392"/>
+  <symbol minY="379" maxY="437" name="helipad-l" minX="1392" maxX="1450"/>
+  <symbol minY="379" maxY="437" name="gallery-l" minX="1450" maxX="1508"/>
+  <symbol minY="379" maxY="437" name="hardware-l" minX="1508" maxX="1566"/>
+  <symbol minY="379" maxY="437" name="toys-l" minX="1566" maxX="1624"/>
+  <symbol minY="379" maxY="437" name="garden-l" minX="1624" maxX="1682"/>
+  <symbol minY="379" maxY="437" name="hand-m" minX="1682" maxX="1740"/>
+  <symbol minY="379" maxY="437" name="hand-l" minX="1740" maxX="1798"/>
+  <symbol minY="379" maxY="437" name="garden_center-l" minX="1798" maxX="1856"/>
+  <symbol minY="379" maxY="437" name="hairdresser-l" minX="1856" maxX="1914"/>
+  <symbol minY="379" maxY="437" name="gate-l" minX="1914" maxX="1972"/>
+  <symbol minY="379" maxY="437" name="grocery-l" minX="1972" maxX="2030"/>
+  <symbol minY="437" maxY="495" name="gift-l" minX="0" maxX="58"/>
+  <symbol minY="437" maxY="495" name="greengrocer-l" minX="58" maxX="116"/>
+  <symbol minY="437" maxY="495" name="golf-l" minX="116" maxX="174"/>
+  <symbol minY="437" maxY="495" name="townhall-l" minX="174" maxX="232"/>
+  <symbol minY="437" maxY="493" name="golf-m" minX="232" maxX="288"/>
+  <symbol minY="437" maxY="493" name="gift-m" minX="288" maxX="344"/>
+  <symbol minY="437" maxY="493" name="greengrocer-m" minX="344" maxX="400"/>
+  <symbol minY="437" maxY="493" name="gate-m" minX="400" maxX="456"/>
+  <symbol minY="437" maxY="493" name="grocery-m" minX="456" maxX="512"/>
+  <symbol minY="437" maxY="493" name="tourism-m" minX="512" maxX="568"/>
+  <symbol minY="437" maxY="493" name="garden_center-m" minX="568" maxX="624"/>
+  <symbol minY="437" maxY="493" name="hairdresser-m" minX="624" maxX="680"/>
+  <symbol minY="437" maxY="493" name="townhall-m" minX="680" maxX="736"/>
+  <symbol minY="437" maxY="493" name="garden-m" minX="736" maxX="792"/>
+  <symbol minY="437" maxY="493" name="gallery-m" minX="792" maxX="848"/>
+  <symbol minY="437" maxY="493" name="hardware-m" minX="848" maxX="904"/>
+  <symbol minY="437" maxY="493" name="furniture-m" minX="904" maxX="960"/>
+  <symbol minY="437" maxY="493" name="helipad-m" minX="960" maxX="1016"/>
+  <symbol minY="437" maxY="493" name="toys-m" minX="1016" maxX="1072"/>
+  <symbol minY="437" maxY="493" name="funicular-m" minX="1072" maxX="1128"/>
+  <symbol minY="437" maxY="493" name="heliport-m" minX="1128" maxX="1184"/>
+  <symbol minY="437" maxY="493" name="tomb-m" minX="1184" maxX="1240"/>
+  <symbol minY="437" maxY="493" name="fuel-m" minX="1240" maxX="1296"/>
+  <symbol minY="437" maxY="493" name="historic-ship-m" minX="1296" maxX="1352"/>
+  <symbol minY="437" maxY="493" name="train-m" minX="1352" maxX="1408"/>
+  <symbol minY="437" maxY="493" name="hospital-m" minX="1408" maxX="1464"/>
+  <symbol minY="437" maxY="493" name="fountain-m" minX="1464" maxX="1520"/>
+  <symbol minY="437" maxY="493" name="florist-m" minX="1520" maxX="1576"/>
+  <symbol minY="437" maxY="493" name="hotel-m" minX="1576" maxX="1632"/>
+  <symbol minY="437" maxY="493" name="toll_booth-m" minX="1632" maxX="1688"/>
+  <symbol minY="437" maxY="493" name="fire_station-m" minX="1688" maxX="1744"/>
+  <symbol minY="437" maxY="493" name="hunting-tower-m" minX="1744" maxX="1800"/>
+  <symbol minY="437" maxY="493" name="tram-m" minX="1800" maxX="1856"/>
+  <symbol minY="437" maxY="493" name="information-m" minX="1856" maxX="1912"/>
+  <symbol minY="437" maxY="493" name="fastfood-m" minX="1912" maxX="1968"/>
+  <symbol minY="437" maxY="493" name="vending-m" minX="1968" maxX="2024"/>
+  <symbol minY="495" maxY="551" name="jewelry-m" minX="0" maxX="56"/>
+  <symbol minY="495" maxY="551" name="embassy-m" minX="56" maxX="112"/>
+  <symbol minY="495" maxY="551" name="electronics-m" minX="112" maxX="168"/>
+  <symbol minY="495" maxY="551" name="toilets-m" minX="168" maxX="224"/>
+  <symbol minY="495" maxY="551" name="drugs" minX="224" maxX="280"/>
+  <symbol minY="495" maxY="551" name="kiosk-m" minX="280" maxX="336"/>
+  <symbol minY="495" maxY="551" name="volcano-m" minX="336" maxX="392"/>
+  <symbol minY="495" maxY="551" name="laundry-m" minX="392" maxX="448"/>
+  <symbol minY="495" maxY="551" name="drinking-water-m" minX="448" maxX="504"/>
+  <symbol minY="495" maxY="551" name="library-m" minX="504" maxX="560"/>
+  <symbol minY="495" maxY="551" name="waterfall-m" minX="560" maxX="616"/>
+  <symbol minY="495" maxY="551" name="doityourself-m" minX="616" maxX="672"/>
+  <symbol minY="495" maxY="551" name="lift_gate-m" minX="672" maxX="728"/>
+  <symbol minY="495" maxY="551" name="dog_park-m" minX="728" maxX="784"/>
+  <symbol minY="495" maxY="551" name="lighthouse-m" minX="784" maxX="840"/>
+  <symbol minY="495" maxY="551" name="theatre-m" minX="840" maxX="896"/>
+  <symbol minY="495" maxY="551" name="diving-m" minX="896" maxX="952"/>
+  <symbol minY="495" maxY="551" name="ship-m" minX="952" maxX="1008"/>
+  <symbol minY="495" maxY="551" name="department_store-m" minX="1008" maxX="1064"/>
+  <symbol minY="495" maxY="551" name="curling-m" minX="1064" maxX="1120"/>
+  <symbol minY="495" maxY="551" name="mail-m" minX="1120" maxX="1176"/>
+  <symbol minY="495" maxY="551" name="tennis-m" minX="1176" maxX="1232"/>
+  <symbol minY="495" maxY="551" name="cricket-m" minX="1232" maxX="1288"/>
+  <symbol minY="495" maxY="551" name="marketplace-m" minX="1288" maxX="1344"/>
+  <symbol minY="495" maxY="551" name="convenience-m" minX="1344" maxX="1400"/>
+  <symbol minY="495" maxY="551" name="taxi-m" minX="1400" maxX="1456"/>
+  <symbol minY="495" maxY="551" name="computer-m" minX="1456" maxX="1512"/>
+  <symbol minY="495" maxY="551" name="military-m" minX="1512" maxX="1568"/>
+  <symbol minY="495" maxY="551" name="wayside_cross-m" minX="1568" maxX="1624"/>
+  <symbol minY="495" maxY="551" name="college-m" minX="1624" maxX="1680"/>
+  <symbol minY="495" maxY="551" name="mobile_phone-m" minX="1680" maxX="1736"/>
+  <symbol minY="495" maxY="551" name="swimming-m" minX="1736" maxX="1792"/>
+  <symbol minY="495" maxY="551" name="monument-m" minX="1792" maxX="1848"/>
+  <symbol minY="495" maxY="551" name="clothes-m" minX="1848" maxX="1904"/>
+  <symbol minY="495" maxY="551" name="cinema-m" minX="1904" maxX="1960"/>
+  <symbol minY="495" maxY="551" name="motel-m" minX="1960" maxX="2016"/>
+  <symbol minY="551" maxY="607" name="chemist-m" minX="0" maxX="56"/>
+  <symbol minY="551" maxY="607" name="museum-m" minX="56" maxX="112"/>
+  <symbol minY="551" maxY="607" name="sweets-m" minX="112" maxX="168"/>
+  <symbol minY="551" maxY="607" name="wayside_shrine-m" minX="168" maxX="224"/>
+  <symbol minY="551" maxY="607" name="subway-spb-m" minX="224" maxX="280"/>
+  <symbol minY="551" maxY="607" name="cemetery-m" minX="280" maxX="336"/>
+  <symbol minY="551" maxY="607" name="australian-football-m" minX="336" maxX="392"/>
+  <symbol minY="551" maxY="607" name="cave-m" minX="392" maxX="448"/>
+  <symbol minY="551" maxY="607" name="subway-newyork-m" minX="448" maxX="504"/>
+  <symbol minY="551" maxY="607" name="windmill-m" minX="504" maxX="560"/>
+  <symbol minY="551" maxY="607" name="npark-m" minX="560" maxX="616"/>
+  <symbol minY="551" maxY="607" name="casino-m" minX="616" maxX="672"/>
+  <symbol minY="551" maxY="607" name="caravan_site-m" minX="672" maxX="728"/>
+  <symbol minY="551" maxY="607" name="nparkf-m" minX="728" maxX="784"/>
+  <symbol minY="551" maxY="607" name="bakery-m" minX="784" maxX="840"/>
+  <symbol minY="551" maxY="607" name="car_sharing-m" minX="840" maxX="896"/>
+  <symbol minY="551" maxY="607" name="office-m" minX="896" maxX="952"/>
+  <symbol minY="551" maxY="607" name="subway-m" minX="952" maxX="1008"/>
+  <symbol minY="551" maxY="607" name="car-repair-m" minX="1008" maxX="1064"/>
+  <symbol minY="551" maxY="607" name="optician-m" minX="1064" maxX="1120"/>
+  <symbol minY="551" maxY="607" name="zoo-m" minX="1120" maxX="1176"/>
+  <symbol minY="551" maxY="607" name="park-m" minX="1176" maxX="1232"/>
+  <symbol minY="551" maxY="607" name="campsite-m" minX="1232" maxX="1288"/>
+  <symbol minY="551" maxY="607" name="school-m" minX="1288" maxX="1344"/>
+  <symbol minY="551" maxY="607" name="subway-entrance-m" minX="1344" maxX="1400"/>
+  <symbol minY="551" maxY="607" name="atm-m" minX="1400" maxX="1456"/>
+  <symbol minY="551" maxY="607" name="parking-meter-m" minX="1456" maxX="1512"/>
+  <symbol minY="551" maxY="607" name="cafe-m" minX="1512" maxX="1568"/>
+  <symbol minY="551" maxY="607" name="cable-car-m" minX="1568" maxX="1624"/>
+  <symbol minY="551" maxY="607" name="peak-m" minX="1624" maxX="1680"/>
+  <symbol minY="551" maxY="607" name="subway-entrance-2-m" minX="1680" maxX="1736"/>
+  <symbol minY="551" maxY="607" name="bank-2-m" minX="1736" maxX="1792"/>
+  <symbol minY="551" maxY="607" name="sports-m" minX="1792" maxX="1848"/>
+  <symbol minY="551" maxY="607" name="butcher-m" minX="1848" maxX="1904"/>
+  <symbol minY="551" maxY="607" name="archery-m" minX="1904" maxX="1960"/>
+  <symbol minY="551" maxY="607" name="pharmacy-m" minX="1960" maxX="2016"/>
+  <symbol minY="607" maxY="663" name="shoes-m" minX="0" maxX="56"/>
+  <symbol minY="607" maxY="663" name="bus-m" minX="56" maxX="112"/>
+  <symbol minY="607" maxY="663" name="phone-m" minX="112" maxX="168"/>
+  <symbol minY="607" maxY="663" name="soccer-m" minX="168" maxX="224"/>
+  <symbol minY="607" maxY="663" name="bowls-m" minX="224" maxX="280"/>
+  <symbol minY="607" maxY="663" name="picnic-m" minX="280" maxX="336"/>
+  <symbol minY="607" maxY="663" name="boundary_stone-m" minX="336" maxX="392"/>
+  <symbol minY="607" maxY="663" name="book-shop-m" minX="392" maxX="448"/>
+  <symbol minY="607" maxY="663" name="pitch-m" minX="448" maxX="504"/>
+  <symbol minY="607" maxY="663" name="skiing-m" minX="504" maxX="560"/>
+  <symbol minY="607" maxY="663" name="america-football-m" minX="560" maxX="616"/>
+  <symbol minY="607" maxY="663" name="place-of-worship-m" minX="616" maxX="672"/>
+  <symbol minY="607" maxY="663" name="bicycle-m" minX="672" maxX="728"/>
+  <symbol minY="607" maxY="663" name="alpine_hut-m" minX="728" maxX="784"/>
+  <symbol minY="607" maxY="663" name="police-m" minX="784" maxX="840"/>
+  <symbol minY="607" maxY="663" name="shop-m" minX="840" maxX="896"/>
+  <symbol minY="607" maxY="663" name="beer-m" minX="896" maxX="952"/>
+  <symbol minY="607" maxY="663" name="postbox-m" minX="952" maxX="1008"/>
+  <symbol minY="607" maxY="663" name="beauty-m" minX="1008" maxX="1064"/>
+  <symbol minY="607" maxY="663" name="beach-m" minX="1064" maxX="1120"/>
+  <symbol minY="607" maxY="663" name="bcontrol-m" minX="1120" maxX="1176"/>
+  <symbol minY="607" maxY="663" name="pub-m" minX="1176" maxX="1232"/>
+  <symbol minY="607" maxY="663" name="shop-m copy" minX="1232" maxX="1288"/>
+  <symbol minY="607" maxY="663" name="bbq-m" minX="1288" maxX="1344"/>
+  <symbol minY="607" maxY="663" name="alcohol-m" minX="1344" maxX="1400"/>
+  <symbol minY="607" maxY="663" name="recycling-m" minX="1400" maxX="1456"/>
+  <symbol minY="607" maxY="663" name="basketball-m" minX="1456" maxX="1512"/>
+  <symbol minY="607" maxY="663" name="baseball-m" minX="1512" maxX="1568"/>
+  <symbol minY="607" maxY="663" name="remains-m" minX="1568" maxX="1624"/>
+  <symbol minY="607" maxY="663" name="shop-bicycle-m" minX="1624" maxX="1680"/>
+  <symbol minY="607" maxY="663" name="bar-m" minX="1680" maxX="1736"/>
+  <symbol minY="607" maxY="663" name="restaurant-m" minX="1736" maxX="1792"/>
+  <symbol minY="607" maxY="663" name="banknote-m" minX="1792" maxX="1848"/>
+  <symbol minY="607" maxY="658" name="speedcam-l" minX="1848" maxX="1899"/>
+  <symbol minY="607" maxY="658" name="subway-berlin-l" minX="1899" maxX="1950"/>
+  <symbol minY="607" maxY="658" name="parking-l" minX="1950" maxX="2001"/>
+  <symbol minY="663" maxY="714" name="subway-moscow-l" minX="0" maxX="58"/>
+  <symbol minY="663" maxY="714" name="subway-rome-l" minX="58" maxX="109"/>
+  <symbol minY="663" maxY="714" name="lightrail-berlin-m" minX="109" maxX="160"/>
+  <symbol minY="663" maxY="710" name="no-icon-leisure" minX="160" maxX="207"/>
+  <symbol minY="663" maxY="710" name="no-icon-tourism" minX="207" maxX="254"/>
+  <symbol minY="663" maxY="710" name="subway-moscow-m" minX="254" maxX="308"/>
+  <symbol minY="663" maxY="710" name="no-icon-amenity" minX="308" maxX="355"/>
+  <symbol minY="663" maxY="710" name="no-icon-shop" minX="355" maxX="402"/>
+  <symbol minY="663" maxY="710" name="subway-rome-m" minX="402" maxX="449"/>
+  <symbol minY="663" maxY="710" name="subway-berlin-m" minX="449" maxX="496"/>
+  <symbol minY="663" maxY="710" name="subway-paris-m" minX="496" maxX="543"/>
+  <symbol minY="663" maxY="710" name="no-icon" minX="543" maxX="590"/>
+  <symbol minY="663" maxY="709" name="current-position" minX="590" maxX="636"/>
+  <symbol minY="663" maxY="708" name="subway-london-l" minX="636" maxX="694"/>
+  <symbol minY="663" maxY="708" name="airport-s" minX="694" maxX="739"/>
+  <symbol minY="663" maxY="705" name="pitch-s" minX="739" maxX="781"/>
+  <symbol minY="663" maxY="705" name="skiing-s" minX="781" maxX="823"/>
+  <symbol minY="663" maxY="705" name="picnic-s" minX="823" maxX="865"/>
+  <symbol minY="663" maxY="705" name="phone-s" minX="865" maxX="907"/>
+  <symbol minY="663" maxY="705" name="soccer-s" minX="907" maxX="949"/>
+  <symbol minY="663" maxY="705" name="pharmacy-s" minX="949" maxX="991"/>
+  <symbol minY="663" maxY="705" name="speedcam-m" minX="991" maxX="1033"/>
+  <symbol minY="663" maxY="705" name="atm-s" minX="1033" maxX="1075"/>
+  <symbol minY="663" maxY="705" name="bar-s" minX="1075" maxX="1117"/>
+  <symbol minY="663" maxY="705" name="school-s" minX="1117" maxX="1159"/>
+  <symbol minY="663" maxY="705" name="baseball-s" minX="1159" maxX="1201"/>
+  <symbol minY="663" maxY="705" name="basketball-s" minX="1201" maxX="1243"/>
+  <symbol minY="663" maxY="705" name="alcohol-s" minX="1243" maxX="1285"/>
+  <symbol minY="663" maxY="705" name="bcontrol-s" minX="1285" maxX="1327"/>
+  <symbol minY="663" maxY="705" name="subway-barcelona-m" minX="1327" maxX="1385"/>
+  <symbol minY="663" maxY="705" name="subway-barcelona-s" minX="1385" maxX="1436"/>
+  <symbol minY="663" maxY="705" name="beer-s" minX="1436" maxX="1478"/>
+  <symbol minY="663" maxY="705" name="place-of-worship-s" minX="1478" maxX="1520"/>
+  <symbol minY="663" maxY="705" name="bicycle-s" minX="1520" maxX="1562"/>
+  <symbol minY="663" maxY="705" name="peak-s" minX="1562" maxX="1604"/>
+  <symbol minY="663" maxY="705" name="subway-entrance-2-s" minX="1604" maxX="1646"/>
+  <symbol minY="663" maxY="705" name="subway-entrance-arrow" minX="1646" maxX="1688"/>
+  <symbol minY="663" maxY="705" name="america-football-s" minX="1688" maxX="1730"/>
+  <symbol minY="663" maxY="705" name="book-shop-s" minX="1730" maxX="1772"/>
+  <symbol minY="663" maxY="705" name="subway-entrance-s" minX="1772" maxX="1814"/>
+  <symbol minY="663" maxY="705" name="bus-s" minX="1814" maxX="1856"/>
+  <symbol minY="663" maxY="705" name="cable-car-s" minX="1856" maxX="1898"/>
+  <symbol minY="663" maxY="705" name="cafe-s" minX="1898" maxX="1940"/>
+  <symbol minY="663" maxY="705" name="park-s" minX="1940" maxX="1982"/>
+  <symbol minY="663" maxY="705" name="shop-s" minX="1982" maxX="2024"/>
+  <symbol minY="714" maxY="756" name="subway-london-m" minX="0" maxX="56"/>
+  <symbol minY="714" maxY="756" name="zoo-s" minX="56" maxX="98"/>
+  <symbol minY="714" maxY="756" name="office-s" minX="98" maxX="140"/>
+  <symbol minY="714" maxY="756" name="campsite-s" minX="140" maxX="182"/>
+  <symbol minY="714" maxY="756" name="subway-madrid-m" minX="182" maxX="240"/>
+  <symbol minY="714" maxY="756" name="car-repair-s" minX="240" maxX="282"/>
+  <symbol minY="714" maxY="756" name="windmill-s" minX="282" maxX="324"/>
+  <symbol minY="714" maxY="756" name="casino-s" minX="324" maxX="366"/>
+  <symbol minY="714" maxY="756" name="cave-s" minX="366" maxX="408"/>
+  <symbol minY="714" maxY="756" name="nparkf-s" minX="408" maxX="450"/>
+  <symbol minY="714" maxY="756" name="shop-s copy" minX="450" maxX="492"/>
+  <symbol minY="714" maxY="756" name="cemetery-s" minX="492" maxX="534"/>
+  <symbol minY="714" maxY="756" name="npark-s" minX="534" maxX="576"/>
+  <symbol minY="714" maxY="756" name="cinema-s" minX="576" maxX="618"/>
+  <symbol minY="714" maxY="756" name="subway-newyork-s" minX="618" maxX="660"/>
+  <symbol minY="714" maxY="756" name="college-s" minX="660" maxX="702"/>
+  <symbol minY="714" maxY="756" name="police-s" minX="702" maxX="744"/>
+  <symbol minY="714" maxY="756" name="pub-s" minX="744" maxX="786"/>
+  <symbol minY="714" maxY="756" name="waterfall-s" minX="786" maxX="828"/>
+  <symbol minY="714" maxY="756" name="volcano-s" minX="828" maxX="870"/>
+  <symbol minY="714" maxY="756" name="recycling-s" minX="870" maxX="912"/>
+  <symbol minY="714" maxY="756" name="drinking-water-s" minX="912" maxX="954"/>
+  <symbol minY="714" maxY="756" name="subway-s" minX="954" maxX="996"/>
+  <symbol minY="714" maxY="756" name="remains-s" minX="996" maxX="1038"/>
+  <symbol minY="714" maxY="756" name="ship-s" minX="1038" maxX="1080"/>
+  <symbol minY="714" maxY="756" name="subway-spb-s" minX="1080" maxX="1122"/>
+  <symbol minY="714" maxY="756" name="embassy-s" minX="1122" maxX="1164"/>
+  <symbol minY="714" maxY="756" name="tram-s" minX="1164" maxX="1206"/>
+  <symbol minY="714" maxY="756" name="fastfood-s" minX="1206" maxX="1248"/>
+  <symbol minY="714" maxY="756" name="fire_station-s" minX="1248" maxX="1290"/>
+  <symbol minY="714" maxY="756" name="train-s" minX="1290" maxX="1332"/>
+  <symbol minY="714" maxY="756" name="restaurant-s" minX="1332" maxX="1374"/>
+  <symbol minY="714" maxY="756" name="museum-s" minX="1374" maxX="1416"/>
+  <symbol minY="714" maxY="756" name="monument-s" minX="1416" maxX="1458"/>
+  <symbol minY="714" maxY="756" name="atm-s copy 2" minX="1458" maxX="1500"/>
+  <symbol minY="714" maxY="756" name="swimming-s" minX="1500" maxX="1542"/>
+  <symbol minY="714" maxY="756" name="military-s" minX="1542" maxX="1584"/>
+  <symbol minY="714" maxY="756" name="fountain-s" minX="1584" maxX="1626"/>
+  <symbol minY="714" maxY="756" name="metro-barcelona-m" minX="1626" maxX="1684"/>
+  <symbol minY="714" maxY="756" name="mail-s" minX="1684" maxX="1726"/>
+  <symbol minY="714" maxY="756" name="tennis-s" minX="1726" maxX="1768"/>
+  <symbol minY="714" maxY="756" name="fuel-s" minX="1768" maxX="1810"/>
+  <symbol minY="714" maxY="756" name="lighthouse-s" minX="1810" maxX="1852"/>
+  <symbol minY="714" maxY="756" name="theatre-s" minX="1852" maxX="1894"/>
+  <symbol minY="714" maxY="756" name="library-s" minX="1894" maxX="1936"/>
+  <symbol minY="714" maxY="756" name="kindergarten-s" minX="1936" maxX="1978"/>
+  <symbol minY="714" maxY="756" name="toilets-s" minX="1978" maxX="2020"/>
+  <symbol minY="756" maxY="798" name="information-s" minX="0" maxX="42"/>
+  <symbol minY="756" maxY="798" name="hotel-s" minX="42" maxX="84"/>
+  <symbol minY="756" maxY="798" name="hospital-s" minX="84" maxX="126"/>
+  <symbol minY="756" maxY="798" name="heliport-s" minX="126" maxX="168"/>
+  <symbol minY="756" maxY="798" name="helipad-s" minX="168" maxX="210"/>
+  <symbol minY="756" maxY="798" name="grocery-s" minX="210" maxX="252"/>
+  <symbol minY="756" maxY="798" name="tourism-s" minX="252" maxX="294"/>
+  <symbol minY="756" maxY="798" name="golf-s" minX="294" maxX="336"/>
+  <symbol minY="756" maxY="798" name="garden-s" minX="336" maxX="378"/>
+  <symbol minY="756" maxY="798" name="townhall-s" minX="378" maxX="420"/>
+  <symbol minY="756" maxY="798" name="gallery-s" minX="420" maxX="462"/>
+  <symbol minY="756" maxY="798" name="funicular-s" minX="462" maxX="504"/>
+  <symbol minY="756" maxY="797" name="subway-madrid-l" minX="504" maxX="562"/>
+  <symbol minY="756" maxY="797" name="subway-barcelona-l" minX="562" maxX="620"/>
+  <symbol minY="756" maxY="796" name="s-arrow" minX="620" maxX="658"/>
+  <symbol minY="756" maxY="796" name="parking-m" minX="658" maxX="698"/>
+  <symbol minY="756" maxY="796" name="route_from" minX="698" maxX="738"/>
+  <symbol minY="756" maxY="794" name="lightrail-berlin-s" minX="738" maxX="776"/>
+  <symbol minY="756" maxY="794" name="subway-kiev-l" minX="776" maxX="832"/>
+  <symbol minY="756" maxY="794" name="subway-paris-s" minX="832" maxX="870"/>
+  <symbol minY="756" maxY="794" name="subway-kiev-m" minX="870" maxX="926"/>
+  <symbol minY="756" maxY="794" name="subway-madrid-s" minX="926" maxX="977"/>
+  <symbol minY="756" maxY="794" name="metro-barcelona-s" minX="977" maxX="1028"/>
+  <symbol minY="756" maxY="792" name="api-result" minX="1028" maxX="1064"/>
+  <symbol minY="756" maxY="792" name="subway-moscow-s" minX="1064" maxX="1100"/>
+  <symbol minY="756" maxY="790" name="search-result" minX="1100" maxX="1134"/>
+  <symbol minY="756" maxY="789" name="speedcam-s" minX="1134" maxX="1167"/>
+  <symbol minY="756" maxY="789" name="subway-rome-s" minX="1167" maxX="1200"/>
+  <symbol minY="756" maxY="789" name="star-l" minX="1200" maxX="1233"/>
+  <symbol minY="756" maxY="789" name="parking-s" minX="1233" maxX="1266"/>
+  <symbol minY="756" maxY="789" name="bench" minX="1266" maxX="1304"/>
+  <symbol minY="756" maxY="789" name="subway-berlin-s" minX="1304" maxX="1337"/>
+  <symbol minY="756" maxY="789" name="subway-london-s" minX="1337" maxX="1379"/>
+  <symbol minY="756" maxY="787" name="peakt-l" minX="1379" maxX="1412"/>
+  <symbol minY="756" maxY="787" name="star-m" minX="1412" maxX="1443"/>
+  <symbol minY="756" maxY="787" name="subway-minsk-l" minX="1443" maxX="1499"/>
+  <symbol minY="756" maxY="787" name="survey_point-l" minX="1499" maxX="1530"/>
+  <symbol minY="756" maxY="785" name="subway-kiev-s" minX="1530" maxX="1577"/>
+  <symbol minY="756" maxY="783" name="survey_point-m" minX="1577" maxX="1604"/>
+  <symbol minY="756" maxY="783" name="subway-xs" minX="1604" maxX="1631"/>
+  <symbol minY="756" maxY="783" name="star-s" minX="1631" maxX="1658"/>
+  <symbol minY="756" maxY="783" name="railway-crossing" minX="1658" maxX="1700"/>
+  <symbol minY="756" maxY="783" name="subway-newyork-xs" minX="1700" maxX="1727"/>
+  <symbol minY="756" maxY="783" name="subway-minsk-m" minX="1727" maxX="1774"/>
+  <symbol minY="756" maxY="780" name="subway-xs copy" minX="1774" maxX="1798"/>
+  <symbol minY="756" maxY="780" name="subway-minsk-s" minX="1798" maxX="1840"/>
+  <symbol minY="756" maxY="778" name="survey_point-s" minX="1840" maxX="1862"/>
+  <symbol minY="756" maxY="778" name="peakt-m" minX="1862" maxX="1886"/>
+  <symbol minY="756" maxY="778" name="arrow-m" minX="1886" maxX="1937"/>
+  <symbol minY="756" maxY="776" name="entrance-s" minX="1937" maxX="1957"/>
+  <symbol minY="756" maxY="774" name="dot-m" minX="1957" maxX="1975"/>
+  <symbol minY="756" maxY="774" name="peakt-s" minX="1975" maxX="1995"/>
+  <symbol minY="756" maxY="771" name="tree-l" minX="1995" maxX="2010"/>
+  <symbol minY="756" maxY="771" name="none" minX="2010" maxX="2025"/>
+  <symbol minY="798" maxY="813" name="arrow-s" minX="0" maxX="38"/>
+  <symbol minY="798" maxY="811" name="dot-s-light" minX="38" maxX="51"/>
+  <symbol minY="798" maxY="811" name="tree-m" minX="51" maxX="64"/>
+  <symbol minY="798" maxY="811" name="entrance-xs" minX="64" maxX="77"/>
+  <symbol minY="798" maxY="811" name="dot-s" minX="77" maxX="90"/>
+  <symbol minY="798" maxY="809" name="tree-s" minX="90" maxX="101"/>
+  <symbol minY="798" maxY="809" name="zero-icon" minX="101" maxX="112"/>
  </file>
 </root>
diff --git a/data/resources-yota/symbols.png b/data/resources-yota/symbols.png
index 4e46db39aa..e0581e6c02 100644
--- a/data/resources-yota/symbols.png
+++ b/data/resources-yota/symbols.png
diff --git a/data/resources-yota/symbols.sdf b/data/resources-yota/symbols.sdf
index ac31337562..14ae67f309 100644
--- a/data/resources-yota/symbols.sdf
+++ b/data/resources-yota/symbols.sdf
@@ -1,6 +1,6 @@
 <!DOCTYPE skin>
 <root>
- <file height="256" width="512">
+ <file width="512" height="256">
   <symbol minX="0" maxX="71" minY="0" maxY="71" name="route_to"/>
   <symbol minX="71" maxX="131" minY="0" maxY="60" name="compass-image"/>
   <symbol minX="131" maxX="162" minY="0" maxY="39" name="current-routing-compas"/>
diff --git a/data/styles/clear/include/POI.mapcss b/data/styles/clear/include/POI.mapcss
index 90fcaea2a8..6dd6f533a2 100644
--- a/data/styles/clear/include/POI.mapcss
+++ b/data/styles/clear/include/POI.mapcss
@@ -1,124 +1,117 @@
 /* ZOOM 15 */
 
-
 /* z=15 icons — small icons
 node|z15-[tourism], area|z15-[tourism] { z-index: 2700; }
 node|z15-[amenity], area|z15-[amenity] { z-index: 2700; }
 */
-node|z15[tourism=museum], area|z15[tourism=museum]
+node|z11-z15[tourism=museum], area|z12-15[tourism=museum]
 { icon-image: museum-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; icon-min-distance: 1; }
-node|z15[tourism=gallery]
+node|z12-15[tourism=gallery]
 { icon-image: gallery-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  } /* <-- <-- не показывается, непонятно почему, позже разобраться */
-node|z15[tourism=zoo], area|z15[tourism=zoo]
+node|z12-15[tourism=zoo], area|z12-15[tourism=zoo]
 { icon-image: zoo-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
-node|z15[amenity=university][name]
-{ icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 1; icon-min-distance: 12; -x-me-text-priority:16000;}
-node|z15[amenity=university][!name]{};
-node|z15[amenity=hospital]
+node|z12-15[amenity=university][name]
+{ icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 1; icon-min-distance: 12;}
+node|z12-15[amenity=university][!name]{};
+node|z12-15[amenity=hospital]
 { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
 
 /* TOURISM, HISTORIC  */
 
 /* NAMED TOURISM POINTS BY DEFAULT — TEMPORARY */
 
-node|z16[tourism=museum],area|z16[tourism=museum]
+node|z12-16[tourism=museum],area|z12-16[tourism=museum]
 { icon-image: museum-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z16[historic=museum],area|z16[historic=museum]
+node|z12-16[historic=museum],area|z12-16[historic=museum]
 { icon-image: museum-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
-node|z16[historic=monument],area|z16[historic=monument]
+node|z12-16[historic=monument],area|z12-16[historic=monument]
 { icon-image: monument-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
-node|z16-[historic=fort],area|z16-[historic=fort]
+node|z12-[historic=fort],area|z12-[historic=fort]
 { icon-image: remains-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
-node|z16-[historic=castle],area|z16-[historic=castle]
+node|z12-[historic=castle],area|z12-[historic=castle]
 { icon-image: remains-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
 
-/*node|z16[historic=memorial], area|z16[historic=memorial] { icon-image: monument-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }*/
-node|z16[tourism=gallery],area|z16[tourism=gallery]
+/*node|z12-16[historic=memorial], area|z12-16[historic=memorial] { icon-image: monument-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }*/
+node|z12-16[tourism=gallery],area|z12-16[tourism=gallery]
 { icon-image: gallery-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z16[tourism=zoo], area|z16[tourism=zoo]
+node|z12-16[tourism=zoo], area|z12-16[tourism=zoo]
 { icon-image: zoo-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
 
-node|z15[tourism=camp_site], area|z15[tourism=camp_site]
+node|z12-15[tourism=camp_site], area|z12-15[tourism=camp_site]
 { text-offset: 12; icon-image: campsite-m.svg; z-index: 2700; }
-node|z16[tourism=camp_site], area|z16-17[tourism=camp_site]
+node|z12-16[tourism=camp_site], area|z16-17[tourism=camp_site]
 { icon-image: campsite-m.svg; text-offset: 12; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
 
-node|z18-[tourism], area|z18-[tourism]
-{ font-size: 11; text: name;text-offset: 12; text-color: @poi_label;z-index: 2700;  }
+node|z12-[tourism], area|z12-[tourism]
+{ font-size: 10; text: name;text-offset: 12; text-color: @poi_label;z-index: 2700;  }
 
 /* ZOOM 17+ */
-node|z17-[tourism=museum],area|z17-[tourism=museum]
+node|z12-[tourism=museum],area|z12-[tourism=museum]
 { icon-image: museum-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z17-[historic=museum],area|z17-[historic=museum]
+node|z12-[historic=museum],area|z12-[historic=museum]
 { icon-image: museum-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z17-[tourism=gallery],area|z17-[tourism=gallery]
+node|z12-[tourism=gallery],area|z12-[tourism=gallery]
 { icon-image: gallery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z17-[tourism=zoo], area|z17-[tourism=zoo]
+node|z12-[tourism=zoo], area|z12-[tourism=zoo]
 { icon-image: zoo-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z17-[tourism=hotel]
+node|z12-[tourism=hotel]
 { icon-image: hotel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
-node|z17-[tourism=hostel]
+node|z12-[tourism=hostel]
 { icon-image: hotel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
-node|z17-[tourism=artwork]
+node|z12-[tourism=artwork]
 { icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
-node|z17-[tourism=viewpoint]
+node|z12-[tourism=attraction]
+{ icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
+node|z12-[tourism=viewpoint]
 { icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
-node|z17-[tourism=information]
+node|z12-[tourism=information]
 { icon-image: information-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
-node|z17-[tourism=camp_site], area|z17-[tourism=camp_site]
+node|z12-[tourism=camp_site], area|z12-[tourism=camp_site]
 { icon-image: campsite-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z17-[tourism=picnic_site], area|z17-[tourism=picnic_site]
+node|z12-[tourism=picnic_site], area|z12-[tourism=picnic_site]
 { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
-node|z17-[amenity=shelter], area|z17-[amenity=shelter]
+node|z12-[amenity=shelter], area|z12-[amenity=shelter]
 { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500;  }
-node|z17-[historic=memorial], area|z17-[historic=memorial]
+node|z12-[historic=memorial], area|z12-[historic=memorial]
 { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
-node|z17-[historic=monument],area|z17-[historic=monument]
+node|z12-[historic=monument],area|z12-[historic=monument]
 { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
-node|z17-[historic=archaeological_site],area|z17-[historic=archaeological_site]
+node|z12-[historic=archaeological_site],area|z12-[historic=archaeological_site]
 { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
-node|z17-[historic=ruins],area|z17-[historic=ruins]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
-node|z17-[historic=fort],area|z17-[historic=fort]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
-node|z17-[historic=castle],area|z17-[historic=castle]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
-/*node|z17-[amenity=fire_station], area|z17-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }*/
+node|z12-[historic=ruins],area|z12-[historic=ruins]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
+node|z12-[historic=fort],area|z12-[historic=fort]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
+node|z12-[historic=castle],area|z12-[historic=castle]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600;  }
+/*node|z12-[amenity=fire_station], area|z12-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }*/
 
-node|z18-[tourism=museum],area|z18-[tourism=museum]
-{ icon-image: museum-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700; }
-node|z18-[historic=museum],area|z18-[historic=museum]
-{ icon-image: museum-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700; }
 
-node|z18-[tourism=camp_site], area|z18-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600; }
-node|z18-[tourism=picnic_site], area|z18-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500; }
-node|z18-[amenity=shelter], area|z18-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500; }
-node|z18-[amenity=fire_station], area|z18-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500; }
+node|z12-[tourism=camp_site], area|z12-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
+node|z12-[tourism=picnic_site], area|z12-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
+node|z12-[amenity=shelter], area|z12-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
+node|z12-[amenity=fire_station], area|z12-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
 
 
-node|z19-[tourism=camp_site], area|z19-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; }
-node|z19-[tourism=picnic_site], area|z19-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500;   }
-node|z19-[amenity=shelter], area|z19-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500;  }
-node|z19-[amenity=fire_station], area|z19-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500; }
+node|z19-[tourism=camp_site], area|z19-[tourism=camp_site] { icon-image: campsite-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
+node|z19-[tourism=picnic_site], area|z19-[tourism=picnic_site] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500;   }
+node|z19-[amenity=shelter], area|z19-[amenity=shelter] { icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500;  }
+node|z19-[amenity=fire_station], area|z19-[amenity=fire_station] { icon-image: fire_station-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
 
 
 /* NATURAL*/
 
 node|z12-14[natural=cave_entrance],area|z12-[natural=cave] { icon-image: cave-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
 node|z15-17[natural=cave_entrance],area|z15-[natural=cave] { icon-image: cave-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z18-[natural=cave_entrance],area|z16-[natural=cave] { icon-image: cave-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700; }
+node|z12-[natural=cave_entrance],area|z12-[natural=cave] { icon-image: cave-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
 
 node|z12-14[natural=waterfall],area|z12-14[natural=waterfall] { icon-image: waterfall-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 node|z15-16[natural=waterfall],area|z15-17[natural=waterfall] { icon-image: waterfall-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z17-[natural=waterfall],area|z18-[natural=waterfall] { icon-image: waterfall-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; }
-node|z12-14[waterway=waterfall],area|z12-14[waterway=waterfall] { icon-image: waterfall-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-node|z15-16[waterway=waterfall],area|z15-17[waterway=waterfall] { icon-image: waterfall-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z17-[waterway=waterfall],area|z18-[waterway=waterfall] { icon-image: waterfall-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-
+node|z12-[natural=waterfall],area|z12-[natural=waterfall] { icon-image: waterfall-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 
 node|z10-14[natural=volcano],{ icon-image: volcano-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 node|z15-16[natural=volcano],{ icon-image: volcano-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z17-[natural=volcano],{ icon-image: volcano-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z12-[natural=volcano],{ icon-image: volcano-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
 area|z10-14[natural=volcano],{ icon-image: volcano-s.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 area|z15-16[natural=volcano],{ icon-image: volcano-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-area|z17-[natural=volcano],{ icon-image: volcano-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+area|z12-[natural=volcano],{ icon-image: volcano-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 
 node|z12[natural=peak][name],
 { icon-image: peakt-s.svg; z-index: 2700; }
@@ -147,86 +140,82 @@ area|z13[natural=rock][!name]
 {  }
 
 node|z14[natural=peak][name],
-{ icon-image: peakt-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+{ icon-image: peakt-m.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 node|z14[natural=peak][!name],
 node|z14[natural=bare_rock][!name],
 node|z14[natural=rock][!name]
 {  }
 area|z14[natural=peak][name],
-{ icon-image: peakt-s.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+{ icon-image: peakt-m.svg; text-offset: 6; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 area|z14[natural=peak][!name],
 area|z14[natural=bare_rock][!name],
 area|z14[natural=rock][!name]
 {  }
 
-node|z15-16[natural=peak],node|z15-16[natural=bare_rock],node|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 10; font-size: 1; text: name; text-color: @poi_label;z-index: 2700; }
-area|z15-16[natural=peak],area|z15-16[natural=bare_rock],area|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z17-[natural=peak],node|z17-[natural=bare_rock],node|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-area|z17-[natural=peak],area|z17-[natural=bare_rock],area|z17-[natural=rock] { icon-image: peakt-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z12-15[natural=peak],node|z15-16[natural=bare_rock],node|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; }
+area|z12-15[natural=peak],area|z15-16[natural=bare_rock],area|z15-16[natural=rock] { icon-image: peakt-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700;}
+node|z12-[natural=peak],node|z12-[natural=bare_rock],node|z12-[natural=rock] { icon-image: peakt-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; }
+area|z12-[natural=peak],area|z12-[natural=bare_rock],area|z12-[natural=rock] { icon-image: peakt-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2700;}
 
 node|z12-13[landuse=forest][boundary=national_park],area|z12-14[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
 text-halo-radius:0.5; z-index: 2700;}
-node|z14[landuse=forest][boundary=national_park],area|z14-[landuse=forest][boundary=national_park] { icon-image: nparkf-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
+node|z14[landuse=forest][boundary=national_park],area|z12-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
 text-halo-radius:0.5; z-index: 2700;}
-node|z15-16[landuse=forest][boundary=national_park],area|z15-16[landuse=forest][boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label;text-halo-opacity: 0.9; text-halo-color: @label_halo_light;
+node|z15-16[landuse=forest][boundary=national_park],area|z15-16[landuse=forest][boundary=national_park] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label;text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
 text-halo-radius:0.5; z-index: 2700;}
-node|z17-[landuse=forest][boundary=national_park],area|z17-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.9; text-halo-color: @label_halo_light;
+node|z12-[landuse=forest][boundary=national_park],area|z12-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
 text-halo-radius:0.5; z-index: 2700;}
 
-node|z12-13[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: nparkf-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
-text-halo-radius:0.5; z-index: 30;}
-node|z14[leisure=nature_reserve],area|z14-[leisure=nature_reserve]{ icon-image: nparkf-s.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
-text-halo-radius:0.5; z-index: 30;}
-node|z15-16[leisure=nature_reserve],area|z15-16[leisure=nature_reserve] { icon-image: nparkf-m.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.9; text-halo-color: @label_halo_light;
-text-halo-radius:0.5; z-index: 30; }
-node|z17-[leisure=nature_reserve],area|z17-[leisure=nature_reserve] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.9; text-halo-color: @label_halo_light;
-text-halo-radius:0.5; z-index: 30; }
-
-node|z15-16[natural=beach], area|z15-16[natural=beach]{ icon-image: beach-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
-node|z17-[natural=beach], area|z17-[natural=beach]{ icon-image: beach-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-13[leisure=nature_reserve],area|z12-14[leisure=nature_reserve] { icon-image: npark-s.svg; text-offset: 8; font-size: 10; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
+text-halo-radius:0.5; z-index: 2700;}
+node|z14[landuse=forest][boundary=national_park],area|z12-[landuse=forest][boundary=national_park] { icon-image: nparkf-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
+text-halo-radius:0.5; z-index: 2700;}
+node|z15-16[leisure=nature_reserve],area|z15-16[leisure=nature_reserve] { icon-image: npark-m.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
+text-halo-radius:0.5; z-index: 2700; }
+node|z12-[leisure=nature_reserve],area|z12-[leisure=nature_reserve] { icon-image: npark-l.svg; text-offset: 10; font-size: 12; text: name; text-color: @park_label; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;
+text-halo-radius:0.5; z-index: 2700; }
 
+node|z15-[natural=beach], area|z15-[natural=beach]{ icon-image: beach-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
 
 
 /* AMENITY */
 
 /* NAMED AMENITIES BY DEFAULT  — TEMPORARY */
-node|z19-[amenity], area|z19-[amenity] { icon-image: none.svg;  text-offset: 10; font-size: 11; text: name; text-color: @poi_label; }
+node|z19-[amenity], area|z19-[amenity] { icon-image: none.svg;  text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }
 
 
 /* AMENITY */
 
-node|z15-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-m.svg; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 2700;  }
-node|z15-[amenity=hunting_stand], area|z18-[amenity=hunting_stand] { icon-image: hunting-tower-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
-node|z15-[tourism=attraction], area|z15-[tourism=attraction ] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
-
-
-node|z16[amenity=place_of_worship], area|z16[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
-/*node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
-node|z16[amenity=kindergarten], area|z16[amenity=kindergarten] { icon-image: kindergarten-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
-node|z16[amenity=school], area|z16[amenity=school] { icon-image: school-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}*/
-node|z16[amenity=college], area|z16[amenity=college] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
-node|z16[amenity=hospital], area|z16[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z16[amenity=clinic], area|z16[amenity=clinic] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
-node|z16[amenity=university][name], area|z16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1;icon-min-distance: 11; -x-me-text-priority:16000;}
-node|z16[amenity=university][!name], area|z16[amenity=university][!name]{};
-node|z16[amenity=fuel], area|z16[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }
-node|z16-[natural=spring],area|z16-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 100; z-index: 2700; }
-node|z16[amenity=cafe], area|z16[amenity=cafe] { icon-image: cafe-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
-node|z16[amenity=restaurant], area|z16[amenity=restaurant] { icon-image: restaurant-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;icon-min-distance: 10;}
-node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
-node|z16-[tourism=attraction], area|z16-[tourism=attraction] { icon-image: tourism-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
-node|z16-[leisure=water_park], area|z16-[leisure=water_park] { icon-image: swimming-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
+node|z15-[natural=spring],area|z12-[natural=spring]{ icon-image: drinking-water-m.svg; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 2700;  }
+node|z15-[amenity=hunting_stand], area|z12-[amenity=hunting_stand] { icon-image: hunting-tower-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+
+
+node|z12-16[amenity=place_of_worship], area|z12-16[amenity=place_of_worship] { icon-image: place-of-worship-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+/*node|z12-16[amenity=theatre], area|z12-16[amenity=theatre] { icon-image: theatre-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-16[amenity=kindergarten], area|z12-16[amenity=kindergarten] { icon-image: kindergarten-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-16[amenity=school], area|z12-16[amenity=school] { icon-image: school-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}*/
+node|z12-16[amenity=college], area|z12-16[amenity=college] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
+node|z12-16[amenity=hospital], area|z12-16[amenity=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z12-16[amenity=clinic], area|z12-16[amenity=clinic] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-16[amenity=university][name], area|z12-16[amenity=university][name] { icon-image: college-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 1;icon-min-distance: 11; }
+node|z12-16[amenity=university][!name], area|z12-16[amenity=university][!name]{};
+node|z12-16[amenity=fuel], area|z12-16[amenity=fuel] { icon-image: fuel-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }
+node|z12-[natural=spring],area|z12-[natural=spring]{ icon-image: drinking-water-m.svg; z-index: 1000; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 100; z-index: 2700; }
+node|z12-16[amenity=cafe], area|z12-16[amenity=cafe] { icon-image: cafe-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
+node|z12-16[amenity=restaurant], area|z12-16[amenity=restaurant] { icon-image: restaurant-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;icon-min-distance: 10;}
+node|z12-16[amenity=theatre], area|z12-16[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
+
 
 node|z17[amenity=place_of_worship], area|z17[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
 node|z17[amenity=theatre], area|z17[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
-node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2100; }
+node|z17[amenity=kindergarten], area|z17[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 21000; }
 node|z17[amenity=school], area|z17[amenity=school] { icon-image: school-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
 node|z17[amenity=college], area|z17[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
 node|z17[amenity=hospital], area|z17[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 node|z17[amenity=clinic], area|z17[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
-node|z17[amenity=university][name], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 10; -x-me-text-priority:16000;}
+node|z17[amenity=university][name], area|z17[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; icon-min-distance: 10;}
 node|z17[amenity=university][!name], area|z17[amenity=university][!name]{};
-node|z17[amenity=cinema], area|z17[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z17[amenity=cinema], area|z17[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
 node|z17[amenity=bank], area|z17[amenity=bank] { z-index: 4500; icon-image: bank-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
 node|z17[amenity=fuel], area|z17[amenity=fuel] { icon-image: fuel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
 node|z17[amenity=police], area|z17[amenity=police] { icon-image: police-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
@@ -235,61 +224,55 @@ node|z17[amenity=bicycle_rental], area|z17[amenity=bicycle_rental] { icon-image:
 node|z17[amenity=post_office] { icon-image: mail-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
 node|z17[amenity=cafe], area|z17[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
 node|z17[amenity=restaurant], area|z17[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
-node|z17-[amenity=fountain],area|z17-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 10; font-size: 10;  text: name; text-color: @poi_label; z-index: 2500;}
-node|z17-[amenity=drinking_water],area|z17-[amenity=drinking_water],node|z17-[amenity=water_point] ,area|z17-[amenity=water_point]{ icon-image: drinking-water-l.svg;z-index: 2400; }
-node|z17-[natural=spring],area|z17-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 100; z-index: 2700; }
-node|z17-[historic=memorial], area|z17-[historic=memorial] { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
-node|z17-[historic=monument],area|z17-[historic=monument]  { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
-node|z17-[historic=archaeological_site],area|z17-[historic=archaeological_site]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z17-[historic=ruins],area|z17-[historic=ruins]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z17-[historic=fort],area|z17-[historic=fort]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-node|z17-[historic=castle],area|z17-[historic=castle]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
-node|z17-[tourism=attraction],area|z17-[tourism=attraction]  { icon-image: tourism-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
-node|z17-[leisure=water_park], area|z17-[leisure=water_park] { icon-image: swimming-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
-node|z16[amenity=theatre], area|z16[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; icon-min-distance: 10;}
-
-
-node|z18-[amenity=place_of_worship], area|z18-[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=theatre], area|z18-[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=kindergarten], area|z18-[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[amenity=school], area|z18-[amenity=school] { icon-image: school-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[amenity=college], area|z18-[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=hospital], area|z18-[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2700; }
-node|z18-[amenity=clinic], area|z18-[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[amenity=university][name], area|z18-[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; -x-me-text-priority:16000;}
-node|z18-[amenity=university][!name], area|z18-[amenity=university][!name]{};
-node|z18-[amenity=cinema], area|z18-[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=bank], area|z18-[amenity=bank] { z-index: 4500; icon-image: bank-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=fuel], area|z18-[amenity=fuel] { icon-image: fuel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; }
-node|z18-[amenity=police], area|z18-[amenity=police] { icon-image: police-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=embassy], area|z18-[amenity=embassy] { icon-image: embassy-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=bicycle_rental], area|z18-[amenity=bicycle_rental] { icon-image: bicycle-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[amenity=post_office] { icon-image: mail-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[amenity=toilets], area|z18-[amenity=toilets] { icon-image: toilets-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[amenity=atm], area|z18-[amenity=atm] { z-index: 4200; icon-image: atm-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[amenity=pharmacy], area|z18-[amenity=pharmacy] { icon-image: pharmacy-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[amenity=cafe], area|z18-[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=restaurant], area|z18-[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; }
-node|z18-[amenity=fast_food], area|z18-[amenity=fast_food] { icon-image: fastfood-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[amenity=bar], area|z18-[amenity=bar] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=pub], area|z18-[amenity=pub] { icon-image: beer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; }
-node|z18-[amenity=nightclub], area|z18-[amenity=nightclub] { icon-image: bar-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[amenity=bureau_de_change] { icon-image: banknote-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[amenity=bench] { icon-image: bench.svg;z-index: 2400; }
-node|z18-[natural=tree] { icon-image: tree-m.svg; z-index: 2400;}
-node|z19-[man_made=survey_point] { icon-image: survey_point-l.svg; z-index: 2400;}
-
-node|z18-[amenity=fountain],area|z18-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 10; font-size: 11;  text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[amenity=drinking_water],area|z18-[amenity=drinking_water],node|z18-[amenity=water_point],area|z18-[amenity=water_point] { icon-image: drinking-water-l.svg; z-index: 2400;}
-node|z18-[natural=spring],area|z18-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset: 10; font-size: 11;  text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=library] { icon-image: library-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[amenity=waste_disposal], area|z18-[amenity=waste_disposal] { icon-image: recycling-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[historic=memorial], area|z18-[historic=memorial] { icon-image: monument-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2600; }
-node|z18-[historic=monument],area|z18-[historic=monument]  { icon-image: monument-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=hunting_stand], area|z18-[amenity=hunting_stand] { icon-image: hunting-tower-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[historic=monument],area|z18-[historic=monument]  { icon-image: monument-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2600;}
-node|z18-[amenity=hunting_stand], area|z18-[amenity=hunting_stand] { icon-image: hunting-tower-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[office], area|z18-[office] { icon-image: office-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[amenity=fountain],area|z12-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 10; font-size: 10;  text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[amenity=drinking_water],area|z12-[amenity=drinking_water],node|z12-[amenity=water_point] ,area|z12-[amenity=water_point]{ icon-image: drinking-water-l.svg;z-index: 2400; }
+node|z12-[natural=spring],area|z12-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset:8; font-size: 10;  text: name; text-color: @poi_label; z-index: 100; z-index: 2700; }
+node|z12-[historic=memorial], area|z12-[historic=memorial] { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[historic=monument],area|z12-[historic=monument]  { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[historic=archaeological_site],area|z12-[historic=archaeological_site]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z12-[historic=ruins],area|z12-[historic=ruins]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+node|z12-[historic=fort],area|z12-[historic=fort]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+node|z12-[historic=castle],area|z12-[historic=castle]  { icon-image: remains-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700;}
+
+
+node|z12-[amenity=place_of_worship], area|z12-[amenity=place_of_worship] { icon-image: place-of-worship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=theatre], area|z12-[amenity=theatre] { icon-image: theatre-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=kindergarten], area|z12-[amenity=kindergarten] { icon-image: kindergarten-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[amenity=school], area|z12-[amenity=school] { icon-image: school-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[amenity=college], area|z12-[amenity=college] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=hospital], area|z12-[amenity=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+node|z12-[amenity=clinic], area|z12-[amenity=clinic] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[amenity=university][name], area|z12-[amenity=university][name] { icon-image: college-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;}
+node|z12-[amenity=university][!name], area|z12-[amenity=university][!name]{};
+node|z12-[amenity=cinema], area|z12-[amenity=cinema] { icon-image: cinema-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[amenity=bank], area|z12-[amenity=bank] { z-index: 4500; icon-image: bank-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=fuel], area|z12-[amenity=fuel] { icon-image: fuel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
+node|z12-[amenity=police], area|z12-[amenity=police] { icon-image: police-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=embassy], area|z12-[amenity=embassy] { icon-image: embassy-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=bicycle_rental], area|z12-[amenity=bicycle_rental] { icon-image: bicycle-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[amenity=post_office] { icon-image: mail-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[amenity=toilets], area|z12-[amenity=toilets] { icon-image: toilets-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[amenity=atm], area|z12-[amenity=atm] { z-index: 4200; icon-image: atm-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[amenity=pharmacy], area|z12-[amenity=pharmacy] { icon-image: pharmacy-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[amenity=cafe], area|z12-[amenity=cafe] { icon-image: cafe-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=restaurant], area|z12-[amenity=restaurant] { icon-image: restaurant-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
+node|z12-[amenity=fast_food], area|z12-[amenity=fast_food] { icon-image: fastfood-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[amenity=bar], area|z12-[amenity=bar] { icon-image: beer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=pub], area|z12-[amenity=pub] { icon-image: beer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
+node|z12-[amenity=nightclub], area|z12-[amenity=nightclub] { icon-image: bar-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[amenity=bureau_de_change] { icon-image: banknote-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[amenity=bench] { icon-image: bench.svg;z-index: 2400; }
+node|z12-[amenity=fountain],area|z12-[amenity=fountain] { icon-image: fountain-l.svg; z-index: 1000; text-offset: 10; font-size: 10;  text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[amenity=drinking_water],area|z12-[amenity=drinking_water],node|z12-[amenity=water_point],area|z12-[amenity=water_point] { icon-image: drinking-water-l.svg; z-index: 2400;}
+node|z12-[natural=spring],area|z12-[natural=spring]{ icon-image: drinking-water-l.svg; z-index: 1000; text-offset: 10; font-size: 10;  text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=library] { icon-image: library-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[amenity=waste_disposal], area|z12-[amenity=waste_disposal] { icon-image: recycling-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[historic=memorial], area|z12-[historic=memorial] { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
+node|z12-[historic=monument],area|z12-[historic=monument]  { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=hunting_stand], area|z12-[amenity=hunting_stand] { icon-image: hunting-tower-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[historic=monument],area|z12-[historic=monument]  { icon-image: monument-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[amenity=hunting_stand], area|z12-[amenity=hunting_stand] { icon-image: hunting-tower-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[office], area|z12-[office] { icon-image: office-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
 
 
 node|z19-[amenity=telephone] { icon-image: phone-l.svg; z-index: 2500; }
@@ -297,176 +280,145 @@ node|z19-[amenity=recycling], area|z19-[amenity=recycling], { icon-image: recycl
 
 
 /* SHOPS */
-node|z19-[shop], area|z19-[shop] { icon-image: shop-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
 
-node|z16-[shop=mall] { icon-image: shop-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
-node|z17-[shop=mall] { icon-image: shop-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
-node|z17-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
-node|z17-[shop=car_repair], area|z17-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;  z-index: 2500;}
+node|z12-[shop=mall] { icon-image: shop-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2600; }
+node|z12-[shop=mall] { icon-image: shop-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600;}
+node|z12-[shop=supermarket] { icon-image: grocery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[shop=car_repair], area|z12-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;  z-index: 2500;}
 
-node|z18-[shop=alcohol] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z17-19[shop=laundry], area|z18-[shop=laundry] { icon-image:laundry-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 25001; }
-node|z18-[shop=car_repair], area|z18-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500; }
+node|z12-[shop=alcohol] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z17-19[shop=laundry], area|z12-[shop=laundry] { icon-image:laundry-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 25001; }
+node|z12-[shop=car_repair], area|z12-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
+node|z19-[shop], area|z19-[shop] { icon-image: shop-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
 
 
 /* SPORT */
 /* LEISURE */
 
-node|z16-[sport=soccer], area|z17-[sport=soccer] { icon-image: soccer-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; }
-node|z17-[leisure=swimming_pool],area|z17-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600; }
-node|z17-[leisure=stadium] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; }
-node|z17-[leisure=pitch] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; }
-node|z17-[sport=multi] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; }
+node|z12-[leisure=stadium] { icon-image: pitch-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
+node|z12-[leisure=stadium] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
 
-node|z17-[leisure=sports_centre] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 6; }
-node|z18-[leisure=playground] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400; }
-node|z17-[leisure=swimming_pool],area|z18-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; }
-node|z17-[leisure=golf_course], area|z18-[leisure=golf_course] { icon-image: golf-l.svg;z-index: 50; } /* нельзя другой z-inex^иначе пропадают все объекты на поле */
+node|z12-[leisure=pitch] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
+node|z12-[leisure=sports_centre] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
+node|z12-[leisure=playground] { icon-image: pitch-l.svg; z-index: 2500; }
+node|z12-[leisure=swimming_pool],area|z12-[leisure=swimming_pool] { icon-image: swimming-l.svg;z-index: 2600; }
+node|z12-[leisure=golf_course], area|z12-[leisure=golf_course] { icon-image: golf-l.svg;z-index: 50; } /* нельзя другой z-inex^иначе пропадают все объекты на поле */
 
-node|z17-[sport=soccer], area|z17-[sport=soccer] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; }
-node|z17-[sport=football], area|z17-[sport=football] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 6; }
-node|z17-[sport=tennis]  { icon-image: tennis-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
-node|z17-[leisure=skiing] { icon-image: skiing-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
+node|z12-[sport=soccer], area|z17[sport=soccer] { icon-image: soccer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[sport=tennis]  { icon-image: tennis-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[leisure=pitch][sport=tennis] { icon-image: tennis-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500; }
 
-node|z18-[sport=swimming] { icon-image: swimming-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[sport=baseball] { icon-image: baseball-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[sport=basketball] { icon-image: basketball-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[sport=american_football] { icon-image: america-football-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[sport=athletics] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
-node|z18-[sport=golf] { icon-image: golf-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-node|z18-[sport=gymnastics] { icon-image: pitch-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[sport=swimming] { icon-image: swimming-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[sport=baseball] { icon-image: baseball-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[sport=basketball] { icon-image: basketball-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[sport=american_football] { icon-image: america-football-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[sport=athletics] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
+node|z12-[sport=golf] { icon-image: golf-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
+node|z12-[sport=gymnastics] { icon-image: pitch-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2500;}
 
 
-node|z16-[highway=speed_camera] { icon-image: speedcam-m.svg; z-index: 2400; }
-node|z16[building=hospital], area|z16-[building=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-node|z17-[building=hospital], area|z17-[building=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
-node|z17-[highway=speed_camera] { icon-image: speedcam-l.svg; z-index: 2400; }
+node|z12-[highway=speed_camera] { icon-image: speedcam-m.svg; z-index: 2400; }
+node|z12-16[building=hospital], area|z12-16[building=hospital] { icon-image: hospital-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
+node|z12-[building=hospital], area|z12-[building=hospital] { icon-image: hospital-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700;  }
+
 
 /* PARKINGS */
-area|z16-[amenity=parking] {fill-color: @parking;fill-oppacity:1;fill-position:background;z-index: 6; }
+area|z12-[amenity=parking] {fill-color: @parking;fill-oppacity:1;fill-position:background;z-index: 6; }
 
 node|z17[amenity=parking] { icon-image: parking-s.svg; z-index: 6;  }
 node|z17[amenity=parking] { icon-image: parking-s.svg;  z-index: 6; }
 node|z17[amenity=parking][access=permissive],
 node|z17[amenity=parking][access=private] { icon-image: zero-icon.svg; z-index: 6; }
 
-node|z18-[amenity=parking], area|z18-[amenity=parking] { icon-image: parking-m.svg;  text-offset: 10; font-size: 11; text: name; text-color: @poi_label;   z-index: 6; }
+node|z12-[amenity=parking], area|z12-[amenity=parking] { icon-image: parking-m.svg;  text-offset: 10; font-size: 10; text: name; text-color: @poi_label;   z-index: 6; }
 
 
-area|z17-[aeroway=heliport],
-area|z17-[aeroway=helipad],
-node|z17-[aeroway=heliport],
-node|z17-[aeroway=helipad]
+area|z12-[aeroway=heliport],
+area|z12-[aeroway=helipad],
+node|z12-[aeroway=heliport],
+node|z12-[aeroway=helipad]
 
-{ icon-image: heliport-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
+{ icon-image: heliport-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2600; }
 
 /* MAN MADE */
 
-node|z14-[landuse=landfill],area|z14-[landuse=landfill]
-{ icon-image: recycling-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2500; }
-
 node|z15-16[man_made=lighthouse], area|z15-16[man_made=lighthouse] { icon-image: lighthouse-m.svg;  text-offset: 10; font-size: 10; text: name; text-color: @poi_label;  z-index: 2700;}
-node|z17-[man_made=lighthouse], area|z17-[man_made=lighthouse] { icon-image: lighthouse-l.svg;  text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
-
-/* BORDER */
-node|z15-[barrier=toll_booth],area|z15-[barrier=toll_booth] { icon-image: toll_booth-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-node|z17-[barrier=toll_booth],area|z15-[barrier=toll_booth] { icon-image: toll_booth-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-
-node|z15-[barrier=border_control]
-{ icon-image:bcontrol-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-node|z17-[barrier=border_control]
-{ icon-image:bcontrol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
-
-line|z17-[barrier=block],
-line|z17-[barrier=bollard],
-line|z17-[barrier=entrance],
-line|z17-[barrier=gate],
-line|z17-[barrier=stile],
-line|z17-[power=tower],
-{ icon-image: dot-m.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2500; }
-
-
+node|z12-[man_made=lighthouse], area|z12-[man_made=lighthouse] { icon-image: lighthouse-l.svg;  text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2700; }
 
+/* BORDER CONTROL*/
+node|z15-[barrier=border_control]{ icon-image:bcontrol-m.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
+node|z12-[barrier=border_control]{ icon-image:bcontrol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2700; }
 
 /* NEW POI */
-node|z18-[craft], area|z18-[craft]{ icon-image: hand-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-
-
-node|z18-[amenity=car_sharing], area|z18-[amenity=car_sharing]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[amenity=post_box], area|z18-[amenity=post_box]{ icon-image: postbox-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z17-[aeroway=gate], area|z17-[aeroway=gate]{ icon-image: gate-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[aeroway=gate], area|z17-[aeroway=gate]{ icon-image: gate-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-
-node|z18-[amenity=bbq], area|z18-[amenity=bbq]{ icon-image: bbq-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[amenity=car_rental], area|z18-[amenity=car_rental]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-/*node|z18-[], area|z18-[] { icon-image: none.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }*/
-
-node|z18-[amenity=vending_machine], area|z18-[amenity=vending_machine] { icon-image: vending-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-/*node|z18-[vending=parking_tickets], area|z18-[vending=parking_tickets] { icon-image: parking-meter-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }*/
-
-
-node|z18-[amenity=casino], area|z18-[amenity=casino]{ icon-image: casino-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[amenity=marketplace], area|z18-[amenity=marketplace]{ icon-image: marketplace-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[amenity=taxi], area|z18-[amenity=taxi]{ icon-image: taxi-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[barrier=lift_gate], area|z18-[barrier=lift_gate] { icon-image: lift_gate-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[barrier=toll_booth], area|z18-[barrier=toll_booth] { icon-image: toll_booth-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[historic=boundary_stone], area|z18-[historic=boundary_stone]{ icon-image: boundary_stone-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[historic=ship], area|z18-[historic=ship]{ icon-image: historic-ship-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[historic=tomb], area|z18-[historic=tomb] { icon-image: tomb-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[historic=wayside_cross], area|z18-[historic=wayside_cross]{ icon-image: wayside_cross-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[historic=wayside_shrine], area|z18-[historic=wayside_shrine] { icon-image: wayside_shrine-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[leisure=dog_park], area|z18-[leisure=dog_park] { icon-image: dog_park-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[leisure=water_park], area|z18-[leisure=water_park]{ icon-image: swimming-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[man_made=windmill], area|z18-[man_made=windmill]{ icon-image: windmill-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[sport=equestrian], area|z18-[sport=equestrian]{ icon-image: equestrian-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-
-
-node|z18-[shop=books], area|z18-[shop=books]{ icon-image: book-shop-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=bakery], area|z18-[shop=bakery] { icon-image: bakery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=beauty], area|z18-[shop=beauty] { icon-image: beauty-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=beverages], area|z18-[shop=beverages] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=bicycle], area|z18-[shop=bicycle]{ icon-image: shop-bicycle-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=butcher], area|z18-[shop=butcher] { icon-image: butcher-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=car], area|z18-[shop=car]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=car_repair], area|z18-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=chemist], area|z18-[shop=chemist] { icon-image: chemist-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=clothes], area|z18-[shop=clothes] { icon-image: clothes-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=computer], area|z18-[shop=computer]{ icon-image: computer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=confectionery], area|z18-[shop=confectionery]{ icon-image: sweets-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=convenience], area|z18-[shop=convenience] { icon-image: convenience-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=department_store], area|z18-[shop=department_store]{ icon-image: department_store-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=doityourself], area|z18-[shop=doityourself] { icon-image: doityourself-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=electronics], area|z18-[shop=electronics] { icon-image: electronics-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=florist], area|z18-[shop=florist]{ icon-image: florist-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=furniture], area|z18-[shop=furniture]{ icon-image: furniture-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=garden_centre], area|z18-[shop=garden_centre]{ icon-image: garden_center-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=gift], area|z18-[shop=gift]{ icon-image: gift-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=greengrocer], area|z18-[shop=greengrocer]{ icon-image: greengrocer-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=hairdresser], area|z18-[shop=hairdresser] { icon-image: hairdresser-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=hardware], area|z18-[shop=hardware]{ icon-image: hardware-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=jewelry], area|z18-[shop=jewelry] { icon-image: jewelry-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=kiosk], area|z18-[shop=kiosk]{ icon-image: kiosk-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=mobile_phone], area|z18-[shop=mobile_phone]{ icon-image: mobile_phone-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=optician], area|z18-[shop=optician]{ icon-image: optician-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=shoes], area|z18-[shop=shoes]{ icon-image: shoes-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[shop=sports], area|z18-[shop=sports]{ icon-image: sports-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[shop=toys], area|z18-[shop=toys]{ icon-image: toys-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-
-node|z18-[sport=archery], area|z18-[sport=archery]{ icon-image: archery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[sport=shooting], area|z18-[sport=shooting]{ icon-image: archery-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[sport=australian_football], area|z18-[sport=australian_football]{ icon-image: australian-football-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[sport=bowls], area|z18-[sport=bowls] { icon-image: bowls-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[sport=cricket], area|z18-[sport=cricket]{ icon-image: cricket-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[sport=curling], area|z18-[sport=curling] { icon-image: curling-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[sport=diving], area|z18-[sport=diving] { icon-image: diving-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[sport=scuba_diving], area|z18-[sport=scuba_diving]{ icon-image: diving-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-node|z18-[tourism=alpine_hut], area|z18-[tourism=alpine_hut]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[tourism=caravan_site], area|z18-[tourism=caravan_site]{ icon-image: caravan_site-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label;z-index: 2400; }
-
-node|z18-[tourism=guest_house], area|z18-[tourism=guest_house]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-
-node|z18-[tourism=motel], area|z18-[tourism=motel]{ icon-image: motel-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[tourism=picnic_site], area|z18-[tourism=picnic_site]{ icon-image: picnic-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-
-node|z18-[power=station], area|z18-[power=station]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
-node|z18-[power=substation], area|z18-[power=substation]{ icon-image: power-l.svg; text-offset: 10; font-size: 11; text: name; text-color: @poi_label; z-index: 2400;}
+
+node|z12-[amenity=car_sharing], area|z12-[amenity=car_sharing]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[amenity=post_box], area|z12-[amenity=post_box]{ icon-image: postbox-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[aeroway=gate], area|z12-[aeroway=gate]{ icon-image: gate-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+
+node|z12-[amenity=bbq], area|z12-[amenity=bbq]{ icon-image: bbq-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[amenity=car_rental], area|z12-[amenity=car_rental]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+/*node|z12-[], area|z12-[] { icon-image: none.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }*/
+
+node|z12-[amenity=vending_machine], area|z12-[amenity=vending_machine] { icon-image: vending-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+/*node|z12-[vending=parking_tickets], area|z12-[vending=parking_tickets] { icon-image: parking-meter-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }*/
+
+
+node|z12-[amenity=casino], area|z12-[amenity=casino]{ icon-image: casino-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[amenity=marketplace], area|z12-[amenity=marketplace]{ icon-image: marketplace-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[amenity=taxi], area|z12-[amenity=taxi]{ icon-image: taxi-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[barrier=lift_gate], area|z12-[barrier=lift_gate] { icon-image: lift_gate-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[barrier=toll_booth], area|z12-[barrier=toll_booth] { icon-image: toll_booth-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[historic=boundary_stone], area|z12-[historic=boundary_stone]{ icon-image: boundary_stone-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[historic=ship], area|z12-[historic=ship]{ icon-image: ship-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[historic=tomb], area|z12-[historic=tomb] { icon-image: tomb-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[historic=wayside_cross], area|z12-[historic=wayside_cross]{ icon-image: wayside_cross-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[historic=wayside_shrine], area|z12-[historic=wayside_shrine] { icon-image: wayside_shrine-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[leisure=dog_park], area|z12-[leisure=dog_park] { icon-image: dog_park-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[leisure=water_park], area|z12-[leisure=water_park]{ icon-image: diving-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[man_made=windmill], area|z12-[man_made=windmill]{ icon-image: windmill-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+
+node|z12-[shop=books], area|z12-[shop=books]{ icon-image: book-shop-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=bakery], area|z12-[shop=bakery] { icon-image: bakery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=beauty], area|z12-[shop=beauty] { icon-image: beauty-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=beverages], area|z12-[shop=beverages] { icon-image: alcohol-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=bicycle], area|z12-[shop=bicycle]{ icon-image: shop-bicycle-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=butcher], area|z12-[shop=butcher] { icon-image: butcher-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=car], area|z12-[shop=car]{ icon-image: car_sharing-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=car_repair], area|z12-[shop=car_repair] { icon-image: car-repair-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=chemist], area|z12-[shop=chemist] { icon-image: chemist-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=clothes], area|z12-[shop=clothes] { icon-image: clothes-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=computer], area|z12-[shop=computer]{ icon-image: computer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=confectionery], area|z12-[shop=confectionery]{ icon-image: sweets-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=convenience], area|z12-[shop=convenience] { icon-image: convenience-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=department_store], area|z12-[shop=department_store]{ icon-image: department_store-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=doityourself], area|z12-[shop=doityourself] { icon-image: doityourself-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=electronics], area|z12-[shop=electronics] { icon-image: electronics-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=florist], area|z12-[shop=florist]{ icon-image: florist-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=furniture], area|z12-[shop=furniture]{ icon-image: furniture-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=garden_centre], area|z12-[shop=garden_centre]{ icon-image: garden_center-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=gift], area|z12-[shop=gift]{ icon-image: gift-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=greengrocer], area|z12-[shop=greengrocer]{ icon-image: greengrocer-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=hairdresser], area|z12-[shop=hairdresser] { icon-image: hairdresser-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=hardware], area|z12-[shop=hardware]{ icon-image: hardware-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=jewelry], area|z12-[shop=jewelry] { icon-image: jewelry-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=kiosk], area|z12-[shop=kiosk]{ icon-image: kiosk-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=mobile_phone], area|z12-[shop=mobile_phone]{ icon-image: mobile_phone-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=optician], area|z12-[shop=optician]{ icon-image: optician-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=shoes], area|z12-[shop=shoes]{ icon-image: shoes-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[shop=sports], area|z12-[shop=sports]{ icon-image: sports-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[shop=toys], area|z12-[shop=toys]{ icon-image: toys-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+
+node|z12-[sport=archery], area|z12-[sport=archery]{ icon-image: archery-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[sport=australian_football], area|z12-[sport=australian_football]{ icon-image: australian-football-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[sport=bowls], area|z12-[sport=bowls] { icon-image: bowls-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[sport=cricket], area|z12-[sport=cricket]{ icon-image: cricket-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[sport=curling], area|z12-[sport=curling] { icon-image: curling-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[sport=diving], area|z12-[sport=diving] { icon-image: diving-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[sport=scuba_diving], area|z12-[sport=scuba_diving]{ icon-image: diving-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+node|z12-[tourism=alpine_hut], area|z12-[tourism=alpine_hut]{ icon-image: alpine_hut-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[tourism=caravan_site], area|z12-[tourism=caravan_site]{ icon-image: caravan_site-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label;z-index: 2400; }
+
+node|z12-[tourism=guest_house], area|z12-[tourism=guest_house]{ icon-image: motel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+
+node|z12-[tourism=motel], area|z12-[tourism=motel]{ icon-image: motel-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
+node|z12-[tourism=picnic_site], area|z12-[tourism=picnic_site]{ icon-image: picnic-l.svg; text-offset: 10; font-size: 10; text: name; text-color: @poi_label; z-index: 2400;}
diff --git a/data/styles/clear/include/Z-INDEXES b/data/styles/clear/include/Z-INDEXES
index d51a5fa6e3..595a5f7c97 100644
--- a/data/styles/clear/include/Z-INDEXES
+++ b/data/styles/clear/include/Z-INDEXES
@@ -11,7 +11,7 @@ area|z0-[natural=glacier]
 {z-index: 1;}
 area|z10-[leisure=beach_resort],
 area|z10-[natural=beach],
-{z-index: 46;}
+{z-index: 1;}
 
 /*LANDUSE 1- */
 
diff --git a/data/styles/clear/include/boundaries.mapcss b/data/styles/clear/include/boundaries.mapcss
index 8267eaafe6..a7d04a435f 100644
--- a/data/styles/clear/include/boundaries.mapcss
+++ b/data/styles/clear/include/boundaries.mapcss
@@ -50,14 +50,6 @@ line|z8[boundary=administrative][admin_level=2]
   z-index: 130;
 }
 
-line|z9-[boundary=administrative][admin_level=2]
-{
-  color: @border_country;
-  width: 1.4;
-  opacity: 1;
-  z-index: 130;
-}
-
 line|z4[boundary=administrative][admin_level=3]
 {
   color: @border_region;
@@ -116,8 +108,6 @@ line|z10-[boundary=administrative][admin_level=4]
   z-index: 130;
   dashes: 1.8,0.9;
 }
-
-
 /*
 line|z12-[boundary=administrative][admin_level=4]
 {
diff --git a/data/styles/clear/include/buildings.mapcss b/data/styles/clear/include/buildings.mapcss
index 45b981bcf9..fc6603c9bc 100644
--- a/data/styles/clear/include/buildings.mapcss
+++ b/data/styles/clear/include/buildings.mapcss
@@ -1,36 +1,31 @@
-area|z14[building],
-area|z14[landuse=garages]
+area|z14[building]
 {
   fill-color: @building;
   fill-opacity: 0.5;
   z-index: 150;
 }
-area|z15[building],
-area|z15[landuse=garages]
+area|z15[building]
 {
   fill-color: @building;
   fill-opacity: 0.6;
   z-index: 150;
 }
 
-area|z16[building],
-area|z16[landuse=garages]
+area|z16[building]
 {
   fill-color: @building;
   fill-opacity: 0.8;
   z-index: 150;
 }
 
-area|z17[building],
-area|z17[landuse=garages]
+area|z17[building]
 {
   fill-color: @building_dark;
   opacity: 0.9;
   z-index: 150;
 }
 
-area|z18-[building],
-area|z18-[landuse=garages]
+area|z18-[building]
 {
   fill-color: @building_dark;
   opacity: 1;
diff --git a/data/styles/clear/include/labels.mapcss b/data/styles/clear/include/labels.mapcss
index 546eee34d0..b0a3b73669 100644
--- a/data/styles/clear/include/labels.mapcss
+++ b/data/styles/clear/include/labels.mapcss
@@ -20,7 +20,7 @@ node|z1[place=continent]
 node|z2[place=continent]
 {
   text: name;
-  font-size: 12;
+  font-size: 14;
   text-color: @country_label;
   max-width: 5;
   z-index: 999;
@@ -31,14 +31,14 @@ node|z2[place=continent]
 node|z3[place=country]
 {
   text: name;
-  font-size: 10;
+  font-size: 10.5;
   text-color: @country_label;
   z-index: 1000;
 }
 node|z3[place=country]::int_name
 {
   text: int_name;
-  font-size: 8;
+  font-size: 8.5;
   text-color: @country_label;
   z-index: 1000;
 }
@@ -62,14 +62,14 @@ node|z4[place=country]::int_name
 node|z5[place=country]
 {
   text: name;
-  font-size: 13;
+  font-size: 14;
   text-color: @country_label;
   z-index: 1000;
 }
 node|z5[place=country]::int_name
 {
   text: int_name;
-  font-size: 11;
+  font-size: 12;
   text-color: @country_label;
   z-index: 1000;
 }
@@ -136,8 +136,8 @@ node|z4[place=city][capital!=2][population>=1000000],
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1400;
 }
 node|z4[place=city][capital!=2][population>=1000000]::int_name
@@ -146,8 +146,8 @@ node|z4[place=city][capital!=2][population>=1000000]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1400;
 }
 
@@ -159,8 +159,8 @@ node|z4[place=city][capital=2],
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 node|z4[place=city][capital=2]::int_name
@@ -170,8 +170,8 @@ node|z4[place=city][capital=2]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 /* CITIES ZOOM 5*/
@@ -182,8 +182,8 @@ node|z4[place=city][capital=2]::int_name
     text: name;
     text-color: @label_dark;
     text-halo-radius: 1;
-    text-halo-opacity: 0.6;
-    text-halo-color: @label_halo_light;
+    text-halo-opacity: 0.5;
+    text-halo-color: @label_halo_medium;
     z-index: 1400;
   }
 
@@ -197,31 +197,31 @@ node|z4[place=city][capital=2]::int_name
     text: int_name;
     text-color: @label_dark;
     text-halo-radius: 1;
-    text-halo-opacity: 0.6;
-    text-halo-color: @label_halo_light;
+    text-halo-opacity: 0.5;
+    text-halo-color: @label_halo_medium;
     z-index: 1400;
   }
 node|z5[place=city][capital=2]
 {
   icon-image: star-m.svg;
   text-offset: 3;
-  font-size: 10.4;
+  font-size: 10;
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
   text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 node|z5[place=city][capital=2]::int_name
 {
   text-offset: 9;
-  font-size: 9.4;
+  font-size: 9;
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 
@@ -229,12 +229,12 @@ node|z5[place=city][capital=2]::int_name
 
 node|z6[place=city][capital!=2][population>=50000],
 {
-  font-size: 10.4;
+  font-size: 10;
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.6;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1400;
 }
 
@@ -244,12 +244,12 @@ node|z6[place=city][capital!=2][population>=50000],
   */
   node|z6[place=city][capital!=2][population>=50000]::int_name
   {
-    font-size: 9.4;
+    font-size: 9;
     text: int_name;
     text-color: @label_dark;
     text-halo-radius: 1;
-    text-halo-opacity: 0.6;
-    text-halo-color: @label_halo_light;
+    text-halo-opacity: 0.5;
+    text-halo-color: @label_halo_medium;
     z-index: 1400;
   }
 
@@ -257,23 +257,23 @@ node|z6[place=city][capital=2]
  {
   icon-image: star-l.svg;
   text-offset: 4;
-  font-size: 11.6;
+  font-size: 10;
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 node|z6[place=city][capital=2]::int_name
 {
-  text-offset: 4;
-  font-size: 10.6;
+  text-offset: 10;
+  font-size: 9;
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 
@@ -290,8 +290,8 @@ node|z7[place=city][capital!=2][population>=40000],
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color:@label_halo_light;
+  text-halo-opacity: 0.6;
+  text-halo-color: @label_halo_medium;
   z-index: 1400;
 }
 node|z7[place=city][capital!=2][population>=40000]::int_name
@@ -300,8 +300,8 @@ node|z7[place=city][capital!=2][population>=40000]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.6;
+  text-halo-color: @label_halo_medium;
   z-index: 1400;
 }
 node|z7[place=city][capital=2]{
@@ -311,8 +311,8 @@ node|z7[place=city][capital=2]{
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity:1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.6;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 node|z7[place=city][capital=2]::int_name
@@ -322,8 +322,8 @@ node|z7[place=city][capital=2]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.6;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 node|z7[place=state]
@@ -343,25 +343,28 @@ node|z7[place=state]::int_name
 
 /* CITIES ZOOM 8*/
 
-node|z8[place=city][capital!=2][population>=40000]
+node|z8[place=city][capital!=2][population>=40000],
 {
-  font-size: 10.5;
+  font-size: 11;
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.6;
+  text-halo-color: @label_halo_medium;
   z-index: 1400;
 }
-
+  /*
+  icon-image: dot-m.svg;
+  text-offset: 3;
+  */
   node|z8[place=city][capital!=2][population>=40000]::int_name
   {
-    font-size: 9.5;
+    font-size: 10;
     text: int_name;
     text-color: @label_dark;
     text-halo-radius: 1;
-    text-halo-opacity: 1;
-    text-halo-color: @label_halo_light;
+    text-halo-opacity: 0.6;
+    text-halo-color: @label_halo_medium;
     z-index: 1400;
   }
 
@@ -369,23 +372,23 @@ node|z8[place=city][capital=2]
  {
   icon-image: star-l.svg;
   text-offset: 5;
-  font-size: 11.5;
+  font-size: 12;
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.6;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 node|z8[place=city][capital=2]::int_name
 {
   text-offset: 11;
-  font-size: 10.5;
+  font-size: 11;
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.6;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 
@@ -426,10 +429,13 @@ node|z9[place=city]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 0.5;
-  text-halo-opacity: 1;
-  text-halo-color:@label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1200;
-
+  /*
+  icon-image: dot-s.svg;
+  text-offset: 4;
+  */
 }
 node|z9[place=city]::int_name
 {
@@ -437,10 +443,13 @@ node|z9[place=city]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 0.5;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1200;
-
+  /*
+  icon-image: dot-s.svg;
+  text-offset: 4;
+  */
 }
 
 node|z9[place=city][capital=2]
@@ -451,8 +460,8 @@ node|z9[place=city][capital=2]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 0.5;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 
@@ -463,8 +472,8 @@ node|z9[place=city][capital=2]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 0.5;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1450;
 }
 node|z9[place=town][population>=20000]
@@ -507,7 +516,7 @@ node|z10[place=city]
   text: name;
   text-color: @label_medium;
   text-halo-radius:1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1200;
 }
@@ -517,7 +526,7 @@ node|z10[place=city]::int_name
   text: int_name;
   text-color: @label_medium;
   text-halo-radius:1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1200;
 }
@@ -530,7 +539,7 @@ node|z10[place=city][capital=2]
   text: name;
   text-color: @label_dark;
   text-halo-radius:1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1450;
 }
@@ -541,7 +550,7 @@ node|z10[place=city][capital=2]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius:1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1450;
 }
@@ -551,8 +560,8 @@ node|z10[place=town]
   text: name;
   text-color: @city_label;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 1;
+  text-halo-color: @label_halo_bg;
   z-index: 1100;
 }
 node|z10[place=town]::int_name {
@@ -560,8 +569,8 @@ node|z10[place=town]::int_name {
   text: int_name;
   text-color: @city_label;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 1;
+  text-halo-color: @label_halo_bg;
   z-index: 1100;
 }
 
@@ -588,7 +597,7 @@ node|z11[place=city]
   text: name;
   text-color: @label_dark;
   text-halo-radius:1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1200;
 }
@@ -598,7 +607,7 @@ node|z11[place=city]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius:1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1200;
 }
@@ -610,7 +619,7 @@ node|z11[place=city][capital=2]
   text: name;
   text-color: @label_dark;
   text-halo-radius:1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1450;
 }
@@ -622,7 +631,7 @@ node|z11[place=city][capital=2]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius:1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1450;
 }
@@ -632,8 +641,8 @@ node|z11[place=town]
   text: name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1100;
 }
 node|z11[place=town]::int_name
@@ -642,8 +651,8 @@ node|z11[place=town]::int_name
   text: int_name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1100;
 }
 node|z11[place=village]
@@ -652,8 +661,7 @@ node|z11[place=village]
   text: name;
   text-color: @city_label;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
+  text-halo-color: @city_halo;
   z-index: 1050;
 }
 node|z11[place=village]::int_name
@@ -662,8 +670,7 @@ node|z11[place=village]::int_name
   text: name;
   text-color: @city_label;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
+  text-halo-color: @city_halo;
   z-index: 1050;
 }
 
@@ -676,7 +683,7 @@ node|z12[place=city]
   text: name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1200;
 }
@@ -686,7 +693,7 @@ node|z12[place=city]::int_name
   text: int_name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1200;
 
@@ -699,7 +706,7 @@ node|z12[place=city][capital=2]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1450;
 }
@@ -711,7 +718,7 @@ node|z12[place=city][capital=2]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1450;
 }
@@ -721,8 +728,8 @@ node|z12[place=town]
   text: name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1100;
 }
 node|z12[place=town]::int_name
@@ -731,8 +738,8 @@ node|z12[place=town]::int_name
   text: int_name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
-  text-halo-color: @label_halo_light;
+  text-halo-opacity: 0.5;
+  text-halo-color: @label_halo_medium;
   z-index: 1100;
 }
 node|z12[place=village]
@@ -741,8 +748,7 @@ node|z12[place=village]
   text: name;
   text-color: @city_label;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
+  text-halo-color: @city_halo;
   z-index: 1010;
 }
 node|z12[place=village]::int_name
@@ -751,8 +757,7 @@ node|z12[place=village]::int_name
   text: int_name;
   text-color: @city_label;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
+  text-halo-color: @city_halo;
   z-index: 1010;
 }
 
@@ -764,7 +769,7 @@ node|z13-[place=city]
   text: name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1200;
 }
@@ -774,7 +779,7 @@ node|z13-[place=city]::int_name
   text: int_name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1200;
 }
@@ -786,7 +791,7 @@ node|z13-[place=city][capital=2]
   text: name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1450;
 }
@@ -797,7 +802,7 @@ node|z13-[place=city][capital=2]::int_name
   text: int_name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1450;
 }
@@ -807,7 +812,7 @@ node|z13-[place=town]
   text: name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1100;
 }
@@ -817,28 +822,28 @@ node|z13-[place=town]::int_name
   text: int_name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity:0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1100;
 }
 
 node|z13-[place=village]
 {
-  font-size: 12;
+  font-size: 13;
   text: name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1010;
 }
 node|z13-[place=village]::int_name
  {
-  font-size: 10;
+  font-size: 12;
   text: int_name;
   text-color: @label_medium;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 1010;
 }
@@ -846,11 +851,11 @@ node|z13-[place=village]::int_name
 
 node|z13-[place=hamlet]
 {
-  font-size: 11;
+  font-size: 12;
   text: name;
   text-color: @label_light;
   text-halo-radius: 1;
-  text-halo-opacity: 0.6;
+  text-halo-opacity: 0.3;
   text-halo-color: @label_halo_light;
   z-index: 1002;
 }
@@ -886,7 +891,7 @@ line|z10-11[highway=trunk_link] {
   font-size: 10;
   text: name;
   text-color: @label_dark;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.3;
   text-halo-radius: 1;
   text-halo-color: @label_halo_medium;
 }
@@ -896,7 +901,7 @@ line|z10-11[highway=primary_link] {
   font-size: 10;
   text: name;
   text-color: @label_medium;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.3;
   text-halo-radius: 1;
   text-halo-color: @label_halo_medium;
 
@@ -906,7 +911,7 @@ line|z10-11[highway=secondary] {
   font-size: 10;
   text: name;
   text-color: @label_light;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.3;
   text-halo-radius: 1;
   text-halo-color: @label_halo_medium;
 }
@@ -919,9 +924,7 @@ line|z12-13[highway=motorway_link],
 line|z12-13[highway=trunk_link],
 line|z12-13[highway=primary],
 line|z12-13[highway=primary_link],
-line|z12-13[highway=secondary],
-line|z12-13[highway=residential],
-line|z12-13[highway=tertiary]  {
+line|z12-13[highway=secondary] {
   shield-font-size: 9;
   shield-text-color: @shield;
   shield-text-halo-radius: 1;
@@ -937,18 +940,18 @@ line|z12-13[highway=motorway_link],
 line|z12-13[highway=trunk_link] {
   font-size: 12;
   text: name;
-  text-color: @label_medium;
-  text-halo-opacity: 0.9;
+  text-color: @label_dark;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
-  text-halo-color: @label_halo_medium;
+  text-halo-color: @label_halo_light;
 }
 
 line|z12-13[highway=primary],
 line|z12-13[highway=primary_link] {
   font-size: 10;
   text: name;
-  text-color: @label_medium;
-  text-halo-opacity: 0.9;
+  text-color: @label_dark;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_medium;
 }
@@ -957,7 +960,7 @@ line|z12-13[highway=secondary] {
   font-size: 10;
   text: name;
   text-color: @label_light;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.3;
   text-halo-radius: 1;
   text-halo-color: @road_label_halo;
 }
@@ -967,8 +970,8 @@ line|z12-13[highway=tertiary] {
   font-size: 10;
   text: name;
   text-color: @label_light;
-  text-halo-opacity: 0.9;
-  text-halo-radius: 1;
+  text-halo-opacity: 0;
+  text-halo-radius: 0;
   text-halo-color: @road_label_halo;
 }
 
@@ -983,9 +986,7 @@ line|z14[highway=motorway_link],
 line|z14[highway=trunk_link],
 line|z14[highway=primary],
 line|z14[highway=primary_link],
-line|z14[highway=secondary],
-line|z14[highway=residential],
-line|z14[highway=tertiary]  {
+line|z14[highway=secondary] {
   shield-font-size: 9;
   shield-text-color: @shield;
   shield-text-halo-radius: 1;
@@ -1000,9 +1001,7 @@ line|z15[highway=motorway_link],
 line|z15[highway=trunk_link],
 line|z15[highway=primary],
 line|z15[highway=primary_link],
-line|z15[highway=secondary],
-line|z15[highway=residential],
-line|z15[highway=tertiary]  {
+line|z15[highway=secondary] {
   shield-font-size: 9;
   shield-text-color: @shield;
   shield-text-halo-radius: 1;
@@ -1018,7 +1017,7 @@ line|z14-15[highway=primary] {
   font-size: 13;
   text: name;
   text-color: @label_dark;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_light;
 }
@@ -1032,12 +1031,11 @@ line|z14[highway=residential],
 line|z14[highway=tertiary],
 line|z14[highway=unclassified],
 line|z14[highway=living_street],
-line|z14[highway=pedestrian],
- {
+line|z14[highway=pedestrian] {
   font-size: 10;
   text: name;
   text-color: @label_medium;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_medium;
 }
@@ -1055,7 +1053,7 @@ line|z15[highway=pedestrian] {
   font-size: 11;
   text: name;
   text-color: @label_medium;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_medium;
 }
@@ -1066,9 +1064,7 @@ line|z15[highway=pedestrian] {
 line|z16[highway=motorway],
 line|z16[highway=trunk],
 line|z14[highway=primary],
-line|z14[highway=secondary],
-line|z12-13[highway=residential],
-line|z12-13[highway=tertiary]  {
+line|z14[highway=secondary] {
   shield-font-size: 9;
   shield-text-color: @shield;
   shield-text-halo-radius: 1;
@@ -1093,7 +1089,7 @@ line|z16-17[highway=secondary] {
   font-size: 14;
   text: name;
   text-color: @label_dark;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_light;
 }
@@ -1101,37 +1097,15 @@ line|z16-17[highway=secondary] {
 /* SECONDARY LABELS */
 line|z15-[highway=bridleway],
 line|z15-[highway=path],
-line|z15-[highway=footway],
-line|z15-[highway=cycleway]  {
-  font-size: 8;
-  text: name;
-  text-color: @label_medium;
-  text-halo-opacity: 0.8;
-  text-halo-radius: 1;
-  text-halo-color: @label_halo_light;
-}
-line|z16-17[highway=bridleway],
-line|z16-17[highway=path],
-line|z16-17[highway=footway],
-line|z16-17[highway=cycleway]  {
+line|z15-[highway=footway] {
   font-size: 9;
   text: name;
   text-color: @label_medium;
-  text-halo-opacity: 0.8;
-  text-halo-radius: 1;
-  text-halo-color: @label_halo_light;
-}
-line|z18-[highway=bridleway],
-line|z18-[highway=path],
-line|z18-[highway=footway],
-line|z18-[highway=cycleway]  {
-  font-size: 10;
-  text: name;
-  text-color: @label_medium;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_light;
 }
+
 line|z16-17[highway=primary_link],
 line|z16-17[highway=motorway_link],
 line|z16-17[highway=trunk_link],
@@ -1139,27 +1113,17 @@ line|z16-17[highway=residential],
 line|z16-17[highway=tertiary],
 line|z16-17[highway=unclassified],
 line|z16-17[highway=living_street],
-
- {
+line|z16-17[highway=pedestrian],
+line|z16-17[highway=bridleway],
+line|z16-17[highway=path] {
   font-size: 12;
   text: name;
   text-color: @label_medium;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_light;
 }
 
-line|z16-17[highway=pedestrian],
-line|z16-17[highway=service]
-{
- font-size: 10;
- text: name;
- text-color: @label_medium;
- text-halo-opacity: 0.8;
- text-halo-radius: 1;
- text-halo-color: @label_halo_light;
-}
-
 /* ZOOM 18+ */
 
 /*SHIELDS FOR TRUNKS */
@@ -1182,7 +1146,7 @@ line|z18-[highway=secondary] {
   font-size: 14;
   text: name;
   text-color: @label_dark;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_light;
 }
@@ -1196,12 +1160,13 @@ line|z18-[highway=tertiary],
 line|z18-[highway=unclassified],
 line|z18-[highway=living_street],
 line|z18-[highway=pedestrian],
-line|z18-[highway=service],
- {
+line|z18-[highway=path],
+line|z18-[highway=bridleway],
+line|z18-[highway=service] {
   font-size: 12;
   text: name;
   text-color: @label_medium;
-  text-halo-opacity: 1;
+  text-halo-opacity: 0.5;
   text-halo-radius: 1;
   text-halo-color: @label_halo_light;
 }
@@ -1278,7 +1243,7 @@ node|z16[addr:housenumber][addr:street],
 
 {
   text:  "addr:housename";
-  font-size: 9;
+  font-size: 8;
   text-color: @housename;
   text-position: center;
   z-index: 300;
@@ -1290,7 +1255,7 @@ area|z17[addr:housenumber][addr:street],
 node|z17[addr:housenumber][addr:street]
 {
   text: name;
-  font-size: 9.6;
+  font-size: 9;
   text-color: @building_label;
   text-position: center;
   z-index: 300;
@@ -1301,7 +1266,7 @@ area|z17[addr:housenumber][addr:street]::int_name,
 node|z17[addr:housenumber][addr:street]::int_name
 {
   text: int_name;
-  font-size: 8.4;
+  font-size: 8;
   text-color: @building_label;
   text-position: center;
   z-index: 300;
@@ -1313,7 +1278,7 @@ area|z18-[addr:housenumber][addr:street],
 node|z18-[addr:housenumber][addr:street]
 {
   text: name;
-  font-size: 11;
+  font-size: 10;
   text-color: @building_label;
   text-position: center;
   z-index: 300;
@@ -1324,7 +1289,7 @@ area|z18-[addr:housenumber][addr:street]::int_name,
 node|z18-[addr:housenumber][addr:street]::int_name
 {
   text: name;
-  font-size: 10;
+  font-size: 9;
   text-color: @building_label;
   text-position: center;
   z-index: 300;
@@ -1363,16 +1328,8 @@ area|z15-[area:highway=footway],
 /* INDUSTRIAL */
 
 area|z15-[landuse=industrial],
-node|z15-[landuse=industrial],
 area|z15-[landuse=construction],
-area|z15-[landuse=railway],
-area|z15-[landuse=quarry],
-node|z15-[landuse=construction],
-node|z15-[landuse=landfill],
-node|z15-[landuse=railway],
-node|z15-[landuse=quarry],
-
-{
+node|z15-[landuse=industrial]{
   text: name;
   font-size: 10;
   text-color: @city_label;
@@ -1403,31 +1360,31 @@ node|z16[addr:housenumber][addr:street]
 
 node|z1-2[place=ocean]{
   text: name;
-  font-size: 14;
+  font-size: 15;
   text-color: @water_label;
   z-index: 3000;
 }
 node|z3[place=ocean]{
   text: name;
-  font-size: 15;
+  font-size: 16;
   text-color: @water_label;
   z-index: 3000;
 }
 node|z4[place=ocean]{
   text: name;
-  font-size: 16;
+  font-size: 17;
   text-color: @water_label;
   z-index: 3000;
 }
 node|z5-[place=ocean]{
   text: name;
-  font-size: 18;
+  font-size: 19;
   text-color: @water_label;
   z-index: 3000;
 }
 node|z4-[place=sea]{
   text: name;
-  font-size: 12;
+  font-size: 14;
   text-color: @water_label;
   z-index: 3000;
 }
@@ -1438,17 +1395,15 @@ area|z12-[place=archipelago],
 area|z12-[place=island]
 {
   text: name;
-  font-size: 9;
+  font-size: 10;
   text-color: @district_label;
 }
 
 node|z14-15[natural=water],
-node|z14-15[natural=bay],
-area|z14-15[natural=water],
-area|z14-15[natural=bay]
+node|z14-15[natural=bay]
 {
   text: name;
-  font-size: 10;
+  font-size: 8;
   text-color: @water_label;
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
@@ -1456,13 +1411,7 @@ area|z14-15[natural=bay]
 
 }
 node|z16-[natural=water],
-node|z16-[natural=bay],
-area|z16-[natural=water],
-area|z16-[natural=bay],
-node|z16-[natural=wetland],
-node|z16-[natural=marsh]
-area|z16-[natural=wetland],
-area|z16-[natural=marsh]
+node|z16-[natural=bay]
 {
   text: name;
   font-size: 11;
@@ -1517,7 +1466,6 @@ line|z11-[waterway=river] {
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
   text-halo-radius: 0;
-  z-index: 10000;
 }
 
 line|z11-[waterway=riverbank] {
@@ -1527,24 +1475,12 @@ line|z11-[waterway=riverbank] {
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
   text-halo-radius: 0;
-  z-index: 10000;
-}
-
-line|z13-[waterway=riverbank],
-line|z13-[waterway=river] {
-  text: name;
-  font-size: 10;
-  text-color: @water_label;
-  text-halo-opacity: 0.1;
-  text-halo-color: @halo_water_lable;
-  text-halo-radius: 0;
-  z-index: 10000;
 }
 
 line|z13-[waterway=stream],
 line|z13-[waterway=canal] {
   text: name;
-  font-size: 10;
+  font-size: 11;
   text-color: @water_label;
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
@@ -1553,28 +1489,26 @@ line|z13-[waterway=canal] {
 }
 line|z15-[waterway=river] {
   text: name;
-  font-size: 12;
+  font-size: 10;
   text-color: @water_label;
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
   text-halo-radius: 0;
-  z-index: 10000;
 }
 
 line|z15-[waterway=riverbank] {
   text: name;
-  font-size: 12;
+  font-size: 10;
   text-color: @water_label;
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
   text-halo-radius: 0;
-  z-index: 10000;
 }
 
 line|z15-[waterway=stream],
 line|z15-[waterway=canal] {
   text: name;
-  font-size: 11;
+  font-size: 10;
   text-color: @water_label;
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
@@ -1583,22 +1517,20 @@ line|z15-[waterway=canal] {
 }
 line|z17-[waterway=river] {
   text: name;
-  font-size: 12;
+  font-size: 11;
   text-color: @water_label;
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
   text-halo-radius: 0;
-  z-index: 10000;
 }
 
 line|z17-[waterway=riverbank] {
   text: name;
-  font-size: 12;
+  font-size: 11;
   text-color: @water_label;
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
   text-halo-radius: 0;
-  z-index: 10000;
 }
 
 line|z17-[waterway=stream],
@@ -1618,7 +1550,6 @@ line|z18-[waterway=river] {
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
   text-halo-radius: 0;
-  z-index: 10000;
 }
 
 line|z18-[waterway=riverbank] {
@@ -1628,7 +1559,6 @@ line|z18-[waterway=riverbank] {
   text-halo-opacity: 0.1;
   text-halo-color: @halo_water_lable;
   text-halo-radius: 0;
-  z-index: 10000;
 }
 
 line|z18-[waterway=stream],
@@ -1768,7 +1698,7 @@ area|z16[landuse=forest][name]{
   icon-image: park-m.svg;
   text-offset: 10;
   text: name;
-  font-size: 11;
+  font-size: 12;
   text-color: @park_label;
   text-halo-opacity: 0.8;
   text-halo-color: @halo_park_lable;
@@ -1778,7 +1708,7 @@ area|z16[leisure=garden][name] {
   icon-image: garden-m.svg;
   text-offset: 10;
   text: name;
-  font-size: 11;
+  font-size: 12;
   text-color: @park_label;
   text-halo-opacity: 0.8;
   text-halo-color: @halo_park_lable;
@@ -1822,7 +1752,7 @@ area|z17[leisure=garden][name] {
   icon-image: garden-l.svg;
   text-offset: 10;
   text: name;
-  font-size: 12;
+  font-size: 11;
   text-color: @park_label;
   text-halo-opacity: 0.8;
   text-halo-color: @halo_park_lable;
diff --git a/data/styles/clear/include/landuse.mapcss b/data/styles/clear/include/landuse.mapcss
index df0a709fd5..009346f122 100644
--- a/data/styles/clear/include/landuse.mapcss
+++ b/data/styles/clear/include/landuse.mapcss
@@ -12,7 +12,6 @@ fill-color: @background;
 area|z12-[man_made=pier],
 area|z12-[man_made=breakwater],
 
-
  {
   fill-color: @background;
   fill-opacity: 1;
@@ -21,9 +20,7 @@ area|z12-[man_made=breakwater],
 }
 
 line|z14-[man_made=pier],
-line|z14-[man_made=breakwater],
-line|z14-[man_made=cutline]
-
+line|z14-[man_made=breakwater]
 { casing-width: 2;
   casing-color: @background;
   fill-color: @background;
@@ -32,8 +29,7 @@ line|z14-[man_made=cutline]
  fill-position: background;
 }
 line|z17-[man_made=pier],
-line|z17-[man_made=breakwater],
-line|z17-[man_made=cutline]
+line|z17-[man_made=breakwater]
 { casing-width: 2;
   casing-color: @background;
   fill-color: @background;
@@ -49,15 +45,12 @@ area|z14-[area:highway=pedestrian],
 area|z14-[highway=footway][area?][!sac_scale],
 area|z14-[area:highway=footway],
 area|z14-[area:highway=living_street],
-area|z16-[public_transport=platform],
-area|z16-[railway=platform]
-
 {
   fill-color: @pedestrian_area;
   fill-position: background;
   fill-opacity: 1;
   z-index: 44;
-
+  
 }
 
 area|z16-[highway=pedestrian][area?],
@@ -78,12 +71,7 @@ area|z16-[area:highway=living_street],
 
 
 area|z15-[landuse=industrial],
-area|z15-[landuse=construction],
-area|z15-[landuse=landfill],
-area|z15-[landuse=railway],
-area|z15-[landuse=quarry]
-
-{
+area|z15-[landuse=construction]{
   fill-color: @industrial;
   fill-position: background;
   fill-opacity: 1;
@@ -149,23 +137,10 @@ area|z18-[amenity=university] {
   z-index: 1;
 }
 
-area|z15-[leisure=stadium],
-area|z17-[leisure=playground],
-area|z17-[sport=multi]
-  {
-  fill-color: @sport;
-  fill-position: background;
-  fill-opacity: 1;
-  z-index: 5;
-}
-
-
-area|z15-[leisure=pitch],
+area|z16-[leisure=pitch],
 area|z16-[sport=soccer],
 area|z15-[leisure=stadium],
-area|z17-[leisure=playground],
-area|z17-[sport=multi]
-  {
+area|z17-[leisure=playground]  {
   fill-color: @sport;
   fill-position: background;
   fill-opacity: 1;
diff --git a/data/styles/clear/include/natural.mapcss b/data/styles/clear/include/natural.mapcss
index 9899ee7f46..26a7745f0e 100644
--- a/data/styles/clear/include/natural.mapcss
+++ b/data/styles/clear/include/natural.mapcss
@@ -1,4 +1,3 @@
-
 /* land */
 
 area|z0-9[natural=land]
@@ -9,9 +8,7 @@ area|z0-9[natural=land]
 	z-index: 0;
 }
 
-area|z10-[natural=land],
-area|z10-[place=islet],
-area|z10-[place=islet]
+area|z10-[natural=land]
 {
 	fill-opacity: 1;
 	fill-color: @background;
@@ -58,8 +55,6 @@ area|z13-[leisure=swimming_pool],
 area|z0-[natural=lake],
 area|z0-[natural=pond],
 area|z0-[natural=water],
-area|z0-[natural=salt_pond],
-area|z0-[landuse=salt_pond],
 area|z0-[waterway=dock],
 area|z0-[waterway=riverbank],
 area|z10-[waterway=river],
@@ -71,11 +66,10 @@ area|z10-[natural=bay],
 }
 
 
-area|z11-19[natural=wetland],
-area|z11-19[natural=marsh] {
+area|z11-[natural=wetland] {
 	z-index: 49;
-	fill-opacity: 1;
-	fill-color: @wetland;
+	fill-opacity: 0.3;
+	fill-color: @water;
 	fill-position: background;
 
 }
@@ -84,154 +78,91 @@ area|z11-19[natural=marsh] {
 
 line|z10[waterway=river],
 line|z10[waterway=riverbank] {
-	width: 1;
+	width: 0.6;
 	opacity: 1;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
-}
-
-line|z10-19[waterway=river][tunnel?],
- {
 }
 
 line|z11-12[waterway=river],
 line|z11-12[waterway=riverbank] {
-	width: 1.2;
-	opacity: 1;
-	color: @river;
-	z-index: 50;
-	-x-me-line-priority: -15800;
-}
-
-
-line|z13[waterway=stream],
-line|z13[waterway=canal]{
-	width: 0.7;
-	opacity: 1;
-	color: @river;
-	z-index: 50;
-	-x-me-line-priority: -15800;
-}
-
-
-line|z13[waterway=stream][intermittent=yes] {
-	width: 0.7;
-	opacity: 1;
-	color: @river;
-	dashes: 2.7,2.7;
-	z-index: 49;
-	-x-me-line-priority: -15800;
-}
-
-line|z13[waterway=river] {
-	width: 1.6;
+	width: 0.8;
 	opacity: 1;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
 }
 
-line|z13[waterway=riverbank] {
-	width: 1.6;
+line|z13-14[waterway=stream],
+line|z13-14[waterway=canal]{
+	width: 0.2;
 	opacity: 1;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
-}
-line|z14[waterway=stream],
-line|z14[waterway=canal]{
-	width: 1;
-	opacity: 1;
-	color: @river;
-	z-index: 50;
-	-x-me-line-priority: -15800;
 }
 
-
-line|z14[waterway=stream][intermittent=yes] {
-	width: 1;
-	opacity: 1;
-	color: @river;
+line|z13-14[waterway=stream][intermittent=yes] {
 	dashes: 2.7,2.7;
 	z-index: 49;
-	-x-me-line-priority: -15800;
 }
 
-line|z14[waterway=river] {
-	width: 1.8;
+line|z13-14[waterway=river] {
+	width: 1.2;
 	opacity: 1;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
 }
 
-line|z14[waterway=riverbank] {
-	width: 1.8;
+line|z13-14[waterway=riverbank] {
+	width: 1.2;
 	opacity: 1;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
 }
 line|z15-[waterway=stream],
 line|z15-[waterway=canal]
  {
-	width: 1.6;
+	width: 1;
 	opacity: 1;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
 }
 
 line|z15-[waterway=stream][intermittent=yes] {
 	dashes: 4.95;
-	width: 1.4;
+	width: 1;
 	opacity: 1;
 	color: @river;
 	z-index: 49;
-	-x-me-line-priority: -15800;
 }
 line|z15-[waterway=river] {
-	width: 2.2;
+	width: 1.8;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
 }
 
 line|z15-[waterway=riverbank] {
-	width: 2.2;
+	width: 1.8;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
 }
 
 
 area|z15-[waterway=dam],
 line|z15-[waterway=dam],
-line|z15-[waterway=weir],
+line|z15-[waterway=wair],
  {
 	width: 1;
 	opacity: 1;
 	color: @bridge_casing;
 	z-index: 110;
 }
-line|z16-[waterway=canal],
-node|z16-[waterway=lock]
+line|z16-[waterway=canal]
 {
 	width: 1.5;
 	color: @river;
 	z-index: 50;
-	-x-me-line-priority: -15800;
 }
-
-node|z16-[waterway=lock_gate],
- {
-	icon-image: dot-m.svg;
-	z-index: 110;
-}
-
-line|z17-[waterway=ditch],
-line|z17-[waterway=drain] {
+line|z17-[waterway=ditch] {
 	width: 1.8;
 	opacity: 1;
 	color: @river;
@@ -355,40 +286,9 @@ area|z16-[leisure=park], area|z16-[leisure=garden]  {
   z-index: 40;
 }
 
-area|z12-[landuse=grass],
-area|z12-[natural=grassland],
-area|z12-[leisure=golf_course],
-area|z12-[natural=heath],
-
-{
-  fill-color: @green0;
-  fill-opacity: 1;
-  z-index: 45;
-	fill-position: background;
-}
-
-area|z12-[landuse=farmland],
-area|z12-[landuse=allotments],
-area|z12-[natural=scrub],
-area|z12-[landuse=orchard],
-area|z12-[landuse=vineyard],
-area|z12-[landuse=meadow],
-area|z12-[landuse=recreation_ground],
-area|z12-[landuse=village_green],
-area|z12-[landuse=field],
-
-{
-  fill-color: @green0;
-  fill-opacity: 1;
-  z-index: 42;
-	fill-position: background;
-}
-
-
 area|z13-[landuse=grass],
 area|z13-[natural=grassland],
-area|z13-[leisure=golf_course],
-area|z13-[natural=heath],
+area|z13-[leisure=golf_course]
 
 {
   fill-color: @green0;
@@ -405,7 +305,6 @@ area|z13-[landuse=vineyard],
 area|z13-[landuse=meadow],
 area|z13-[landuse=recreation_ground],
 area|z13-[landuse=village_green],
-area|z13-[landuse=field],
 
 {
   fill-color: @green0;
@@ -416,8 +315,7 @@ area|z13-[landuse=field],
 
 area|z14-[landuse=grass],
 area|z14-[natural=grassland],
-area|z14-[leisure=golf_course],
-area|z14-[natural=heath],
+area|z14-[leisure=golf_course]
 
 {
   fill-color: @green1;
@@ -434,7 +332,7 @@ area|z14-[landuse=vineyard],
 area|z14-[landuse=meadow],
 area|z14-[landuse=recreation_ground],
 area|z14-[landuse=village_green],
-area|z14-[landuse=field]
+
 
 {
   fill-color: @green1;
@@ -451,7 +349,7 @@ area|z10-14[natural=beach],
   fill-color: @beach;
 	fill-position: background;
   fill-opacity: 1;
-	z-index: 46;
+	z-index: 1;
 }
 area|z15-[leisure=beach_resort],
 area|z15-[natural=beach],
@@ -459,7 +357,7 @@ area|z15-[natural=beach],
   fill-color: @beach;
 	fill-position: background;
   fill-opacity: 1;
-	z-index: 46;
+	z-index: 1;
 }
 area|z17-[leisure=beach_resort],
 area|z17-[natural=beach],
diff --git a/data/styles/clear/include/other.mapcss b/data/styles/clear/include/other.mapcss
index 7e6cf6f9c0..0c26d0ef2a 100644
--- a/data/styles/clear/include/other.mapcss
+++ b/data/styles/clear/include/other.mapcss
@@ -8,7 +8,7 @@ line|z16[barrier=hedge],
 line|z16[historic=citywalls],
 {
   color: @fence;
-  width: 0.7;
+  width: 0.5;
   opacity: 1;
   z-index: 950;
   dashes: 0.09,0.09;
@@ -22,7 +22,7 @@ line|z17-[barrier=hedge],
 line|z17-[historic=citywalls],
 {
   color: @fence;
-  width: 1.2;
+  width: 1;
   opacity: 1;
   z-index: 950;
   dashes: 0.18,0.18;
@@ -35,14 +35,11 @@ line|z18-[barrier=hedge],
 line|z18-[historic=citywalls],
 {
   color: @fence;
-  width: 1.4;
+  width: 1;
   z-index: 950;
   dashes: 0.18,0.18;
 }
 
-
-
-
 /* PISTE */
 /* node|z13[aerialway=station] { symbol-shape: circle; symbol-fill-color: grey; symbol-size: 2; } */
 
@@ -69,25 +66,13 @@ line|z15-[piste:lift=t-bar] {
   z-index: 6888;
 }
 
-line|z19-[power=line] {
-  color: @aerialway;
-  width: 1;
-  opacity: 1;
-  z-index: 2000;
-}
-
-
-line|z14[piste:type=downhill],
-line|z14[piste:type=nordic],
-line|z14[piste:type=sled],
-{
+line|z14[piste:type=downhill], line|z14[piste:type=nordic], line|z14[piste:type=sled] {
   color: @piste;
   width: 0.8;
   opacity: 1;
   z-index: 10;
 }
-line|z14[route=ski],
-line|z14[leisure=skiing]  {
+line|z14[route=ski] {
   color: @piste;
   width: 0.8;
   opacity: 1;
@@ -106,8 +91,7 @@ line|z15-[piste:type=nordic]{
   z-index: 199;
 }
 
-line|z15-[route=ski],
-line|z15-[leisure=skiing]  {
+line|z15-[route=ski] {
   color: @piste;
   width: 1.1;
   opacity: 1;
@@ -123,8 +107,7 @@ line|z17-[piste:type=sled] {
   opacity: 1;
   z-index: 199;
 }
-line|z17-[route=ski],
-line|z17-[leisure=skiing]  {
+line|z17-[route=ski] {
   color: @piste;
   width: 1.5;
   opacity: 1;
diff --git a/data/styles/clear/include/roads.mapcss b/data/styles/clear/include/roads.mapcss
index 0948176706..5dc1f7c753 100644
--- a/data/styles/clear/include/roads.mapcss
+++ b/data/styles/clear/include/roads.mapcss
@@ -79,7 +79,7 @@ line|z7-[highway=residential_link],
 line|z7[highway=trunk],
 line|z7[highway=motorway] {
     color: @trunk_orange_light;
-    width: 0.9;
+    width: 0.6;
 	  opacity: 1;
   	z-index: 900;
 
@@ -90,7 +90,7 @@ line|z7[highway=motorway] {
 line|z8[highway=trunk],
 line|z8[highway=motorway]
 {
-  width: 1.1;
+  width: 0.7;
   color: @trunk_orange_light;
   opacity: 1;
   z-index: 900;
@@ -98,7 +98,7 @@ line|z8[highway=motorway]
 line|z8[highway=primary]
 {
   color: @primary_orange;
-  width: 0.9;
+  width: 0.5;
   opacity: 1;
   z-index: 850;
 }
@@ -110,7 +110,7 @@ line|z9[highway=trunk],
 line|z9[highway=motorway]
 {
   color: @trunk_orange_medium;
-  width: 1.2;
+  width: 1;
   opacity: 1;
   z-index: 900;
 }
@@ -118,7 +118,7 @@ line|z9[highway=motorway]
 line|z9[highway=primary]
 {
   color: @primary_orange;
-  width: 0.8;
+  width: 0.7;
   opacity: 1;
   z-index: 850;
 }
@@ -131,7 +131,7 @@ line|z10[highway=trunk],
 line|z10[highway=motorway]
 {
   color: @trunk_orange_medium;
-  width: 1.5;
+  width: 1.3;
   opacity: 1;
   z-index: 900;
 }
@@ -139,7 +139,7 @@ line|z10[highway=motorway]
 line|z10[highway=primary]
 {
   color: @primary_orange;
-  width: 1.2;
+  width: 1;
   opacity: 1;
   z-index: 850;
 }
@@ -147,7 +147,7 @@ line|z10[highway=primary]
 line|z10[highway=secondary]
 {
   color: @secondary;
-  width: 1;
+  width: 0.8;
   opacity: 1;
   z-index: 800;
 }
@@ -159,7 +159,7 @@ line|z11[highway=trunk],
 line|z11[highway=motorway]
 {
   color: @trunk_orange_light;
-  width: 1.7;
+  width: 1.8;
   opacity: 1;
   z-index: 900;
 }
@@ -177,7 +177,7 @@ line|z11[highway=motorway]::case
 line|z11[highway=primary]
 {
   color: @primary_orange_medium;
-  width: 1.5;
+  width: 1.4;
   opacity: 1;
   z-index: 850;
 }
@@ -194,7 +194,7 @@ line|z11[highway=primary]::case
 line|z11[highway=secondary]
 {
   color: @secondary;
-  width: 1.3;
+  width: 1.1;
   opacity: 1;
   z-index: 800;
 }
@@ -203,7 +203,7 @@ line|z11[highway=residential],
 line|z11[highway=tertiary]
 {
   color: @residential;
-  width: 0.8;
+  width: 0.4;
   opacity: 1;
   z-index: 750;
 }
@@ -215,7 +215,7 @@ line|z12[highway=trunk],
 line|z12[highway=motorway]
 {
   color: @trunk_orange_medium;
-  width: 1.9;
+  width: 2;
   opacity: 1;
   z-index: 900;
 }
@@ -242,8 +242,8 @@ line|z12[highway=trunk][tunnel?] {
 
 line|z12[highway=primary]
 {
-  color: @primary_orange_medium;
-  width: 1.7;
+  color: @primary_orange;
+  width: 1.6;
   opacity: 1;
   z-index: 850;
 }
@@ -272,7 +272,7 @@ line|z12[highway=road],
 line|z12[highway=living_street]
 {
   color: @residential;
-  width: 1.2;
+  width: 0.8;
   opacity: 1;
   z-index: 750;
 }
@@ -319,7 +319,7 @@ line|z13[highway=trunk_link]
 
 line|z13[highway=primary]
 {
-  color: @primary_orange_medium;
+  color: @primary_orange_light;
   width: 2.4;
   opacity: 1;
   z-index: 850;
@@ -362,8 +362,7 @@ line|z13[highway=living_street]
   z-index: 700;
 }
 
-line|z13[highway=pedestrian],
-line|z13[highway=ford]
+line|z13[highway=pedestrian]
 {
   color: @pedestrian;
   width: 1;
@@ -382,8 +381,7 @@ line|z13[highway=cycleway]
   opacity: 0.8;*/
 }
 
-line|z13[highway=construction],
-line|z13[highway=proposed]
+line|z13[highway=construction]
 {
   color: @construction;
   opacity: 1;
@@ -435,7 +433,7 @@ line|z14[highway=trunk_link][tunnel?] {
 line|z14[highway=primary]
 {
   color: @primary_orange_medium;
-  width: 3.2;
+  width: 2.9;
   opacity: 1;
   z-index: 850;
 }
@@ -452,7 +450,7 @@ line|z14[highway=primary]::case
 line|z14[highway=primary_link]
 {
   color: @primary_orange_medium;
-  width: 3.2;
+  width: 2.9;
   z-index: 840;
 }
 
@@ -500,8 +498,7 @@ line|z14[highway=road]
   z-index: 700;
 }
 
-line|z14[highway=pedestrian],
-line|z14[highway=ford]
+line|z14[highway=pedestrian]
 {
   color: @pedestrian;
   width: 1.6;
@@ -519,8 +516,6 @@ line|z14[highway=service]
 }
 
 line|z14[highway=track][tracktype=grade1],
-line|z14[highway=raceway],
-line|z14[leisure=track]
 {
   color: @track;
   opacity: 1;
@@ -531,7 +526,6 @@ line|z14[highway=track],
 line|z14[highway=path],
 line|z14[route=hiking]
 {
-
   color: @track;
   opacity: 1;
   dashes: 2.52,1.35;
@@ -558,8 +552,7 @@ line|z14[highway=footway]
   z-index: 600;
 }
 
-line|z14[highway=construction],
-line|z14[highway=proposed]
+line|z14[highway=construction]
 {
   color: @construction;
   opacity: 1;
@@ -690,8 +683,7 @@ line|z15[highway=road]
   opacity: 1;
   z-index: 700;
 }
-line|z15[highway=pedestrian],
-line|z15[highway=ford]
+line|z15[highway=pedestrian]
 {
   color: @pedestrian;
   width: 2;
@@ -714,8 +706,6 @@ line|z15[highway=service][service=driveway]
 }
 
 line|z15[highway=track][tracktype=grade1],
-line|z15[highway=raceway],
-line|z15[leisure=track]
 {
   color: @track;
   opacity: 1;
@@ -760,8 +750,7 @@ line|z15[highway=cycleway]
   z-index: 1000;
 
 }
-line|z15[highway=construction],
-line|z15[highway=proposed]
+line|z15[highway=construction]
 {
   color: @construction;
   opacity: 1;
@@ -909,8 +898,7 @@ line|z16[highway=service]
   z-index: 650;
 }
 
-line|z16[highway=pedestrian],
-line|z16[highway=ford]
+line|z16[highway=pedestrian]
 {
   color: @pedestrian;
   width: 2.4;
@@ -945,8 +933,6 @@ line|z16[highway=service][service=driveway]
 }
 
 line|z16[highway=track][tracktype=grade1],
-line|z16[highway=raceway],
-line|z16[leisure=track]
 {
   color: @track;
   opacity: 1;
@@ -982,8 +968,7 @@ line|z16[highway=steps]
   z-index: 1000;
 }
 
-line|z16[highway=construction],
-line|z16[highway=proposed]
+line|z16[highway=construction]
 {
   color: @construction;
   opacity: 1;
@@ -1134,8 +1119,7 @@ line|z17[highway=road]
   z-index: 700;
 }
 
-line|z17[highway=pedestrian],
-line|z17[highway=ford]
+line|z17[highway=pedestrian]
 {
   color: @pedestrian;
   width: 3;
@@ -1187,8 +1171,6 @@ line|z17[highway=service]
 }
 
 line|z17[highway=track][tracktype=grade1],
-line|z17[highway=raceway],
-line|z17[leisure=track]
 {
   color: @track;
   opacity: 1;
@@ -1223,8 +1205,7 @@ line|z17[highway=steps]
   z-index: 1000;
 }
 
-line|z17[highway=construction],
-line|z17[highway=proposed]
+line|z17[highway=construction]
 {
   color: @construction;
   opacity: 1;
@@ -1373,8 +1354,7 @@ line|z18[highway=road]
   z-index: 700;
 }
 
-line|z18[highway=pedestrian],
-line|z18[highway=ford]
+line|z18[highway=pedestrian]
 {
   color: @pedestrian;
    width: 4;
@@ -1426,8 +1406,6 @@ line|z18[highway=service]
 }
 
 line|z18[highway=track][tracktype=grade1],
-line|z18[highway=raceway],
-line|z18[leisure=track]
 {
   color: @track;
   opacity: 1;
@@ -1463,8 +1441,7 @@ line|z18[highway=steps]
   z-index: 1000;
 }
 
-line|z18[highway=construction],
-line|z18[highway=proposed]
+line|z18[highway=construction]
 {
   color: @construction;
   opacity: 1;
@@ -1613,8 +1590,7 @@ line|z19-[highway=road]
   z-index: 700;
 }
 
-line|z19-[highway=pedestrian],
-line|z19-[highway=ford]
+line|z19-[highway=pedestrian]
 {
   color: @pedestrian;
    width: 5;
@@ -1667,8 +1643,6 @@ line|z19-[highway=service]
 }
 
 line|z19-[highway=track][tracktype=grade1],
-line|z19-[highway=raceway],
-line|z19-[leisure=track]
 {
   color: @track;
   opacity: 1;
@@ -1703,8 +1677,7 @@ line|z19-[highway=steps]
   z-index: 1000;
 }
 
-line|z19-[highway=construction],
-line|z19-[highway=proposed]
+line|z19-[highway=construction]
 {
   color: @construction;
   opacity: 1;
@@ -2042,32 +2015,14 @@ line|z16-[highway=footway][bridge?]::bridgeblack,
   casing-linecap: butt;
   casing-color: @bridge_casing;
 }
-line|z16-[highway=pedestrian][bridge?]::bridgewhite,
-line|z16-[highway=footway][bridge?]::bridgewhite
-{
-  z-index: 400;
-  casing-width: eval(prop("width")+0.2);
-  casing-linecap: butt;
-  casing-color: @bridge_background;
-}
-
-line|z17-[highway=pedestrian][bridge?]::bridgeblack,
-line|z17-[highway=footway][bridge?]::bridgeblack,
-{
-  z-index:390;
-  casing-width: eval(prop("width")+0.6);
-  casing-linecap: butt;
-  casing-color: @bridge_casing;
-}
-line|z17-[highway=pedestrian][bridge?]::bridgewhite,
-line|z17-[highway=footway][bridge?]::bridgewhite
+line|z18-[highway=pedestrian][bridge?]::bridgewhite,
+line|z18-[highway=footway][bridge?]::bridgewhite
 {
   z-index:400;
   casing-width: eval(prop("width")+0.2);
   casing-linecap: butt;
   casing-color: @bridge_background;
 }
-
 line|z18-[highway=pedestrian][bridge?]::bridgeblack,
 line|z18-[highway=footway][bridge?]::bridgeblack,
 {
diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss
index 37b898f2c3..745d7c9359 100644
--- a/data/styles/clear/include/transport.mapcss
+++ b/data/styles/clear/include/transport.mapcss
@@ -2,9 +2,7 @@
 /* RAILWAY LINES */
 
 
-line|z11-12[railway=rail],
-line|z11-12[railway=yard]
-
+line|z11-12[railway=rail]
 {
   color: @railway_light;
   width: 0.6;
@@ -13,8 +11,7 @@ line|z11-12[railway=yard]
 }
 
 line|z13-[railway=rail],
-line|z13-[railway=light_rail],
-line|z13-[railway=yard]
+line|z13-[railway=light_rail]
 {
   color: @railway_light;
   opacity: 1;
@@ -22,8 +19,7 @@ line|z13-[railway=yard]
   z-index: 680;
 }
 line|z14[railway=rail],
-line|z14[railway=light_rail],
-line|z14[railway=yard]
+line|z14[railway=light_rail]
 {
   color: @railway;
   opacity: 1;
@@ -31,8 +27,7 @@ line|z14[railway=yard]
   z-index: 680;
 }
 line|z15[railway=rail],
-line|z15[railway=light_rail],
-line|z15[railway=yard]
+line|z15[railway=light_rail]
 {
   color: @railway;
   opacity: 1;
@@ -41,9 +36,7 @@ line|z15[railway=yard]
 }
 
 line|z16[railway=rail]::dash,
-line|z16[railway=light_rail]::dash,
-line|z16[railway=yard]::dash,
-
+line|z16[railway=light_rail]::dash
 {
   color: @railway_dash;
   opacity: 1;
@@ -52,8 +45,7 @@ line|z16[railway=yard]::dash,
   dashes: 4.5,4.5;
 }
 line|z16[railway=rail],
-line|z16[railway=light_rail],
-line|z16[railway=yard]
+line|z16[railway=light_rail]
 {
   color: @railway;
   opacity: 1;
@@ -62,8 +54,7 @@ line|z16[railway=yard]
 }
 
 line|z17[railway=rail],
-line|z17[railway=light_rail],
-line|z17[railway=yard]
+line|z17[railway=light_rail]
 {
   color: @railway;
   opacity: 1;
@@ -72,8 +63,7 @@ line|z17[railway=yard]
 }
 
 line|z17[railway=rail]::dash,
-line|z17[railway=light_rail]::dash,
-line|z17[railway=yard]::dash
+line|z17[railway=light_rail]::dash
 {
   color: @railway_dash;
   opacity: 1;
@@ -83,8 +73,7 @@ line|z17[railway=yard]::dash
 }
 
 line|z18-[railway=rail],
-line|z18-[railway=light_rail],
-line|z18-[railway=yard]
+line|z18-[railway=light_rail]
 {
   color: @railway;
   opacity: 1;
@@ -94,7 +83,6 @@ line|z18-[railway=yard]
 
 line|z18-[railway=rail]::dash,
 line|z18-[railway=light_rail]::dash,
-line|z18-[railway=yard]::dash
 {
   color: @railway_dash;
   opacity: 1;
@@ -104,18 +92,15 @@ line|z18-[railway=yard]::dash
 }
 
 line|z14-[railway=rail][tunnel?],
-line|z14-[railway=light_rail][tunnel?],
-line|z14-[railway=yard][tunnel?], {
+line|z14-[railway=light_rail][tunnel?] {
   casing-width: 1;
   casing-linecap: butt;
   casing-color: @railway_tunnel;
   casing-dashes: 5,5;
 }
 
-line|z14-16[railway][bridge?]::bridgewhite,
-line|z14-16[railway=light_rail][bridge?]::bridgewhite,
-line|z14-16[railway=yard][bridge?]::bridgewhite,
-{
+line|z14-17[railway][bridge?]::bridgewhite,
+line|z14-17[railway=light_rail][bridge?]::bridgewhite {
   z-index: 30;
   casing-width: eval(prop("width")+0.2);
   casing-linecap: butt;
@@ -123,9 +108,7 @@ line|z14-16[railway=yard][bridge?]::bridgewhite,
 }
 
 line|z14-16[railway=rail][bridge?]::bridgeblack,
-line|z14-16[railway=light_rail][bridge?]::bridgeblack ,
-line|z14-16[railway=yard][bridge?]::bridgeblack ,
-{
+line|z14-16[railway=light_rail][bridge?]::bridgeblack {
   z-index: 25;
   casing-width: eval(prop("width")+0.5);
   casing-linecap: butt;
@@ -133,8 +116,7 @@ line|z14-16[railway=yard][bridge?]::bridgeblack ,
 }
 
 line|z17-[railway][bridge?]::bridgewhite,
-line|z17-[railway=light_rail][bridge?]::bridgewhite,
-line|z17-[railway=yard][bridge?]::bridgewhite  {
+line|z17-[railway=light_rail][bridge?]::bridgewhite {
   z-index: 30;
   casing-width: eval(prop("width")+1.2);
   casing-linecap: butt;
@@ -142,8 +124,7 @@ line|z17-[railway=yard][bridge?]::bridgewhite  {
 }
 
 line|z17-[railway=rail][bridge?]::bridgeblack,
-line|z17-[railway=light_rail][bridge?]::bridgeblack,
-line|z17-[railway=yard][bridge?]::bridgeblack  {
+line|z17-[railway=light_rail][bridge?]::bridgeblack {
   z-index: 25;
   casing-width: eval(prop("width")+2);
   casing-linecap: butt;
@@ -159,9 +140,7 @@ line|z18-[railway=disused] {
 }
 
 
-line|z14[railway=monorail],
-
-/*line|z14-[railway=subway][tunnel=no]*/
+line|z14[railway=monorail]
 {
   color: @railway_light;
   width: 1;
@@ -170,8 +149,7 @@ line|z14[railway=monorail],
 }
 
 
-line|z15-16[railway=monorail],
-
+line|z15-16[railway=monorail]
 {
   color: @railway;
   width: 1.2;
@@ -179,8 +157,7 @@ line|z15-16[railway=monorail],
   z-index: 950;
 }
 
-line|z17-[railway=monorail],
-
+line|z17-[railway=monorail]
 {
   color: @railway;
   opacity: 1;
@@ -321,52 +298,6 @@ node|z17-[highway=motorway_junction]
 
 /* TRAIN STATIONS */
 
-node|z12[railway=halt]  {
-	icon-image: train-s.svg;
-  text-offset: 6;
-	z-index: 2800;
-  font-size: 9;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.6;
-  text-halo-color: @label_halo_light;
-}
-
-node|z12[railway=halt]::int_name  {
-  text-offset: 6;
-	z-index: 2800;
-  font-size: 8;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.6;
-  text-halo-color: @label_halo_light;
-}
-
-node|z13[railway=station],
-node|z13[railway=halt]  {
-	icon-image: train-s.svg;
-  text-offset: 6;
-	z-index: 2800;
-  font-size: 10;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.6;
-  text-halo-color: @label_halo_light;
-}
-node|z13[railway=station]::int_name,
-node|z13[railway=halt]::int_name  {
-  text-offset: 6;
-	z-index: 2800;
-  font-size: 9;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.6;
-  text-halo-color: @label_halo_light;
-}
 node|z14[railway=station],
 node|z14[railway=halt]  {
 	icon-image: train-s.svg;
@@ -376,7 +307,7 @@ node|z14[railway=halt]  {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z14[railway=station]::int_name,
@@ -387,7 +318,7 @@ node|z14[railway=halt]::int_name  {
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z15[railway=station],
@@ -399,7 +330,7 @@ node|z15[railway=halt] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z15[railway=station]::int_name,
@@ -410,20 +341,20 @@ node|z15[railway=halt]::int_name {
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
 node|z16[railway=station],
 node|z16[railway=halt]	 {
-	icon-image: train-m.svg;
+	icon-image: train-l.svg;
   text-offset: 8;
   font-size: 13;
   z-index: 2800;
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z16[railway=station]::int_name,
@@ -434,7 +365,7 @@ node|z16[railway=halt]::int_name	 {
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z17-[railway=station],
@@ -446,7 +377,7 @@ node|z17-[railway=halt]	 {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z17-[railway=station]::int_name,
@@ -457,7 +388,7 @@ node|z17-[railway=halt]::int_name {
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -479,18 +410,18 @@ node|z14[railway=station][transport=subway] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z14[railway=station][transport=subway]::int_name {
-	icon-image: subway-s.svg;
+	icon-image: subway-m.svg;
   text-offset: 7;
 	z-index: 2900;
   font-size: 9;
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z15[railway=station][transport=subway] {
@@ -501,7 +432,7 @@ node|z15[railway=station][transport=subway] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z15[railway=station][transport=subway]::int_name {
@@ -512,7 +443,7 @@ node|z15[railway=station][transport=subway]::int_name {
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z16[railway=station][transport=subway]	 {
@@ -523,7 +454,7 @@ node|z16[railway=station][transport=subway]	 {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z16[railway=station][transport=subway]::int_name	 {
@@ -533,7 +464,7 @@ node|z16[railway=station][transport=subway]::int_name	 {
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z17-[railway=station][transport=subway]	 {
@@ -543,7 +474,7 @@ node|z17-[railway=station][transport=subway]	 {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z17-[railway=station][transport=subway]::int_name	 {
@@ -552,14 +483,14 @@ node|z17-[railway=station][transport=subway]::int_name	 {
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
-node|z17[railway=subway_entrance] { icon-image: subway-entrance-m.svg; text-offset: 8; font-size: 13; z-index: 2800; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.9; text-halo-color: @label_halo_light; }
-node|z17[railway=subway_entrance]::int_name { text-offset: 8; font-size: 11; z-index: 2800; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.9; text-halo-color: @label_halo_light; }
+node|z17[railway=subway_entrance] { icon-image: subway-entrance-s.svg; text-offset: 8; font-size: 13; z-index: 2800; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
+node|z17[railway=subway_entrance]::int_name { text-offset: 8; font-size: 11; z-index: 2800; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 
-node|z18-[railway=subway_entrance] { icon-image: subway-entrance-m.svg; text-offset: 8; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.9; text-halo-color: @label_halo_light; z-index: 2800; }
-node|z18-[railway=subway_entrance]::int_name { text-offset: 8; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.9; text-halo-color: @label_halo_light; z-index: 2800; }
+node|z18-[railway=subway_entrance] { icon-image: subway-entrance-s.svg; text-offset: 8; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; z-index: 2800; }
+node|z18-[railway=subway_entrance]::int_name { text-offset: 8; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; z-index: 2800; }
 
 
 
@@ -578,7 +509,7 @@ node|z12-13[railway=station][transport=subway][city=moscow]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity:0.7;
+  text-halo-opacity:0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -589,22 +520,22 @@ node|z12-13[railway=station][transport=subway][city=moscow]::int_name {
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
 
 node|z14[railway=station][transport=subway][city=moscow]
-{ icon-image: subway-moscow-s.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
+{ icon-image: subway-moscow-m.svg; text-offset: 8; z-index: 2900; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
 node|z14[railway=station][transport=subway][city=moscow]::int_name
-{ z-index: 2900; font-size: 9; text-offset: 24;text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
+{ z-index: 2900; font-size: 10; text-offset: 24;text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
 node|z15[railway=station][transport=subway][city=moscow]
 { icon-image: subway-moscow-m.svg; text-offset: 9; z-index: 2900; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light; }
 node|z15[railway=station][transport=subway][city=moscow]::int_name
 { font-size: 10; text: int_name; text-offset: 24; z-index: 2900; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 1; text-halo-color: @label_halo_light;}
 
-node|z16[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 10; text-color: @district_label; text-halo-radius: 0;text-halo-opacity: 1; z-index: 2900}
-node|z16[railway=station][transport=subway][city=moscow]::int_name { icon-image: none.svg; text: int_name; font-size: 9; text-color: @district_label; text-halo-radius: 0;text-halo-opacity: 1;z-index: 2900 }
+node|z16[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 10; text-color: @district_label; text-halo-radius: 0; z-index: 2900}
+node|z16[railway=station][transport=subway][city=moscow]::int_name { icon-image: none.svg; text: int_name; font-size: 9; text-color: @district_label; text-halo-radius: 0;z-index: 2900 }
 
 node|z17-[railway=station][transport=subway][city=moscow] { icon-image: subway-moscow-m.svg; text: name; font-size: 10; text-color: @district_label; text-halo-radius: 0; z-index: 2900}
 node|z17-[railway=station][transport=subway][city=moscow]::int_name { text: int_name; font-size: 9; text-color: @district_label; text-halo-radius: 0; z-index: 2900}
@@ -645,7 +576,7 @@ node|z12[railway=station][transport=subway][city=spb]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.6;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
  }
 node|z12[railway=station][transport=subway][city=spb]::int_name
@@ -657,7 +588,7 @@ node|z12[railway=station][transport=subway][city=spb]::int_name
    text: int_name;
    text-color: @label_dark;
    text-halo-radius: 1;
-   text-halo-opacity: 0.6;
+   text-halo-opacity: 0.5;
    text-halo-color: @label_halo_light;
  }
 
@@ -670,7 +601,7 @@ node|z13[railway=station][transport=subway][city=spb]
    text: name;
    text-color: @label_dark;
    text-halo-radius: 1;
-   text-halo-opacity: 0.6;
+   text-halo-opacity: 0.5;
    text-halo-color: @label_halo_light;
 }
 node|z13[railway=station][transport=subway][city=spb]::int_name
@@ -682,19 +613,19 @@ node|z13[railway=station][transport=subway][city=spb]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.6;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
 node|z14[railway=station][transport=subway][city=spb]
-{ icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; }
+{ icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z14[railway=station][transport=subway][city=spb]::int_name
-{  z-index: 2900; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; }
+{ icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 
 node|z15[railway=station][transport=subway][city=spb]
-{ icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+{ icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 11; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z15[railway=station][transport=subway][city=spb]::int_name
- { z-index: 2900; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+ { icon-image: subway-spb-s.svg; text-offset: 8; z-index: 2900; font-size: 10; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 
 node|z16[railway=station][transport=subway][city=spb]
  { icon-image: subway-spb-m.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 }
@@ -708,25 +639,24 @@ node|z17-[railway=station][transport=subway][city=spb]::int_name
 { font-size: 9; text: int_name; text-color: @district_label; text-halo-radius: 0;z-index: 2900 }
 
 node|z16-[railway=subway_entrance][city=spb]
- { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+ { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z16-[railway=subway_entrance][city=spb]::int_name
-{ z-index: 2800; font-size:11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+{ z-index: 2800; font-size:11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 
 node|z17-[railway=subway_entrance][city=spb]
-{ icon-image: subway-spb-l.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+{ icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z17-[railway=subway_entrance][city=spb]::int_name
-{ z-index: 2800; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+{ z-index: 2800; font-size: 11; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 
 node|z18-[railway=subway_entrance][city=spb]
- { icon-image: subway-spb-l.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+ { icon-image: subway-spb-m.svg; text-offset: 8; z-index: 2800; font-size: 13; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z18-[railway=subway_entrance][city=spb]::int_name
-{ z-index: 2800; font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+{ z-index: 2800; font-size: 12; text: int_name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 
 /* LONDON ICONS */
-node|z13[railway=station][transport=subway][city=london] { icon-image: subway-london-s.svg; }
 node|z14[railway=station][transport=subway][city=london] { icon-image: subway-london-s.svg; }
 node|z15[railway=station][transport=subway][city=london] { icon-image: subway-london-m.svg; }
-node|z16-[railway=station][transport=subway][city=london] { icon-image: subway-london-m.svg; }
+node|z16-[railway=station][transport=subway][city=london] { icon-image: subway-london-l.svg; }
 node|z17[railway=subway_entrance][city=london] { icon-image: subway-london-s.svg; }
 node|z18-[railway=subway_entrance][city=london] { icon-image: subway-london-m.svg; }
 
@@ -734,15 +664,13 @@ node|z18-[railway=subway_entrance][city=london] { icon-image: subway-london-m.sv
 node|z13[railway=station][transport=subway][city=paris] { icon-image: subway-paris-s.svg; }
 node|z14[railway=station][transport=subway][city=paris] { icon-image: subway-paris-s.svg; }
 node|z15[railway=station][transport=subway][city=paris] { icon-image: subway-paris-m.svg; }
-node|z16-[railway=station][transport=subway][city=paris] { icon-image: subway-paris-m.svg; }
+node|z16-[railway=station][transport=subway][city=paris] { icon-image: subway-paris-l.svg; }
 node|z17-[railway=subway_entrance][city=paris] { icon-image: subway-paris-s.svg; }
 
 /* BARCELONA ICONS */
-
-node|z13[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-s.svg; }
 node|z14[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-s.svg; }
 node|z15[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-m.svg; }
-node|z16-[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-m.svg; }
+node|z16-[railway=station][transport=subway][city=barcelona] { icon-image: subway-barcelona-l.svg; }
 node|z17[railway=subway_entrance][city=barcelona] { icon-image: subway-barcelona-s.svg; }
 node|z18-[railway=subway_entrance][city=barcelona] { icon-image: subway-barcelona-m.svg; }
 
@@ -750,14 +678,14 @@ node|z18-[railway=subway_entrance][city=barcelona] { icon-image: subway-barcelon
 /* MADRID ICONS */
 node|z14[railway=station][transport=subway][city=madrid] { icon-image: subway-madrid-s.svg; }
 node|z15[railway=station][transport=subway][city=madrid] { icon-image: subway-madrid-m.svg; }
-node|z16-[railway=station][transport=subway][city=madrid] { icon-image: subway-madrid-m.svg; }
+node|z16-[railway=station][transport=subway][city=madrid] { icon-image: subway-madrid-l.svg; }
 node|z17[railway=subway_entrance][city=madrid] { icon-image: subway-madrid-s.svg; }
 node|z18-[railway=subway_entrance][city=madrid] { icon-image: subway-madrid-m.svg; }
 
 /* BERLIN ICONS */
 node|z14[railway=station][transport=subway][city=berlin] { icon-image: subway-berlin-s.svg; }
 node|z15[railway=station][transport=subway][city=berlin] { icon-image: subway-berlin-m.svg; }
-node|z16-[railway=station][transport=subway][city=berlin] { icon-image: subway-berlin-m.svg; }
+node|z16-[railway=station][transport=subway][city=berlin] { icon-image: subway-berlin-l.svg; }
 node|z17-[railway=subway_entrance][city=berlin] { icon-image: subway-berlin-s.svg; }
 
 /* ROMA ICONS */
@@ -768,27 +696,27 @@ node|z17-[railway=station][transport=subway][city=roma] { icon-image: none.svg;
 node|z17-[railway=subway_entrance][city=roma] { icon-image: subway-rome-m.svg; }
 
 /* MINSK ICONS */
-node|z13[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 4; z-index: 2800; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light;  }
-node|z14[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 5; }
-node|z15[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 5; }
+node|z13[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-s.svg; text-offset: 4; z-index: 2800; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light;  }
+node|z14[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 5; }
+node|z15[railway=station][transport=subway][city=minsk] { icon-image: subway-minsk-l.svg; text-offset: 5; }
 node|z16[railway=station][transport=subway][city=minsk] { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; }
 node|z17-[railway=station][transport=subway][city=minsk] {  icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; }
-node|z16-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 6; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+node|z16-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; text-offset: 6; z-index: 2800; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z17[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; font-size: 13; }
 node|z18-[railway=subway_entrance][city=minsk] { icon-image: subway-minsk-m.svg; font-size: 13; }
 
 
 /* KIEV ICONS */
-node|z13[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-s.svg; text-offset: 8;	z-index: 2; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.7; text-halo-color: @label_halo_light; }
+node|z13[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-s.svg; text-offset: 8;	z-index: 2; font-size: 10; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z14[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-s.svg; }
 node|z15[railway=station][transport=subway][city=kiev] { icon-image: subway-kiev-m.svg; }
 node|z16-[railway=station][transport=subway][city=kiev]  { icon-image: none.svg; font-size: 10; text: name; text-color: @district_label; text-halo-radius: 0; }
-node|z16-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; text-offset: 6; z-index: 2; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light; }
+node|z16-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; text-offset: 6; z-index: 2; font-size: 12; text: name; text-color: @label_dark; text-halo-radius: 1; text-halo-opacity: 0.5; text-halo-color: @label_halo_light; }
 node|z17[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; font-size: 13;  }
 node|z18-[railway=subway_entrance][city=kiev] { icon-image: subway-kiev-m.svg; font-size: 13; }
 
 /* NEW YORK ICONS */
-node|z13[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-s.svg; }
+node|z113[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-xs.svg; }
 node|z14[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-s.svg; }
 node|z15[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-m.svg; }
 node|z16-[railway=station][transport=subway][city=newyork] { icon-image: subway-newyork-l.svg; }
@@ -797,7 +725,6 @@ node|z17-[railway=subway_entrance][city=newyork] { icon-image: subway-newyork-s.
 
 /* TRAM STOPS */
 
-
 node|z15-16[railway=tram_stop],
 area|z15-16[railway=tram_stop]
 {
@@ -815,7 +742,7 @@ area|z17[railway=tram_stop]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -828,7 +755,7 @@ area|z17[railway=tram_stop]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -843,7 +770,7 @@ area|z18-[railway=tram_stop]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -856,38 +783,23 @@ area|z18-[railway=tram_stop]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
 /* BUS STOPS */
 
-
-node|z16[highway=bus_stop],
-area|z16[highway=bus_stop]
+node|z17[highway=bus_stop],
+area|z17[highway=bus_stop]
 {
   icon-image: bus-m.svg;
   z-index: 2700;
 }
-node|z17[highway=bus_stop],
-area|z17[highway=bus_stop],
-{
-  icon-image: bus-l.svg;
-  z-index: 2700;
-  text-offset: 10;
-  font-size: 11;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.9;
-  text-halo-color: @label_halo_light;
-  text-position: center;
-}
 
 node|z18-19[highway=bus_stop],
 area|z18-19[highway=bus_stop],
-node|z18-19[public_transport=station],
-area|z18-19[public_transport=station]
+node|z16-17[public_transport=station],
+area|z16-17[public_transport=station]
 {
   icon-image: bus-l.svg;
   z-index: 2700;
@@ -896,15 +808,14 @@ area|z18-19[public_transport=station]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
-  text-position: center;
 }
 
 node|z18-19[highway=bus_stop]::int_name,
 area|z18-19[highway=bus_stop]::int_name,
-node|z18-19[public_transport=station]::int_name,
-area|z18-19[public_transport=station]::int_name
+node|z16-17[public_transport=station]::int_name,
+area|z16-17[public_transport=station]::int_name
 {
   text-offset: 10;
   font-size: 9;
@@ -912,37 +823,14 @@ area|z18-19[public_transport=station]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
 node|z15[amenity=bus_station], area|z16-[amenity=bus_station] {
-  icon-image: bus-m.svg;
-}
-node|z16[amenity=bus_station], area|z16-[amenity=bus_station] {
-  icon-image: bus-m.svg;
-  text-offset: 8;
-  font-size: 11;
-  z-index: 2700;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
-}
-
-node|z16[amenity=bus_station]::int_name, area|z16-[amenity=bus_station]::int_name {
-  text-offset: 8;
-  font-size: 9;
-  z-index: 2700;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.8;
-  text-halo-color: @label_halo_light;
+  icon-image: bus-l.svg;
 }
-
-node|z17[amenity=bus_station], area|z17-[amenity=bus_station] {
+node|z16-17[amenity=bus_station], area|z16-[amenity=bus_station] {
   icon-image: bus-l.svg;
   text-offset: 8;
   font-size: 11;
@@ -950,18 +838,18 @@ node|z17[amenity=bus_station], area|z17-[amenity=bus_station] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
-node|z17[amenity=bus_station]::int_name, area|z17-[amenity=bus_station]::int_name {
+node|z16-17[amenity=bus_station]::int_name, area|z16-[amenity=bus_station]::int_name {
   text-offset: 8;
   font-size: 9;
   z-index: 2700;
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -973,7 +861,7 @@ node|z18[amenity=bus_station], area|z18[amenity=bus_station] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -984,7 +872,7 @@ node|z18[amenity=bus_station]::int_name, area|z18[amenity=bus_station]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -996,7 +884,7 @@ node|z19-[amenity=bus_station], area|z19-[amenity=bus_station] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 node|z19-[amenity=bus_station]::int_name, area|z19-[amenity=bus_station]::int_name {
@@ -1006,19 +894,16 @@ node|z19-[amenity=bus_station]::int_name, area|z19-[amenity=bus_station]::int_na
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 /* FERRY */
 
-node|z14[amenity=ferry_terminal] {
+node|z14-15[amenity=ferry_terminal] {
   icon-image: ship-s.svg;
   z-index: 2700;
 }
-node|z15[amenity=ferry_terminal] {
-  icon-image: ship-m.svg;
-  z-index: 2700;
-}
+
 
 node|z16-[amenity=ferry_terminal] {
   icon-image: ship-m.svg;
@@ -1028,7 +913,7 @@ node|z16-[amenity=ferry_terminal] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.8;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -1040,7 +925,7 @@ node|z17[amenity=ferry_terminal] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -1052,7 +937,7 @@ node|z18-[amenity=ferry_terminal] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.9;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -1061,7 +946,7 @@ node|z18-[amenity=ferry_terminal] {
 area|z10[aeroway=airport][aerodrome=international],
 area|z10[aeroway=aerodrome][aerodrome=international],
 node|z10[aeroway=airport][aerodrome=international],
-node|z10[aeroway=aerodrome][aerodrome=international],
+node|z10[aeroway=aerodrome][aerodrome=international]
 {
 	icon-image: airport-s.svg;
   text-offset: 7;
@@ -1069,7 +954,7 @@ node|z10[aeroway=aerodrome][aerodrome=international],
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 3100;
   fill-opacity: 1;
@@ -1087,7 +972,7 @@ node|z11-12[aeroway=aerodrome][aerodrome=international]
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 3100;
 
@@ -1101,239 +986,52 @@ node|z11-12[aeroway=aerodrome][aerodrome=international]::int_name
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 3100;
 }
 
-area|z13-14[aeroway=airport][aerodrome=international],
-area|z13-14[aeroway=aerodrome][aerodrome=international],
-node|z13-14[aeroway=airport][aerodrome=international],
-node|z13-14[aeroway=aerodrome][aerodrome=international]
-{
-	icon-image: airport-m.svg;
-  text-offset: 7;
-  font-size: 11;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-
-}
-area|z13-14[aeroway=airport][aerodrome=international]::int_name,
-area|z13-14[aeroway=aerodrome][aerodrome=international]::int_name,
-node|z13-14[aeroway=airport][aerodrome=international]::int_name,
-node|z13-14[aeroway=aerodrome][aerodrome=international]::int_name
-{
-  font-size: 10;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-}
-
-area|z15-16[aeroway=airport][aerodrome=international],
-area|z15-16[aeroway=aerodrome][aerodrome=international],
-node|z15-16[aeroway=airport][aerodrome=international],
-node|z15-16[aeroway=aerodrome][aerodrome=international]
-{
-	icon-image: airport-m.svg;
-  text-offset: 7;
-  font-size: 12;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-
-}
-area|z15-16[aeroway=airport][aerodrome=international]::int_name,
-area|z15-16[aeroway=aerodrome][aerodrome=international]::int_name,
-node|z15-16[aeroway=airport][aerodrome=international]::int_name,
-node|z15-16[aeroway=aerodrome][aerodrome=international]::int_name
-{
-  font-size: 11;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-}
-
-area|z17-[aeroway=airport][aerodrome=international],
-area|z17-[aeroway=aerodrome][aerodrome=international],
-node|z17-[aeroway=airport][aerodrome=international],
-node|z17-[aeroway=aerodrome][aerodrome=international]
-{
-	icon-image: airport-l.svg;
-  text-offset: 7;
-  font-size: 12;
-  text: name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-
-}
-area|z17-[aeroway=airport][aerodrome=international]::int_name,
-area|z17-[aeroway=aerodrome][aerodrome=international]::int_name,
-node|z17-[aeroway=airport][aerodrome=international]::int_name,
-node|z17-[aeroway=aerodrome][aerodrome=international]::int_name
-{
-  font-size: 11;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-}
-
-area|z12[aeroway=airport],
-node|z12[aeroway=airport],
-area|z12[aeroway=aerodrome],
-node|z12[aeroway=aerodrome],
-{
-	icon-image: airport-m.svg;
-    text-offset: 7;
-    font-size: 11;
-    text: name;
-    text-color: @label_dark;
-    text-halo-radius: 1;
-    text-halo-opacity: 0.7;
-    text-halo-color: @label_halo_light;
-    z-index: 3100;
-
-}
-
-area|z12[aeroway=airport]::int_name,
-node|z12[aeroway=airport]::int_name,
-area|z12[aeroway=aerodrome]::int_name,
-node|z12[aeroway=aerodrome]::int_name,
-{
-  font-size: 10;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-}
-
-area|z13-14[aeroway=airport],
-node|z13-14[aeroway=airport],
-area|z13-14[aeroway=aerodrome],
-node|z13-14[aeroway=aerodrome],
-{
-	icon-image: airport-m.svg;
-    text-offset: 7;
-    font-size: 11;
-    text: name;
-    text-color: @label_dark;
-    text-halo-radius: 1;
-    text-halo-opacity: 0.7;
-    text-halo-color: @label_halo_light;
-    z-index: 3100;
-
-}
-
-area|z13-14[aeroway=airport]::int_name,
-node|z13-14[aeroway=airport]::int_name,
-area|z13-14[aeroway=aerodrome]::int_name,
-node|z13-14[aeroway=aerodrome]::int_name,
-{
-  font-size: 10;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-}
-area|z15-16[aeroway=airport],
-node|z15-16[aeroway=airport],
-area|z15-16[aeroway=aerodrome],
-node|z15-16[aeroway=aerodrome],
-{
-	icon-image: airport-m.svg;
-    text-offset: 7;
-    font-size: 12;
-    text: name;
-    text-color: @label_dark;
-    text-halo-radius: 1;
-    text-halo-opacity: 0.7;
-    text-halo-color: @label_halo_light;
-    z-index: 3100;
-
-}
-
-area|z15-16[aeroway=airport]::int_name,
-node|z15-16[aeroway=airport]::int_name,
-area|z15-16[aeroway=aerodrome]::int_name,
-node|z15-16[aeroway=aerodrome]::int_name,
-{
-  font-size: 11;
-  text: int_name;
-  text-color: @label_dark;
-  text-halo-radius: 1;
-  text-halo-opacity: 0.7;
-  text-halo-color: @label_halo_light;
-  z-index: 3100;
-}
-area|z17-[aeroway=airport],
-node|z17-[aeroway=airport],
-area|z17-[aeroway=aerodrome],
-node|z17-[aeroway=aerodrome],
+area|z13-[aeroway=airport],
+area|z13-[aeroway=aerodrome],
+node|z13-[aeroway=airport],
+node|z13-[aeroway=aerodrome]
 {
 	icon-image: airport-l.svg;
-    text-offset: 7;
-    font-size: 12;
+    text-offset: 8;
+    font-size: 14;
     text: name;
     text-color: @label_dark;
     text-halo-radius: 1;
-    text-halo-opacity: 0.7;
+    text-halo-opacity: 0.5;
     text-halo-color: @label_halo_light;
     z-index: 3100;
 
 }
 
-area|z17-[aeroway=airport]::int_name,
-node|z17-[aeroway=airport]::int_name,
-area|z17-[aeroway=aerodrome]::int_name,
-node|z17-[aeroway=aerodrome]::int_name,
+area|z13-[aeroway=airport]::int_name,
+area|z13-[aeroway=aerodrome]::int_name,
+node|z13-[aeroway=airport]::int_name,
+node|z13-[aeroway=aerodrome]::int_name
 {
-  font-size: 11;
+  text-offset: 8;
+  font-size: 12;
   text: int_name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 1;
   text-halo-color: @label_halo_light;
   z-index: 3100;
 }
 
-
 area|z10[aeroway=airport][aerodrome=international],
-area|z10[aeroway=aerodrome][aerodrome=international],
-area|z10[aeroway=aerodrome],
-area|z10[aeroway=airport]
- {
+area|z10[aeroway=aerodrome][aerodrome=international] {
   fill-opacity: 1;
   fill-color: @aerodrome0;
   fill-position: background;
   z-index: 1;
 }
 area|z11[aeroway=airport][aerodrome=international],
-area|z11[aeroway=aerodrome][aerodrome=international],
-area|z11[aeroway=aerodrome],
-area|z11[aeroway=airport],
- {
+area|z11[aeroway=aerodrome][aerodrome=international] {
   fill-opacity: 1;
   fill-color: @aerodrome1;
   fill-position: background;
@@ -1391,9 +1089,7 @@ line|z15-[aeroway=taxiway] { width: 1.2; opacity: 0.6; color: @unclassified;z-in
 line|z14-15[aerialway=cable_car],
 line|z14-15[aerialway=chair_lift],
 line|z14-15[aerialway=gondola],
-line|z14-15[aerialway=mixed_lift],
-line|z14-15[aerialway=drag_lift]
- {
+line|z14-15[aerialway=mixed_lift] {
   color: @aerialway;
   width: 0.5;
   opacity: 1;
@@ -1403,9 +1099,7 @@ line|z14-15[aerialway=drag_lift]
 line|z16[aerialway=cable_car],
 line|z16[aerialway=chair_lift],
 line|z16[aerialway=gondola],
-line|z16[aerialway=mixed_lift],
-line|z16[aerialway=drag_lift]
- {
+line|z16[aerialway=mixed_lift] {
   color: @aerialway;
   width: 1;
   opacity: 1;
@@ -1415,9 +1109,7 @@ line|z16[aerialway=drag_lift]
 line|z17-[aerialway=cable_car],
 line|z17-[aerialway=chair_lift],
 line|z17-[aerialway=gondola],
-line|z17-[aerialway=mixed_lift],
-line|z17-[aerialway=drag_lift]
- {
+line|z17-[aerialway=mixed_lift] {
   color: @aerialway;
   width: 1;
   z-index: 1050;
@@ -1427,7 +1119,6 @@ line|z14[aerialway=cable_car]::dash,
 line|z14[aerialway=chair_lift]::dash,
 line|z14[aerialway=gondola]::dash,
 line|z14[aerialway=mixed_lift]::dash
-line|z14[aerialway=drag_lift] ::dash
  {
   color: @aerialway;
   width: 2.5;
@@ -1439,9 +1130,7 @@ line|z14[aerialway=drag_lift] ::dash
 line|z15-[aerialway=cable_car]::dash,
 line|z15-[aerialway=chair_lift]::dash,
 line|z15-[aerialway=gondola]::dash,
-line|z15-[aerialway=mixed_lift]::dash,
-line|z15-[aerialway=drag_lift] ::dash
-{
+line|z15-[aerialway=mixed_lift]::dash {
   color: @aerialway;
   width: 2.5;
   z-index: 1049;
@@ -1461,14 +1150,14 @@ node|z15[aerialway=cable_car],
 node|z15[aerialway=chair_lift],
 node|z15[aerialway=gondola],
 node|z15[aerialway=mixed_lift] {
-  icon-image: cable-car-m.svg;
+  icon-image: cable-car-s.svg;
   z-index: 2600;
   text-offset: 6;
   font-size: 10;
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
 }
 
@@ -1483,7 +1172,7 @@ node|z16-17[aerialway=mixed_lift]{
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 2600;
 }
@@ -1499,10 +1188,7 @@ node|z18[aerialway=mixed_lift] {
   text: name;
   text-color: @label_dark;
   text-halo-radius: 1;
-  text-halo-opacity: 0.7;
+  text-halo-opacity: 0.5;
   text-halo-color: @label_halo_light;
   z-index: 2600;
 }
-
-
-node|z17-[railway=crossing] { icon-image: railway-crossing.svg; z-index: 2600;}
diff --git a/data/styles/clear/style-clear/6plus/route_from.png b/data/styles/clear/style-clear/6plus/route_from.png
index f073e4df01..130060ea78 100644
--- a/data/styles/clear/style-clear/6plus/route_from.png
+++ b/data/styles/clear/style-clear/6plus/route_from.png
diff --git a/data/styles/clear/style-clear/6plus/route_to.png b/data/styles/clear/style-clear/6plus/route_to.png
index 41d23aafad..4c3f8b727b 100644
--- a/data/styles/clear/style-clear/6plus/route_to.png
+++ b/data/styles/clear/style-clear/6plus/route_to.png
diff --git a/data/styles/clear/style-clear/colors.mapcss b/data/styles/clear/style-clear/colors.mapcss
index 7189d5db5a..9677c18fa7 100644
--- a/data/styles/clear/style-clear/colors.mapcss
+++ b/data/styles/clear/style-clear/colors.mapcss
@@ -25,8 +25,8 @@
 /* ORANGE ROADS BUNDLE  */
  @trunk_orange: #FF5919;
  @trunk_orange_hard: #FF5E1F;
-@trunk_orange_medium: #FF7326; /*FF6626*/
- @trunk_orange_light: #FF7A26;/*F57A45*/
+ @trunk_orange_medium: #FF6626;
+ @trunk_orange_light: #FF7326;/*F57A45*/
 @trunk_orange_case: #DDDDCC;
   @primary_orange:  #FF8726;
  @primary_orange_medium: #FF9440;
@@ -80,7 +80,7 @@
 @railway: #969586;
 @railway_dash: #EEEEEE;
 @railway_tunnel: #555555;
-@aerialway: #444444;
+@aerialway: #777777;
 @tram: #555555;
 @ferry: #4499Bb;
 
@@ -96,10 +96,8 @@
 @glacier: #FFFFFF;
 @water: #8BD3E0;
 @river: #36B0BF;
-@wetland: #c9ddd6;
 @forest: #AABF65;
 @park: #AABF65; /* A5BF60 #A4B275 #BCCC74*/
-@natpark: #3A7921;
 @beach: #FCEC7E;
 /*forest-park*/
 @green0: #CFD5A8;
@@ -109,8 +107,7 @@
 @green4: #AEC26B;
 @green5: #B0C270;
 /* BUILDINGS */
-@housename: #65655E;
-@building_label: #61615A;
+@housename: #7F7E76;
 @building: #C9C8BB;
 @building_dark: #C2C0B3;
 
@@ -119,8 +116,8 @@
 @pedestrian_area: #E3E1D2;
 @pedestrian_area_light: #EDEBDB;
 
-@unversity: #F8E4BA;
-@hospital: #F8D9D9;/*FADCDB*/
+@unversity: #EBD8B0;
+@hospital: #EBCECE;/*FADCDB*/
 @industrial: #E4E2EB;
 @sport: #D1CDA7;
 @parking: #F2F2CE;
@@ -142,7 +139,7 @@
 
 
 /* PLACE LABELS */
-@city_label: #666666;
+@city_label: #595959;
 @city_label_light: #7F7F7F;
 @city_halo: #DDDDCC;
 @city_halo_light: #DDDDCC;
@@ -175,6 +172,8 @@
 /* UNIVERSAL HALO */
 @label_halo: #FFFFFF;
 
+/* OTHER LABELS */
+@building_label: #656565;
 
 /* PISTE */
 @piste: #C47AFF;
diff --git a/data/styles/clear/style-clear/hdpi/route_from.png b/data/styles/clear/style-clear/hdpi/route_from.png
index 793fa6b817..b457b0f2a5 100644
--- a/data/styles/clear/style-clear/hdpi/route_from.png
+++ b/data/styles/clear/style-clear/hdpi/route_from.png
diff --git a/data/styles/clear/style-clear/hdpi/route_to.png b/data/styles/clear/style-clear/hdpi/route_to.png
index 718f6d1b0e..4b0ecaab94 100644
--- a/data/styles/clear/style-clear/hdpi/route_to.png
+++ b/data/styles/clear/style-clear/hdpi/route_to.png
diff --git a/data/styles/clear/style-clear/ldpi/route_from.png b/data/styles/clear/style-clear/ldpi/route_from.png
index 541626a1d5..e305504f3b 100644
--- a/data/styles/clear/style-clear/ldpi/route_from.png
+++ b/data/styles/clear/style-clear/ldpi/route_from.png
diff --git a/data/styles/clear/style-clear/ldpi/route_to.png b/data/styles/clear/style-clear/ldpi/route_to.png
index da6017cf44..4c87d967b2 100644
--- a/data/styles/clear/style-clear/ldpi/route_to.png
+++ b/data/styles/clear/style-clear/ldpi/route_to.png
diff --git a/data/styles/clear/style-clear/mdpi/route_from.png b/data/styles/clear/style-clear/mdpi/route_from.png
index 8d22b8243d..c3d31ff777 100644
--- a/data/styles/clear/style-clear/mdpi/route_from.png
+++ b/data/styles/clear/style-clear/mdpi/route_from.png
diff --git a/data/styles/clear/style-clear/mdpi/route_to.png b/data/styles/clear/style-clear/mdpi/route_to.png
index 581bb0e408..47d548989f 100644
--- a/data/styles/clear/style-clear/mdpi/route_to.png
+++ b/data/styles/clear/style-clear/mdpi/route_to.png
diff --git a/data/styles/clear/style-clear/symbols/alcohol-l.svg b/data/styles/clear/style-clear/symbols/alcohol-l.svg
index 4a499444e4..f02811ee18 100644
--- a/data/styles/clear/style-clear/symbols/alcohol-l.svg
+++ b/data/styles/clear/style-clear/symbols/alcohol-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="beverages-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M12.174,10.437 L11,9.637 L10.502,4 L8.498,4 L8,9.695 L6.838,10.453 C6.375,10.756 6,11.447 6,12 L6,21 C6,21.553 6.447,22 7,22 L12,22 C12.553,22 13,21.553 13,21 L13,12 C13,11.447 12.63,10.748 12.174,10.437 L12.174,10.437 Z M20,16 C21.104,16 22,15.104 22,14 L21,9 L16,9 L15,14 C15,15.104 15.896,16 17,16 L18,16 L18,20.2 L16,21 L16,22 L21,22 L21,21 L19,20.2 L19,16 L20,16 L20,16 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/alcohol-m.svg b/data/styles/clear/style-clear/symbols/alcohol-m.svg
index db2ff1f46a..1ddfa3d8fd 100644
--- a/data/styles/clear/style-clear/symbols/alcohol-m.svg
+++ b/data/styles/clear/style-clear/symbols/alcohol-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="beverages-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M10.41,9.742 L9.571,9.171 L9.215,5.146 L7.785,5.146 L7.429,9.212 L6.599,9.755 C6.269,9.971 6,10.464 6,10.859 L6,17.288 C6,17.683 6.32,18.001 6.715,18.001 L10.286,18.001 C10.68,18.001 11,17.683 11,17.288 L11,10.859 C11,10.464 10.736,9.965 10.41,9.742 L10.41,9.742 Z M16.571,13.001 C17.36,13.001 18,12.361 18,11.572 L17.285,8 L13.713,8 L13,11.572 C13,12.361 13.639,13.001 14.429,13.001 L15,13.001 L15,16.715 L13,17.287 L13,18 L18,18 L18,17.287 L16,16.715 L16,13.001 L16.571,13.001 L16.571,13.001 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/alcohol-s.svg b/data/styles/clear/style-clear/symbols/alcohol-s.svg
index 02762399ae..9f872239fa 100644
--- a/data/styles/clear/style-clear/symbols/alcohol-s.svg
+++ b/data/styles/clear/style-clear/symbols/alcohol-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="alcohol-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M6,3 L6,5 L4,7 L4,12.4063 L4.59375,13 L8.625,13 L9,12.5 L9,7 L7,5 L7,3 L6,3 L6,3 Z M10,7 L10,9 L11,10 L11,12 L10,13 L13,13 L12,12 L12,10 L13,9 L13,7 L10,7 L10,7 Z" id="path5715-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-l.svg b/data/styles/clear/style-clear/symbols/alpine_hut-l.svg
index fb5ac15934..71fbcdca72 100644
--- a/data/styles/clear/style-clear/symbols/alpine_hut-l.svg
+++ b/data/styles/clear/style-clear/symbols/alpine_hut-l.svg
@@ -8,7 +8,7 @@
         <g id="alpine_hut-l" sketch:type="MSLayerGroup">
             <g id="Shape-+-Shape-+-Shape" sketch:type="MSShapeGroup">
                 <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF"></path>
-                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#8C4D16"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54"></path>
                 <path d="M21,12.502 L21,21 L16,21 L16,16 L11,16 L11,21 L6,21 L6,12.502 L13.498,5 L21,12.502 L21,12.502 Z" id="Shape" fill="#FFFFFF"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-clear/symbols/alpine_hut-m.svg b/data/styles/clear/style-clear/symbols/alpine_hut-m.svg
index 823a38d151..1045f8b932 100644
--- a/data/styles/clear/style-clear/symbols/alpine_hut-m.svg
+++ b/data/styles/clear/style-clear/symbols/alpine_hut-m.svg
@@ -8,7 +8,7 @@
         <g id="alpine_hut-m" sketch:type="MSLayerGroup">
             <g id="Shape-+-Shape-+-Shape" sketch:type="MSShapeGroup">
                 <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF"></path>
-                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#8C4D16"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54"></path>
                 <path d="M17,10.502 L17,18 L13,18 L13,14 L10,14 L10,18 L6,18 L6,10.502 L11.498,5 L17,10.502 L17,10.502 Z" id="Shape" fill="#FFFFFF"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-clear/symbols/america-football-l.svg b/data/styles/clear/style-clear/symbols/america-football-l.svg
index 9bf7de715d..af06d96be2 100644
--- a/data/styles/clear/style-clear/symbols/america-football-l.svg
+++ b/data/styles/clear/style-clear/symbols/america-football-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="america-football-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,7 C7,7 4,13.5 4,13.5 C4,13.5 7,20 13.5,20 C20,20 23,13.5 23,13.5 C23,13.5 20,7 13.5,7 L13.5,7 Z M10.5,12 C10.777,12 11,12.223 11,12.5 L11,13 L13,13 L13,12.5 C13,12.223 13.223,12 13.5,12 C13.777,12 14,12.223 14,12.5 L14,13 L16,13 L16,12.5 C16,12.223 16.223,12 16.5,12 C16.777,12 17,12.223 17,12.5 L17,13 L18.5,13 C18.777,13 19,13.223 19,13.5 C19,13.777 18.777,14 18.5,14 L17,14 L17,14.5 C17,14.777 16.777,15 16.5,15 C16.223,15 16,14.777 16,14.5 L16,14 L14,14 L14,14.5 C14,14.777 13.777,15 13.5,15 C13.223,15 13,14.777 13,14.5 L13,14 L11,14 L11,14.5 C11,14.777 10.777,15 10.5,15 C10.223,15 10,14.777 10,14.5 L10,14 L8.5,14 C8.223,14 8,13.777 8,13.5 C8,13.223 8.223,13 8.5,13 L10,13 L10,12.5 C10,12.223 10.223,12 10.5,12 L10.5,12 Z" id="path14961-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/america-football-m.svg b/data/styles/clear/style-clear/symbols/america-football-m.svg
index 09037a7235..6608d6f374 100644
--- a/data/styles/clear/style-clear/symbols/america-football-m.svg
+++ b/data/styles/clear/style-clear/symbols/america-football-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="america-football-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,7 C6.71053,7 5,11.5 5,11.5 C5,11.5 6.71053,16 11.5,16 C16.28947,16 18,11.5 18,11.5 C18,11.5 16.28947,7 11.5,7 L11.5,7 Z M9.25,10 C9.3885,10 9.5,10.1115 9.5,10.25 L9.5,11 L11.25,11 L11.25,10.25 C11.25,10.1115 11.3615,10 11.5,10 C11.6385,10 11.75,10.1115 11.75,10.25 L11.75,11 L13.5,11 L13.5,10.25 C13.5,10.1115 13.6115,10 13.75,10 C13.8885,10 14.03359,10.1156 14,10.25 L14,11 L14.5625,11 C14.80872,11 15,11.223 15,11.5 C15,11.777 14.80872,12 14.5625,12 L14,12 L14,12.75 C14,12.8885 13.8885,13 13.75,13 C13.6115,13 13.53359,12.8844 13.5,12.75 L13.5,12 L11.75,12 L11.75,12.75 C11.75,12.8885 11.6385,13 11.5,13 C11.3615,13 11.25,12.8885 11.25,12.75 L11.25,12 L9.5,12 L9.5,12.75 C9.5,12.8885 9.3885,13 9.25,13 C9.1115,13 9,12.8885 9,12.75 L9,12 L8.4375,12 C8.19128,12 8,11.777 8,11.5 C8,11.223 8.19128,11 8.4375,11 L9,11 L9,10.25 C9,10.1115 9.1115,10 9.25,10 L9.25,10 Z" id="path11300-2-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/america-football-s.svg b/data/styles/clear/style-clear/symbols/america-football-s.svg
index e96b6b7687..c4d9d88d74 100644
--- a/data/styles/clear/style-clear/symbols/america-football-s.svg
+++ b/data/styles/clear/style-clear/symbols/america-football-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="america-football-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,5 C5.25,5 4,8 4,8 C4,8 5.25,11 8.5,11 C11.75,11 13,8 13,8 C13,8 11.75,5 8.5,5 L8.5,5 Z M7.5,7.5 L8.5,7.5 L9,7.5 L10,7.5 L10.5,7.5 L11,7.5 C11.1385,7.5 11.25,7.6115 11.25,7.75 C11.25,7.8885 11.1385,8 11,8 L10.5,8 L10,8 L9,8 L8.5,8 L7.5,8 L7,8 L6.25,8 C6.1115,8 6,7.8885 6,7.75 C6,7.6115 6.1115,7.5 6.25,7.5 L7,7.5 L7.5,7.5 Z" id="path11300-6-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/archery-l.svg b/data/styles/clear/style-clear/symbols/archery-l.svg
index bff0a4d7e9..76a05a7fb0 100644
--- a/data/styles/clear/style-clear/symbols/archery-l.svg
+++ b/data/styles/clear/style-clear/symbols/archery-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="archery-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M21,11.501 C21,9.266 20.012,7.262 18.456,5.886 L18,3 L16,3 L16.241,4.525 C15.39,4.19 14.469,4 13.501,4 C12.532,4 11.609,4.19 10.759,4.526 L11,3 L9,3 L8.544,5.887 C6.988,7.262 6,9.266 6,11.501 C6,12.896 6.39,14.197 7.055,15.316 L6,22 L8,22 L8.743,17.294 C9.917,18.26 11.39,18.868 13,18.976 L13,21 L14,21 L14,18.976 C15.609,18.87 17.083,18.261 18.257,17.295 L19,22 L21,22 L19.945,15.317 C20.61,14.197 21,12.896 21,11.501 L21,11.501 Z M13.501,17.001 C10.468,17.001 8,14.533 8,11.501 C8,8.468 10.468,6 13.501,6 C16.533,6 19,8.468 19,11.501 C19,14.533 16.533,17.001 13.501,17.001 L13.501,17.001 Z M13.501,9 C12.122,9 11,10.121 11,11.5 C11,12.879 12.122,14 13.501,14 C14.879,14 16,12.879 16,11.5 C16,10.121 14.879,9 13.501,9 L13.501,9 Z M13.501,13 C12.672,13 12,12.328 12,11.5 C12,10.672 12.672,10 13.501,10 C14.329,10 15,10.672 15,11.5 C15,12.328 14.329,13 13.501,13 L13.501,13 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/archery-m.svg b/data/styles/clear/style-clear/symbols/archery-m.svg
index 9ffdce9057..cd8927fd32 100644
--- a/data/styles/clear/style-clear/symbols/archery-m.svg
+++ b/data/styles/clear/style-clear/symbols/archery-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="archery-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17,10.501 C17,8.776 16.201,7.236 14.956,6.227 L14.6,4 L13,4 L13.204,5.273 C12.667,5.097 12.096,5 11.501,5 C10.905,5 10.334,5.098 9.796,5.273 L10,4 L8.4,4 L8.044,6.228 C6.799,7.238 6,8.777 6,10.501 C6,11.599 6.327,12.62 6.884,13.48 L6,19 L7.6,19 L8.252,14.928 C9.036,15.505 9.977,15.882 11,15.975 L11,18 L12,18 L12,15.975 C13.023,15.882 13.964,15.506 14.748,14.929 L15.4,19 L17,19 L16.117,13.479 C16.673,12.62 17,11.599 17,10.501 L17,10.501 Z M11.501,14 C9.57,14 8,12.431 8,10.501 C8,8.57 9.57,7 11.501,7 C13.431,7 15,8.57 15,10.501 C15,12.431 13.431,14 11.501,14 L11.501,14 Z M11.501,9 C10.672,9 10,9.672 10,10.5 C10,11.329 10.672,12.002 11.501,12.002 C12.33,12.002 13,11.329 13,10.5 C13,9.672 12.33,9 11.501,9 L11.501,9 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/atm-l.svg b/data/styles/clear/style-clear/symbols/atm-l.svg
index b8b8f86885..dcf2e24d76 100644
--- a/data/styles/clear/style-clear/symbols/atm-l.svg
+++ b/data/styles/clear/style-clear/symbols/atm-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="atm-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M6,9 C5.446,9 5,9.446 5,10 L5,19 C5,19.554 5.446,20 6,20 L21,20 C21.554,20 22,19.554 22,19 L22,10 C22,9.446 21.554,9 21,9 L6,9 Z M5.5,11 L21,11 L21,13 L5.5,13 L5.5,11 Z M6,16 L9,16 L9,18 L6,18 L6,16 Z M14,17 L21,17 L21,18 L14,18 L14,17 Z" id="rect10401-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/atm-m.svg b/data/styles/clear/style-clear/symbols/atm-m.svg
index 5d26ac637e..18d8a15580 100644
--- a/data/styles/clear/style-clear/symbols/atm-m.svg
+++ b/data/styles/clear/style-clear/symbols/atm-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="atm-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M5.72222,8 C5.32211,8 5,8.3221 5,8.7223 L5,15.2778 C5,15.6779 5.32211,16 5.72222,16 L17.27778,16 C17.67789,16 18,15.6779 18,15.2778 L18,8.7223 C18,8.3221 17.67789,8 17.27778,8 L5.72222,8 Z M5.5,9.5 L17.5,9.5 L17.5,11 L5.5,11 L5.5,9.5 Z M6,13.5 L8,13.5 L8,15 L6,15 L6,13.5 Z M12,14.2777 L17,14.2777 L17,15 L12,15 L12,14.2777 Z" id="rect10401-9-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/atm-s.svg b/data/styles/clear/style-clear/symbols/atm-s.svg
index 41f83dc128..688af7c172 100644
--- a/data/styles/clear/style-clear/symbols/atm-s.svg
+++ b/data/styles/clear/style-clear/symbols/atm-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="atm-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M4.5,5 C4.223,5 4,5.223 4,5.5 L4,10.5 C4,10.777 4.223,11 4.5,11 L12.5,11 C12.777,11 13,10.777 13,10.5 L13,5.5 C13,5.223 12.777,5 12.5,5 L4.5,5 Z M4.5,6 L12.5,6 L12.5,7 L4.5,7 L4.5,6 Z M4.5,9 L6,9 L6,10 L4.5,10 L4.5,9 Z M9,9.5 L12,9.5 L12,10 L9,10 L9,9.5 Z" id="rect10401-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/australian-football-l.svg b/data/styles/clear/style-clear/symbols/australian-football-l.svg
index a5616e1ea9..544de5e84b 100644
--- a/data/styles/clear/style-clear/symbols/australian-football-l.svg
+++ b/data/styles/clear/style-clear/symbols/australian-football-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="australian-football-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17.3414941,6.00207143 C14.4756401,6.11677618 11.6441974,7.27000008 9.45686611,9.45821376 C7.26865244,11.6455451 6.11631088,14.4769877 6.00072379,17.3428417 C5.92748922,19.1913529 7.8086471,21.0725108 9.65715825,20.9992762 C12.5230123,20.8836891 15.3544549,19.7313476 17.5417862,17.5431339 C19.7299999,15.3558026 20.8832238,12.5243599 20.9979286,9.6585059 C21.0711631,7.80999475 19.1900053,5.92883686 17.3414941,6.00207143 L17.3414941,6.00207143 Z M18.1029572,11.8026024 C18.3094257,12.0081886 18.3094257,12.3443617 18.1029572,12.5508303 L17.8444303,12.8093571 C17.7447254,12.909062 17.6114914,12.9646497 17.4703164,12.9646497 C17.3291413,12.9646497 17.1959073,12.9099444 17.0962024,12.8093571 L16.1468,11.8608371 L14.5074045,13.5002327 L15.4559245,14.449635 C15.662393,14.6552212 15.662393,14.9913944 15.4559245,15.1978629 L15.1973976,15.4563898 C15.0976927,15.5560947 14.9644588,15.6116824 14.8232837,15.6116824 C14.6821086,15.6116824 14.5488746,15.556977 14.4491697,15.4563898 L13.4997673,14.5078698 L11.8603718,16.1472653 L12.8088918,17.0966677 C12.9085967,17.1963726 12.9641844,17.3296066 12.9641844,17.4707817 C12.9641844,17.6119567 12.9094791,17.7451907 12.8088918,17.8448956 L12.550365,18.1034225 C12.4506601,18.2031274 12.3174261,18.2587151 12.176251,18.2587151 C12.0350759,18.2587151 11.901842,18.2040097 11.8021371,18.1034225 L10.8527347,17.1549024 L9.90333229,18.1034225 C9.80362739,18.2031274 9.67039342,18.2587151 9.52921834,18.2587151 C9.38804326,18.2587151 9.25480929,18.2040097 9.15510439,18.1034225 L8.89657753,17.8448956 C8.69010898,17.6393094 8.69010898,17.3031363 8.89657753,17.0966677 L9.84509757,16.1472653 L8.89657753,15.1978629 C8.69010898,14.9922767 8.69010898,14.6561036 8.89657753,14.449635 L9.15510439,14.1911082 C9.25480929,14.0914033 9.38804326,14.0358156 9.52921834,14.0358156 C9.67039342,14.0358156 9.80362739,14.0905209 9.90333229,14.1911082 L10.8527347,15.1396282 L12.4921302,13.5002327 L11.5436102,12.5508303 C11.3371417,12.3452441 11.3371417,12.0090709 11.5436102,11.8026024 L11.8021371,11.5440755 C11.901842,11.4443706 12.0350759,11.3887829 12.176251,11.3887829 C12.3174261,11.3887829 12.4506601,11.4434883 12.550365,11.5440755 L13.4997673,12.4925955 L15.1391629,10.8532 L14.1906429,9.90379759 C14.090938,9.80409269 14.0353503,9.67085872 14.0353503,9.52968364 C14.0353503,9.38850856 14.0900556,9.25527459 14.1906429,9.15556969 L14.4491697,8.89704283 C14.5488746,8.79733793 14.6821086,8.74175025 14.8232837,8.74175025 C14.9644588,8.74175025 15.0976927,8.79645559 15.1973976,8.89704283 L16.1468,9.84556287 L17.0962024,8.89704283 C17.1959073,8.79733793 17.3291413,8.74175025 17.4703164,8.74175025 C17.6114914,8.74175025 17.7447254,8.79645559 17.8444303,8.89704283 L18.1029572,9.15556969 C18.3094257,9.36115589 18.3094257,9.69732904 18.1029572,9.90379759 L17.1544371,10.8532 L18.1029572,11.8026024 L18.1029572,11.8026024 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/australian-football-m.svg b/data/styles/clear/style-clear/symbols/australian-football-m.svg
index 693e1f45e2..7f4517b1b7 100644
--- a/data/styles/clear/style-clear/symbols/australian-football-m.svg
+++ b/data/styles/clear/style-clear/symbols/australian-football-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="australian-football-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M14.8416197,5.00174174 C12.3658587,5.10049497 9.92041664,6.09755618 8.03284378,7.98599529 C6.14267215,9.87530066 5.14734346,12.3198764 5.04772397,14.7947712 C4.98448725,16.3904156 6.60958439,18.0155128 8.20522882,17.952276 C10.6801236,17.8526565 13.1255656,16.8564616 15.0140047,14.9671562 C16.9033101,13.0787171 17.899505,10.6341413 17.9982583,8.15838033 C18.0606287,6.5627359 16.4372641,4.93937127 14.8416197,5.00174174 L14.8416197,5.00174174 Z M9.64754585,12.3631893 L8.71632014,11.4310973 C8.51361612,11.2292595 8.51361612,10.8992158 8.71632014,10.6965118 L8.97013329,10.4426987 C9.06802027,10.3448117 9.198825,10.2902375 9.33742603,10.2902375 C9.47602707,10.2902375 9.60683179,10.3439454 9.70471878,10.4426987 L10.6368107,11.3739244 L11.3800588,10.6306763 L10.4488331,9.69858434 C10.3509461,9.60069736 10.2963719,9.46989263 10.2963719,9.3312916 C10.2963719,9.19269056 10.3500798,9.06188583 10.4488331,8.96399885 L10.7026462,8.7101857 C10.8005332,8.61229872 10.9313379,8.55772456 11.069939,8.55772456 C11.20854,8.55772456 11.3393447,8.61143247 11.4372317,8.7101857 L12.3693237,9.64141141 L13.3014157,8.7101857 C13.3993026,8.61229872 13.5301074,8.55772456 13.6687084,8.55772456 C13.8073094,8.55772456 13.9381142,8.61143247 14.0360011,8.7101857 L14.2898143,8.96399885 C14.4925183,9.16583661 14.4925183,9.49588033 14.2898143,9.69858434 L13.3585886,10.6306763 L14.2898143,11.5627683 C14.4925183,11.764606 14.4925183,12.0946497 14.2898143,12.2973538 L14.0360011,12.5511669 C13.9381142,12.6490539 13.8073094,12.7036281 13.6687084,12.7036281 C13.5301074,12.7036281 13.3993026,12.6499202 13.3014157,12.5511669 L12.3693237,11.6199412 L11.6260756,12.3631893 L12.5573013,13.2952812 C12.7600054,13.497119 12.7600054,13.8271627 12.5573013,14.0298667 L12.3034882,14.2836799 C12.2056012,14.3815668 12.0747965,14.436141 11.9361955,14.436141 C11.7975944,14.436141 11.6667897,14.3824331 11.5689027,14.2836799 L10.6368107,13.3524542 L9.70471878,14.2836799 C9.60683179,14.3815668 9.47602707,14.436141 9.33742603,14.436141 C9.198825,14.436141 9.06802027,14.3824331 8.97013329,14.2836799 L8.71632014,14.0298667 C8.51361612,13.828029 8.51361612,13.4979852 8.71632014,13.2952812 L9.64754585,12.3631893 L9.64754585,12.3631893 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bakery-l.svg b/data/styles/clear/style-clear/symbols/bakery-l.svg
index 89f1b620d2..9ae107b564 100644
--- a/data/styles/clear/style-clear/symbols/bakery-l.svg
+++ b/data/styles/clear/style-clear/symbols/bakery-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bakery-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M13.5,7 C12,7 10.736,7.536 11.062,9 L12.5,15.5 C12.551,15.73 12.689,16 13,16 L14,16 L14,16 C14.311,16 14.449,15.73 14.5,15.5 L15.938,9 C16.264,7.536 15,7 13.5,7 L14,7 L13.5,7 L13.5,7 Z M8,10 C7,10 6.049,10.599 6.5,11.5 L8.5,15.5 C8.666,15.834 9,16 9.5,16 L10.5,16 C10.5,16 11.115,16.018 11,15.5 L10,11 C9.889,10.497 9.5,10 9,10 L8,10 L8,10 Z M18,10 C17.5,10 17.111,10.497 17,11 L16,15.5 C15.885,16.018 16.5,16 16.5,16 L17.5,16 C18,16 18.334,15.834 18.5,15.5 L20.5,11.5 C20.951,10.599 20,10 19,10 L18,10 L18,10 Z M5.438,13.125 C5.245,13.124 5.083,13.243 5,13.5 L4.043,16.494 C3.924,16.869 4.005,17.06 4.512,16.963 L7,16.5 C7.491,16.406 7.572,16.234 7.438,16 L6,13.5 C5.854,13.248 5.631,13.126 5.438,13.125 L5.438,13.125 Z M21.562,13.125 C21.369,13.126 21.145,13.248 21,13.5 L19.562,16 C19.427,16.234 19.508,16.406 20,16.5 L22.453,16.975 C22.96,17.072 23.072,16.88 22.953,16.506 L22,13.5 C21.918,13.243 21.756,13.124 21.562,13.125 L21.562,13.125 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bakery-m.svg b/data/styles/clear/style-clear/symbols/bakery-m.svg
index 3c7d481bbb..5c6a2bfdb1 100644
--- a/data/styles/clear/style-clear/symbols/bakery-m.svg
+++ b/data/styles/clear/style-clear/symbols/bakery-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bakery-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M11,7 C10,7 9.5,7.5 9.5,8.5 L10.5,12.5 L11,13 L12,13 L12.5,12.5 L13.5,8.5 C13.5,7.5 13,7 12,7 L11,7 L11,7 Z M8.5,8.5 L6.5,9.5 L8,13 L9,13 L9.5,12.5 L8.5,8.5 L8.5,8.5 Z M14.5,8.5 L13.5,12.5 L14,13 L15,13 L16.5,9.5 L14.5,8.5 L14.5,8.5 Z M6,10.5 L5.5,11 L5,12.5 L5,14 L5.5,14 L7,13 L6,10.5 L6,10.5 Z M17,10.5 L16,13 L17,14 L18,14 L18,12.5 L17.5,11 L17,10.5 L17,10.5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bank-l.svg b/data/styles/clear/style-clear/symbols/bank-l.svg
index a645206658..3b984ff746 100644
--- a/data/styles/clear/style-clear/symbols/bank-l.svg
+++ b/data/styles/clear/style-clear/symbols/bank-l.svg
@@ -7,9 +7,9 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bank-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.500000)">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,5.5 C13.5,5.5 6.00625,9.08651786 6.00397727,9.54568452 L6,10.5 L21,10.5 L21,9.55133929 C20.99375,9.08651786 13.5,5.5 13.5,5.5 Z M20.0365553,19.5 L19.5,10.5 L7.5,10.5 L7.04839683,19.5 L7.00334852,19.5 C6.44921444,19.5 6,19.9438648 6,20.5 L6,21.5 L21,21.5 L21,20.5 C21,19.9477153 20.5521239,19.5 20.0365553,19.5 L20.0365553,19.5 Z" id="Imported-Layers-Copy-3" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M14,10.0429192 L14,9 L13,9 L13,10.0112011 C12.1840525,10.0616568 11.5515095,10.2825733 11.102356,10.673955 C10.5867284,11.1232606 10.3289185,11.6874564 10.3289185,12.3665595 C10.3289185,13.110829 10.5956801,13.6578761 11.1292114,14.007717 C11.4443172,14.2169357 12.0136474,14.4107172 12.8372192,14.5890675 L13,14.6240494 L13,16.6791338 C12.5841018,16.6204224 12.2756117,16.4742166 12.0745239,16.2405145 C11.9277133,16.0690238 11.8292442,15.8100768 11.7791138,15.4636656 L10.2000122,15.4636656 C10.2000122,16.2525227 10.4954194,16.8724522 11.0862427,17.3234727 C11.574049,17.6958525 12.2119635,17.9145044 13,17.9794324 L13,19 L14,19 L14,17.9813452 C14.7805086,17.9183206 15.4017809,17.6956013 15.8638306,17.3131833 C16.417056,16.8553032 16.6936646,16.2799606 16.6936646,15.5871383 C16.6936646,14.911465 16.4573388,14.3952858 15.9846802,14.0385852 C15.6803167,13.8087877 15.2291493,13.6252954 14.6311646,13.4881029 L14,13.3429133 L14,11.4183449 C14.078905,11.443386 14.1532254,11.4730695 14.2229614,11.5073955 C14.6096821,11.6994651 14.8173623,12.0235776 14.8460083,12.4797428 L16.4358521,12.4797428 C16.4072061,11.6737366 16.0983713,11.0589517 15.5093384,10.6353698 C15.0733979,10.3218788 14.570288,10.1243961 14,10.0429192 Z M14,14.8444083 L14,16.6758666 C14.1524217,16.6553077 14.2876142,16.6250886 14.4055786,16.585209 C14.867495,16.4274376 15.0984497,16.1341929 15.0984497,15.7054662 C15.0984497,15.4550899 14.9838675,15.2613083 14.7546997,15.1241158 C14.5795105,15.0218598 14.3279456,14.9286245 14,14.8444083 Z M13,13.1108495 L13,11.328331 C12.6938917,11.3560047 12.4409026,11.4345563 12.2410278,11.5639871 C11.9867948,11.7286182 11.8596802,11.9584122 11.8596802,12.2533762 C11.8596802,12.5243315 11.9850044,12.7266874 12.2356567,12.8604502 C12.3677376,12.9335468 12.6225168,13.0170127 13,13.1108495 Z" id="Rectangle-11-Copy" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M14,10.0429192 L14,9 L13,9 L13,10.0112011 C12.1840525,10.0616568 11.5515095,10.2825733 11.102356,10.673955 C10.5867284,11.1232606 10.3289185,11.6874564 10.3289185,12.3665595 C10.3289185,13.110829 10.5956801,13.6578761 11.1292114,14.007717 C11.4443172,14.2169357 12.0136474,14.4107172 12.8372192,14.5890675 L13,14.6240494 L13,16.6791338 C12.5841018,16.6204224 12.2756117,16.4742166 12.0745239,16.2405145 C11.9277133,16.0690238 11.8292442,15.8100768 11.7791138,15.4636656 L10.2000122,15.4636656 C10.2000122,16.2525227 10.4954194,16.8724522 11.0862427,17.3234727 C11.574049,17.6958525 12.2119635,17.9145044 13,17.9794324 L13,19 L14,19 L14,17.9813452 C14.7805086,17.9183206 15.4017809,17.6956013 15.8638306,17.3131833 C16.417056,16.8553032 16.6936646,16.2799606 16.6936646,15.5871383 C16.6936646,14.911465 16.4573388,14.3952858 15.9846802,14.0385852 C15.6803167,13.8087877 15.2291493,13.6252954 14.6311646,13.4881029 L14,13.3429133 L14,11.4183449 C14.078905,11.443386 14.1532254,11.4730695 14.2229614,11.5073955 C14.6096821,11.6994651 14.8173623,12.0235776 14.8460083,12.4797428 L16.4358521,12.4797428 C16.4072061,11.6737366 16.0983713,11.0589517 15.5093384,10.6353698 C15.0733979,10.3218788 14.570288,10.1243961 14,10.0429192 Z M14,14.8444083 L14,16.6758666 C14.1524217,16.6553077 14.2876142,16.6250886 14.4055786,16.585209 C14.867495,16.4274376 15.0984497,16.1341929 15.0984497,15.7054662 C15.0984497,15.4550899 14.9838675,15.2613083 14.7546997,15.1241158 C14.5795105,15.0218598 14.3279456,14.9286245 14,14.8444083 Z M13,13.1108495 L13,11.328331 C12.6938917,11.3560047 12.4409026,11.4345563 12.2410278,11.5639871 C11.9867948,11.7286182 11.8596802,11.9584122 11.8596802,12.2533762 C11.8596802,12.5243315 11.9850044,12.7266874 12.2356567,12.8604502 C12.3677376,12.9335468 12.6225168,13.0170127 13,13.1108495 Z" id="Rectangle-11-Copy" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/bank-m.svg b/data/styles/clear/style-clear/symbols/bank-m.svg
index 5cd7c2f405..151c4847cc 100644
--- a/data/styles/clear/style-clear/symbols/bank-m.svg
+++ b/data/styles/clear/style-clear/symbols/bank-m.svg
@@ -7,9 +7,9 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bank-2-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 1.000000)">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,4 C11.5,4 5.00541667,6.86921429 5.00344697,7.23654762 L5,8 L18,8 L18,7.24107143 C17.9945833,6.86921429 11.5,4 11.5,4 Z M17.0365553,16 L16.5,8 L6.5,8 L6.04839683,16 L6.00334852,16 C5.44921444,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5521239,16 17.0365553,16 L17.0365553,16 Z" id="Imported-Layers-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M12,8.0429192 L12,7 L11,7 L11,8.01120106 C10.1840525,8.06165681 9.5515095,8.2825733 9.10235596,8.67395498 C8.58672838,9.12326055 8.32891846,9.68745641 8.32891846,10.3665595 C8.32891846,11.110829 8.59568011,11.6578761 9.12921143,12.007717 C9.44431717,12.2169357 10.0136474,12.4107172 10.8372192,12.5890675 L11,12.6240494 L11,14.6791338 C10.5841018,14.6204224 10.2756117,14.4742166 10.0745239,14.2405145 C9.9277133,14.0690238 9.82924423,13.8100768 9.77911377,13.4636656 L8.20001221,13.4636656 C8.20001221,14.2525227 8.49541941,14.8724522 9.08624268,15.3234727 C9.57404901,15.6958525 10.2119635,15.9145044 11,15.9794324 L11,17 L12,17 L12,15.9813452 C12.7805086,15.9183206 13.4017809,15.6956013 13.8638306,15.3131833 C14.417056,14.8553032 14.6936646,14.2799606 14.6936646,13.5871383 C14.6936646,12.911465 14.4573388,12.3952858 13.9846802,12.0385852 C13.6803167,11.8087877 13.2291493,11.6252954 12.6311646,11.4881029 L12,11.3429133 L12,9.4183449 C12.078905,9.44338597 12.1532254,9.47306949 12.2229614,9.5073955 C12.6096821,9.69946505 12.8173623,10.0235776 12.8460083,10.4797428 L14.4358521,10.4797428 C14.4072061,9.67373659 14.0983713,9.05895174 13.5093384,8.63536977 C13.0733979,8.32187875 12.570288,8.12439609 12,8.0429192 Z M12,12.8444083 L12,14.6758666 C12.1524217,14.6553077 12.2876142,14.6250886 12.4055786,14.585209 C12.867495,14.4274376 13.0984497,14.1341929 13.0984497,13.7054662 C13.0984497,13.4550899 12.9838675,13.2613083 12.7546997,13.1241158 C12.5795105,13.0218598 12.3279456,12.9286245 12,12.8444083 Z M11,11.1108495 L11,9.32833103 C10.6938917,9.35600465 10.4409026,9.43455629 10.2410278,9.56398714 C9.98679479,9.72861819 9.85968018,9.95841224 9.85968018,10.2533762 C9.85968018,10.5243315 9.98500444,10.7266874 10.2356567,10.8604502 C10.3677376,10.9335468 10.6225168,11.0170127 11,11.1108495 Z" id="Rectangle-11" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M12,8.0429192 L12,7 L11,7 L11,8.01120106 C10.1840525,8.06165681 9.5515095,8.2825733 9.10235596,8.67395498 C8.58672838,9.12326055 8.32891846,9.68745641 8.32891846,10.3665595 C8.32891846,11.110829 8.59568011,11.6578761 9.12921143,12.007717 C9.44431717,12.2169357 10.0136474,12.4107172 10.8372192,12.5890675 L11,12.6240494 L11,14.6791338 C10.5841018,14.6204224 10.2756117,14.4742166 10.0745239,14.2405145 C9.9277133,14.0690238 9.82924423,13.8100768 9.77911377,13.4636656 L8.20001221,13.4636656 C8.20001221,14.2525227 8.49541941,14.8724522 9.08624268,15.3234727 C9.57404901,15.6958525 10.2119635,15.9145044 11,15.9794324 L11,17 L12,17 L12,15.9813452 C12.7805086,15.9183206 13.4017809,15.6956013 13.8638306,15.3131833 C14.417056,14.8553032 14.6936646,14.2799606 14.6936646,13.5871383 C14.6936646,12.911465 14.4573388,12.3952858 13.9846802,12.0385852 C13.6803167,11.8087877 13.2291493,11.6252954 12.6311646,11.4881029 L12,11.3429133 L12,9.4183449 C12.078905,9.44338597 12.1532254,9.47306949 12.2229614,9.5073955 C12.6096821,9.69946505 12.8173623,10.0235776 12.8460083,10.4797428 L14.4358521,10.4797428 C14.4072061,9.67373659 14.0983713,9.05895174 13.5093384,8.63536977 C13.0733979,8.32187875 12.570288,8.12439609 12,8.0429192 Z M12,12.8444083 L12,14.6758666 C12.1524217,14.6553077 12.2876142,14.6250886 12.4055786,14.585209 C12.867495,14.4274376 13.0984497,14.1341929 13.0984497,13.7054662 C13.0984497,13.4550899 12.9838675,13.2613083 12.7546997,13.1241158 C12.5795105,13.0218598 12.3279456,12.9286245 12,12.8444083 Z M11,11.1108495 L11,9.32833103 C10.6938917,9.35600465 10.4409026,9.43455629 10.2410278,9.56398714 C9.98679479,9.72861819 9.85968018,9.95841224 9.85968018,10.2533762 C9.85968018,10.5243315 9.98500444,10.7266874 10.2356567,10.8604502 C10.3677376,10.9335468 10.6225168,11.0170127 11,11.1108495 Z" id="Rectangle-11" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/banknote-l.svg b/data/styles/clear/style-clear/symbols/banknote-l.svg
index 5749fdf00d..e1b9050db1 100644
--- a/data/styles/clear/style-clear/symbols/banknote-l.svg
+++ b/data/styles/clear/style-clear/symbols/banknote-l.svg
@@ -7,12 +7,12 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="banknote-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.500000)">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M5,9 L22,9 L22,18 L5,18 L5,9 Z M12.5,17 C13.8807119,17 15,15.4329966 15,13.5 C15,11.5670034 13.8807119,10 12.5,10 C11.1192881,10 10,11.5670034 10,13.5 C10,15.4329966 11.1192881,17 12.5,17 Z" id="Rectangle-12-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M19.5,19 C20.8807119,19 22,18.5522847 22,18 C22,17.4477153 20.8807119,17 19.5,17 C18.1192881,17 17,17.4477153 17,18 C17,18.5522847 18.1192881,19 19.5,19 L19.5,19 Z M19.5,20 L19.5,20 C17.6125116,20 16,19.3549954 16,18 C16,16.6450046 17.6125116,16 19.5,16 C21.3874884,16 23,16.6450046 23,18 C23,19.3549954 21.3874884,20 19.5,20 L19.5,20 Z" id="Shape-Copy-4" fill="#8C4D16" sketch:type="MSShapeGroup"></path>
+            <path d="M19.5,19 C20.8807119,19 22,18.5522847 22,18 C22,17.4477153 20.8807119,17 19.5,17 C18.1192881,17 17,17.4477153 17,18 C17,18.5522847 18.1192881,19 19.5,19 L19.5,19 Z M19.5,20 L19.5,20 C17.6125116,20 16,19.3549954 16,18 C16,16.6450046 17.6125116,16 19.5,16 C21.3874884,16 23,16.6450046 23,18 C23,19.3549954 21.3874884,20 19.5,20 L19.5,20 Z" id="Shape-Copy-4" fill="#7A7A6E" sketch:type="MSShapeGroup"></path>
             <ellipse id="Oval-304-Copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="19.5" cy="16" rx="2.5" ry="1"></ellipse>
             <ellipse id="Oval-304-Copy-3" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="19.5" cy="18" rx="2.5" ry="1"></ellipse>
-            <path d="M19.5,17 C20.8807119,17 22,16.5522847 22,16 C22,15.4477153 20.8807119,15 19.5,15 C18.1192881,15 17,15.4477153 17,16 C17,16.5522847 18.1192881,17 19.5,17 L19.5,17 Z M19.5,18 L19.5,18 C17.6125116,18 16,17.3549954 16,16 C16,14.6450046 17.6125116,14 19.5,14 C21.3874884,14 23,14.6450046 23,16 C23,17.3549954 21.3874884,18 19.5,18 L19.5,18 Z" id="Shape-Copy-3" fill="#8C4D16" sketch:type="MSShapeGroup"></path>
+            <path d="M19.5,17 C20.8807119,17 22,16.5522847 22,16 C22,15.4477153 20.8807119,15 19.5,15 C18.1192881,15 17,15.4477153 17,16 C17,16.5522847 18.1192881,17 19.5,17 L19.5,17 Z M19.5,18 L19.5,18 C17.6125116,18 16,17.3549954 16,16 C16,14.6450046 17.6125116,14 19.5,14 C21.3874884,14 23,14.6450046 23,16 C23,17.3549954 21.3874884,18 19.5,18 L19.5,18 Z" id="Shape-Copy-3" fill="#7A7A6E" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/banknote-m.svg b/data/styles/clear/style-clear/symbols/banknote-m.svg
index d5f41c2a98..6f696b0073 100644
--- a/data/styles/clear/style-clear/symbols/banknote-m.svg
+++ b/data/styles/clear/style-clear/symbols/banknote-m.svg
@@ -7,12 +7,12 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="banknote-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
         </g>
         <path d="M3,7 L20,7 L20,16 L3,16 L3,7 Z M10.5,15 C11.8807119,15 13,13.4329966 13,11.5 C13,9.56700338 11.8807119,8 10.5,8 C9.11928813,8 8,9.56700338 8,11.5 C8,13.4329966 9.11928813,15 10.5,15 Z" id="Rectangle-12" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-        <path d="M16.5,17 C17.8807119,17 19,16.5522847 19,16 C19,15.4477153 17.8807119,15 16.5,15 C15.1192881,15 14,15.4477153 14,16 C14,16.5522847 15.1192881,17 16.5,17 L16.5,17 Z M16.5,18 L16.5,18 C14.6125116,18 13,17.3549954 13,16 C13,14.6450046 14.6125116,14 16.5,14 C18.3874884,14 20,14.6450046 20,16 C20,17.3549954 18.3874884,18 16.5,18 L16.5,18 Z" id="Shape" fill="#8C4D16" sketch:type="MSShapeGroup"></path>
+        <path d="M16.5,17 C17.8807119,17 19,16.5522847 19,16 C19,15.4477153 17.8807119,15 16.5,15 C15.1192881,15 14,15.4477153 14,16 C14,16.5522847 15.1192881,17 16.5,17 L16.5,17 Z M16.5,18 L16.5,18 C14.6125116,18 13,17.3549954 13,16 C13,14.6450046 14.6125116,14 16.5,14 C18.3874884,14 20,14.6450046 20,16 C20,17.3549954 18.3874884,18 16.5,18 L16.5,18 Z" id="Shape" fill="#7A7A6E" sketch:type="MSShapeGroup"></path>
         <ellipse id="Oval-304" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="16.5" cy="14" rx="2.5" ry="1"></ellipse>
         <ellipse id="Oval-304-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="16.5" cy="16" rx="2.5" ry="1"></ellipse>
-        <path d="M16.5,15 C17.8807119,15 19,14.5522847 19,14 C19,13.4477153 17.8807119,13 16.5,13 C15.1192881,13 14,13.4477153 14,14 C14,14.5522847 15.1192881,15 16.5,15 L16.5,15 Z M16.5,16 L16.5,16 C14.6125116,16 13,15.3549954 13,14 C13,12.6450046 14.6125116,12 16.5,12 C18.3874884,12 20,12.6450046 20,14 C20,15.3549954 18.3874884,16 16.5,16 L16.5,16 Z" id="Shape" fill="#8C4D16" sketch:type="MSShapeGroup"></path>
+        <path d="M16.5,15 C17.8807119,15 19,14.5522847 19,14 C19,13.4477153 17.8807119,13 16.5,13 C15.1192881,13 14,13.4477153 14,14 C14,14.5522847 15.1192881,15 16.5,15 L16.5,15 Z M16.5,16 L16.5,16 C14.6125116,16 13,15.3549954 13,14 C13,12.6450046 14.6125116,12 16.5,12 C18.3874884,12 20,12.6450046 20,14 C20,15.3549954 18.3874884,16 16.5,16 L16.5,16 Z" id="Shape" fill="#7A7A6E" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/bar-l.svg b/data/styles/clear/style-clear/symbols/bar-l.svg
index bd06ed696b..94bb9b29a4 100644
--- a/data/styles/clear/style-clear/symbols/bar-l.svg
+++ b/data/styles/clear/style-clear/symbols/bar-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bar-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#AB842F" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M7,7 C6.5,7 6,7.0006 6,7.25 C6,7.5006 6.34281,7.7979 6.5,8 L13,14.8125 L13,21 L10,22 C9.5,22.1667 9,22.5 9,23 L18,23 C18,22.5 17.5,22.1667 17,22 L14,21 L14,14.8125 L20.5,8 C20.65719,7.7979 21,7.5006 21,7.25 C21,7.0006 20.5,7 20,7 L7,7 Z" id="path15601-4" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bar-m.svg b/data/styles/clear/style-clear/symbols/bar-m.svg
index 69a15aebb2..858a43cbd1 100644
--- a/data/styles/clear/style-clear/symbols/bar-m.svg
+++ b/data/styles/clear/style-clear/symbols/bar-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bar-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#AB842F" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6,6 C5.59375,6 5,6.047 5,6.25 C5,6.4536 5.37228,6.8358 5.5,7 L11,13 L11,17 L8.1875,18.1875 C7.78125,18.3229 7.5,18.5 7.5,19 L15.5,19 C15.5,18.5 15.09375,18.3229 14.6875,18.1875 L12,17 L12,13 L17.5,7 C17.62772,6.8358 18,6.4536 18,6.25 C18,6.0474 17.40625,6 17,6 L6,6 Z" id="path15601-4-0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bar-s.svg b/data/styles/clear/style-clear/symbols/bar-s.svg
index bda5446328..7221c0f977 100644
--- a/data/styles/clear/style-clear/symbols/bar-s.svg
+++ b/data/styles/clear/style-clear/symbols/bar-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bar-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#AB842F" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M4.5,5 C4.21875,5 4,5.0003 4,5.1406 C4,5.2816 4.19283,5.4488 4.28125,5.5625 L8,10 L8,12.5 C7,13 5.5,13.5 5.5,14 L11.5,14 C11.5,13.5 10,13 9,12.5 L9,10 L12.71875,5.5625 C12.80715,5.4488 13,5.2816 13,5.1406 C13,5.0003 12.78125,5 12.5,5 L4.5,5 Z" id="path15601-4-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/baseball-l.svg b/data/styles/clear/style-clear/symbols/baseball-l.svg
index 569e3e542c..5fa812d4c7 100644
--- a/data/styles/clear/style-clear/symbols/baseball-l.svg
+++ b/data/styles/clear/style-clear/symbols/baseball-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="baseball-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M6,6 C5,7 5,8 5,8 L15,18 L16.5,17.5 L20.5,21.5 C20.81628,21.8163 21.00625,22 21.40625,22 C21.53125,22 21.6875,22 21.84375,21.8438 C22.00005,21.6875 22,21.5313 22,21.4063 C22,21.0063 21.78212,20.7821 21.5,20.5 L17.5,16.5 L18,15 L8,5 C8,5 7,5 6,6 L6,6 Z M9.5,15 C8.67157,15 8,15.6716 8,16.5 C8,17.3284 8.67157,18 9.5,18 C10.32843,18 11,17.3284 11,16.5 C11,15.6716 10.32843,15 9.5,15 L9.5,15 Z" id="path9336-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/baseball-m.svg b/data/styles/clear/style-clear/symbols/baseball-m.svg
index 4fe4c3dd9f..687dfd3632 100644
--- a/data/styles/clear/style-clear/symbols/baseball-m.svg
+++ b/data/styles/clear/style-clear/symbols/baseball-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="baseball-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M8,5 C8,5 7,5 6.5,5.5 C6,6 6,7 6,7 C8.5,10.5 13.07972,13.1418 14,14 L16.59375,16.4063 L16,17 L16,18 L17,18 L18,17 L19,16 L19,15 L18,15 L17.40625,15.5938 L15,13 C12.63789,10.4672 11.5,7.5 8,5 L8,5 Z M9.75,14 C9.05964,14 8.5,14.5596 8.5,15.25 C8.5,15.9404 9.05964,16.5 9.75,16.5 C10.44036,16.5 11,15.9404 11,15.25 C11,14.5596 10.44036,14 9.75,14 L9.75,14 Z" id="path20837-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/baseball-s.svg b/data/styles/clear/style-clear/symbols/baseball-s.svg
index ea6330b10d..12c51b73ce 100644
--- a/data/styles/clear/style-clear/symbols/baseball-s.svg
+++ b/data/styles/clear/style-clear/symbols/baseball-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="baseball-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M4,4 L4,5.5 C5.5,7.5 8.58739,9.0874 10.5,11 L11.5,12 L11.5,13 L12.5,13 L13,12.5 L13,11.5 L12,11.5 L11,10.5 C9.21569,8.7157 7.5,5.5 5.5,4 L4,4 Z M6,9.5 C5.44772,9.5 5,9.9477 5,10.5 C5,11.0523 5.44772,11.5 6,11.5 C6.55228,11.5 7,11.0523 7,10.5 C7,9.9477 6.55228,9.5 6,9.5 L6,9.5 Z" id="path20839-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/basketball-l.svg b/data/styles/clear/style-clear/symbols/basketball-l.svg
index 74b56e283a..12195efb4c 100644
--- a/data/styles/clear/style-clear/symbols/basketball-l.svg
+++ b/data/styles/clear/style-clear/symbols/basketball-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="basketball-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M9.5,6 L5,10 L5,18 C5,18.5 5.5,19 6,19 L9.5625,19 L11.5,22.5 C11.77778,23 12,23 12.5,23 L14.5,23 C15,23 15.22222,23 15.5,22.5 L17.4375,19 L21,19 C21.5,19 22,18.5 22,18 L22,10 L17.5,6 L9.5,6 L9.5,6 Z M9,10 L18,10 L18,16 L9,16 L9,10 L9,10 Z M10,11 L10,15 L17,15 L17,11 L10,11 L10,11 Z M10.5625,19 L12,19 L12,20 L13,20 L13,19 L14,19 L14,20 L15,20 L15,19 L16.4375,19 L15.875,20 L15,20 L15,21 L15.34375,21 L15,21.625 L15,21 L14,21 L14,22 L13,22 L13,21 L12,21 L12,21.625 L11.65625,21 L12,21 L12,20 L11.125,20 L10.5625,19 L10.5625,19 Z M13,21 L14,21 L14,20 L13,20 L13,21 L13,21 Z" id="rect5769-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/basketball-m.svg b/data/styles/clear/style-clear/symbols/basketball-m.svg
index 48712cae30..9ef1a6e5cf 100644
--- a/data/styles/clear/style-clear/symbols/basketball-m.svg
+++ b/data/styles/clear/style-clear/symbols/basketball-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="basketball-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M8,6 L5,8 L5,15 C5,15.5 5.5,16 6,16 L8.5,16 L10.5,19 L11.5,19 L12.5,19 L14.5,16 L17,16 C17.5,16 18,15.5 18,15 L18,8.5 L15,6 L8,6 L8,6 Z M8,9 L15,9 L15,14 L8,14 L8,9 L8,9 Z M9,10 L9,13 L14,13 L14,10 L9,10 L9,10 Z M9.5,16 L11,16 L11,17 L12,17 L12,16 L13.5,16 L12.8125,17 L12,17 L12,18 L11,18 L11,17 L10.1875,17 L9.5,16 L9.5,16 Z" id="rect5769-7-5-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/basketball-s.svg b/data/styles/clear/style-clear/symbols/basketball-s.svg
index fd633e514a..a15cfe6deb 100644
--- a/data/styles/clear/style-clear/symbols/basketball-s.svg
+++ b/data/styles/clear/style-clear/symbols/basketball-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="basketball-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M6,4.3622 L4,6.3622 L4,10.8622 C4,11.1122 4.25,11.3622 4.5,11.3622 L6,11.3622 L7,12.3622 L8,13.3622 L9,13.3622 L10,12.3622 L11,11.3622 L12.5,11.3622 C12.75,11.3622 13,11.1122 13,10.8622 L13,6.3622 L11,4.3622 L6,4.3622 L6,4.3622 Z M6,6.3622 L11,6.3622 L11,9.3622 L6,9.3622 L6,6.3622 L6,6.3622 Z M6.6875,7.0497 L6.6875,8.6747 L10.3125,8.6747 L10.3125,7.0497 L6.6875,7.0497 L6.6875,7.0497 Z M7,10.3622 L8,10.3622 L8,11.3622 L9,11.3622 L9,10.3622 L10,10.3622 L10,11.3622 L9,12.3622 L8,12.3622 L7,11.3622 L7,10.3622 L7,10.3622 Z" id="rect5769-7-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bbq-l.svg b/data/styles/clear/style-clear/symbols/bbq-l.svg
index 52f46d2c8f..abdf106e1a 100644
--- a/data/styles/clear/style-clear/symbols/bbq-l.svg
+++ b/data/styles/clear/style-clear/symbols/bbq-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bbq-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M20,12 L7,12 C7,13.94 8.002,15.661 9.551,16.758 L7,23 L9,23 L9.409,22 L15.431,22 L14.614,20 L10.227,20 L11.205,17.607 C11.918,17.857 12.69,18 13.5,18 C14.31,18 15.082,17.857 15.796,17.607 L18,23 L20,23 L17.449,16.758 C18.998,15.661 20,13.94 20,12 L20,12 Z M13.338,10.942 C16.766,9 13.315,5.871 13.939,4.033 C11.643,6.34 14.495,9.736 13.338,10.942 L13.338,10.942 Z M16.338,10.942 C19.766,9.592 16.315,7.417 16.939,6.139 C14.643,7.743 17.495,10.104 16.338,10.942 L16.338,10.942 Z M10.338,10.942 C13.766,9.592 10.315,7.417 10.939,6.139 C8.643,7.743 11.495,10.104 10.338,10.942 L10.338,10.942 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bbq-m.svg b/data/styles/clear/style-clear/symbols/bbq-m.svg
index 01b8ac267a..ffc219702e 100644
--- a/data/styles/clear/style-clear/symbols/bbq-m.svg
+++ b/data/styles/clear/style-clear/symbols/bbq-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bbq-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15.204,13.674 C16.305,12.763 17,11.457 17,10 L6,10 C6,11.655 6.896,13.117 8.268,14.022 L6.2,19 L7.801,19 L8.216,18 L13.235,18 L12.82,17 L8.632,17 L9.6,14.668 C10.194,14.866 10.831,14.98 11.5,14.98 C12.374,14.98 13.197,14.791 13.931,14.462 L15.815,19 L17.416,19 L15.204,13.674 L15.204,13.674 Z M9.322,8.859 C12.609,7.493 9.299,5.293 9.898,4 C7.695,5.623 10.432,8.011 9.322,8.859 L9.322,8.859 Z M12.371,8.959 C15.113,7.879 12.351,6.139 12.851,5.117 C11.015,6.4 13.297,8.288 12.371,8.959 L12.371,8.959 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-l.svg b/data/styles/clear/style-clear/symbols/bcontrol-l.svg
index 694ae0b0f3..aeccb422ba 100644
--- a/data/styles/clear/style-clear/symbols/bcontrol-l.svg
+++ b/data/styles/clear/style-clear/symbols/bcontrol-l.svg
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>bcontrol-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.519" r="13.5"></circle>
-        <ellipse id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.519" rx="12.5" ry="12.5"></ellipse>
-        <g id="Rectangle-22-+-Group-Copy" sketch:type="MSLayerGroup" transform="translate(6.000000, 5.019000)" fill="#FFFFFF">
+        <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+        <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+        <g id="Rectangle-22-+-Group-Copy" sketch:type="MSLayerGroup" transform="translate(6.000000, 5.000000)" fill="#FFFFFF">
             <path d="M6.00000002,7 L6,18 L9,18 L8.99437037,10 L14.0472255,10 L14.9880238,9 L14.0472255,8 L8.99296296,8 L8.98944444,3 L14.0472255,3 L14.9880238,2 L14.0472255,1 L8.98803704,1 L8.98733333,0 L6.00000002,0 L6.00000002,5 L1,5 L0,6 L1,7 L6.00000002,7 Z" id="Rectangle-22" sketch:type="MSShapeGroup"></path>
         </g>
-        <rect id="Rectangle-46" fill="#717065" sketch:type="MSShapeGroup" x="13" y="6.019" width="1" height="16"></rect>
-        <rect id="Rectangle-47" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="9.019" width="1" height="1"></rect>
-        <rect id="Rectangle-47" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="13.019" width="1" height="1"></rect>
-        <rect id="Rectangle-47" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="17.019" width="1" height="1"></rect>
+        <rect id="Rectangle-46" fill="#7F7D54" sketch:type="MSShapeGroup" x="13" y="6" width="1" height="16"></rect>
+        <rect id="Rectangle-47" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="9" width="1" height="1"></rect>
+        <rect id="Rectangle-47" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="13" width="1" height="1"></rect>
+        <rect id="Rectangle-47" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="17" width="1" height="1"></rect>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-m.svg b/data/styles/clear/style-clear/symbols/bcontrol-m.svg
index 1a5b2f9f8e..b870122ad9 100644
--- a/data/styles/clear/style-clear/symbols/bcontrol-m.svg
+++ b/data/styles/clear/style-clear/symbols/bcontrol-m.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>bcontrol-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.519" rx="11.5" ry="11.5"></ellipse>
-        <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.519" rx="10.5" ry="10.5"></ellipse>
-        <g id="Rectangle-22-+-Group" sketch:type="MSLayerGroup" transform="translate(3.000000, 4.019000)">
+        <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+        <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+        <g id="Rectangle-22-+-Group" sketch:type="MSLayerGroup" transform="translate(3.000000, 4.000000)">
             <path d="M10,1 L10,0 L7,0 L7,4 L2.81231689,4 L2,4 L0.983093262,5 L2,6 L7,6 L7,15 L10,15 L10,9 L14,9 L15.0058594,8 L14,7 L10,7 L10,3 L14,3 L15.0452881,2 L14,1 L10,1 Z" id="Rectangle-22" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Group" transform="translate(7.000000, 1.000000)" stroke-linecap="square" sketch:type="MSShapeGroup">
                 <path d="M1.5,0.5 L1.5,12.5" id="Line" stroke="#807D54"></path>
diff --git a/data/styles/clear/style-clear/symbols/bcontrol-s.svg b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
index 1d4d68dc43..08055d4269 100644
--- a/data/styles/clear/style-clear/symbols/bcontrol-s.svg
+++ b/data/styles/clear/style-clear/symbols/bcontrol-s.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>bcontrol-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.519" r="8.5"></circle>
-        <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.519" r="7.5"></circle>
-        <g id="Rectangle-22-+-Group-Copy-2" sketch:type="MSLayerGroup" transform="translate(4.000000, 3.019000)">
+        <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+        <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+        <g id="Rectangle-22-+-Group-Copy-2" sketch:type="MSLayerGroup" transform="translate(4.000000, 3.000000)">
             <path d="M6,1 L6,0 L3,0 L3,3 L0,3 L0,4 L3,4 L3,11 L6,11 L6,6 L9,6 L9,5 L6,5 L6,2 L9,2 L9,1 L6,1 Z" id="Rectangle-22" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <g id="Group" transform="translate(3.250000, 0.733333)" stroke-linecap="square" sketch:type="MSShapeGroup">
                 <path d="M1.25,0.766666667 L1.25,8.76666667" id="Line" stroke="#807D54"></path>
diff --git a/data/styles/clear/style-clear/symbols/beach-l.svg b/data/styles/clear/style-clear/symbols/beach-l.svg
index 1bb1dd9810..1942534218 100644
--- a/data/styles/clear/style-clear/symbols/beach-l.svg
+++ b/data/styles/clear/style-clear/symbols/beach-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="beach-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M6,22 L20,22 L20,20 L6,20 L6,22 L6,22 Z M16.089,5.257 C12.25,4.229 8.318,6.375 7.057,10.084 L13.58,11.832 L11.928,18 L13.421,18 L14.974,12.206 L21.497,13.953 C22.26,10.111 19.927,6.285 16.089,5.257 L16.089,5.257 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/beach-m.svg b/data/styles/clear/style-clear/symbols/beach-m.svg
index 79c11e2a7a..326c4d579f 100644
--- a/data/styles/clear/style-clear/symbols/beach-m.svg
+++ b/data/styles/clear/style-clear/symbols/beach-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="beach-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M13.436,5.304 C10.366,4.481 7.219,6.199 6.21,9.166 L11.516,10.588 L10.066,16 L11.168,16 L12.544,10.863 L17.764,12.26 C18.373,9.188 16.506,6.127 13.436,5.304 L13.436,5.304 Z M5,19 L17,19 L17,17 L5,17 L5,19 L5,19 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/beauty-l.svg b/data/styles/clear/style-clear/symbols/beauty-l.svg
index 226153df36..edeff2bfda 100644
--- a/data/styles/clear/style-clear/symbols/beauty-l.svg
+++ b/data/styles/clear/style-clear/symbols/beauty-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="beauty-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M14,8 L14,21 C14,21.552 14.448,22 15,22 L18,22 C18.553,22 19,21.552 19,21 L19,8 L14,8 L14,8 Z M11,9 L12,9 L12,8 L11,8 L11,7 L12,7 L12,6 L11,6 L11,5 L12,5 L12,4 L9,4 L9,5 L10,5 L10,6 L9,6 L9,7 L10,7 L10,8 L9,8 L9,9 L10,9 L10,15 L8,15 L8,21 C8,21.552 8.447,22 9,22 L12,22 C12.552,22 13,21.552 13,21 L13,15 L11,15 L11,9 L11,9 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/beauty-m.svg b/data/styles/clear/style-clear/symbols/beauty-m.svg
index 58a97ed5b3..b152dd3f26 100644
--- a/data/styles/clear/style-clear/symbols/beauty-m.svg
+++ b/data/styles/clear/style-clear/symbols/beauty-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="beauty-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M12,9 L12,18 C12,18.552 12.448,19 13,19 L16,19 C16.553,19 17,18.552 17,18 L17,9 L12,9 L12,9 Z M9,9 L10,9 L10,8 L9,8 L9,7 L10,7 L10,6 L9,6 L9,5 L10,5 L10,4 L7,4 L7,5 L8,5 L8,6 L7,6 L7,7 L8,7 L8,8 L7,8 L7,9 L8,9 L8,13 L6,13 L6,18 C6,18.552 6.447,19 7,19 L10,19 C10.552,19 11,18.552 11,18 L11,13 L9,13 L9,9 L9,9 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/beer-l.svg b/data/styles/clear/style-clear/symbols/beer-l.svg
index ff34a150bf..21266c561f 100755
--- a/data/styles/clear/style-clear/symbols/beer-l.svg
+++ b/data/styles/clear/style-clear/symbols/beer-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>beer-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="beer-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="beer-l" sketch:type="MSLayerGroup">
             <g id="Layer_2" sketch:type="MSShapeGroup">
                 <path d="M13.5,27 C6.056,27 0,20.944 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.944 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF"></path>
-                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#AB842F"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54"></path>
             </g>
             <g id="Layer_1" transform="translate(8.000000, 3.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M7.777,2.778 C7.333,2.778 6.922,2.912 6.573,3.136 C6.231,1.659 4.914,0.555 3.333,0.555 C1.493,0.556 0,2.048 0,3.889 L0,5 L10,5 C10,3.773 9.005,2.778 7.777,2.778 L7.777,2.778 Z M11,7 L0,7 L0,18 C0,18.553 0.447,19 1,19 L9,19 C9.553,19 10,18.553 10,18 L10,16.35 L13.9,14.66 L13.9,10 C13.9,8.346 12.654,7 11,7 L11,7 Z M12,13.341 L10,14.198 L10,9 L11,9 C11.552,9 12,9.449 12,10 L12,13.341 L12,13.341 Z" id="Shape"></path>
diff --git a/data/styles/clear/style-clear/symbols/beer-m.svg b/data/styles/clear/style-clear/symbols/beer-m.svg
index 15b6b2e546..8906e3e4b9 100755
--- a/data/styles/clear/style-clear/symbols/beer-m.svg
+++ b/data/styles/clear/style-clear/symbols/beer-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>beer-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="beer-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="beer-m" sketch:type="MSLayerGroup">
             <g id="Layer_2" sketch:type="MSShapeGroup">
                 <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF"></path>
-                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#AB842F"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54"></path>
             </g>
             <g id="Layer_1" transform="translate(7.000000, 4.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M6.222,2.2 C5.868,2.2 5.537,2.307 5.259,2.487 C4.986,1.305 3.932,0.423 2.666,0.423 C1.194,0.422 0,1.616 0,3.089 L0,3.978 L8,3.978 C8,2.996 7.204,2.2 6.222,2.2 L6.222,2.2 Z M8.998,5 L0,5 L0,13 C0,13.552 0.447,14 1,14 L7,14 C7.553,14 8,13.552 8,13 L8,11.614 L10.998,10.329 L10.998,7 C10.998,5.896 10.101,5 8.998,5 L8.998,5 Z M10.098,9.67 L8,10.526 L8,6 L8.998,6 C9.81,6 10.098,6.449 10.098,7 L10.098,9.67 L10.098,9.67 Z" id="Shape"></path>
diff --git a/data/styles/clear/style-clear/symbols/bicycle-l.svg b/data/styles/clear/style-clear/symbols/bicycle-l.svg
index 96c97860ab..560d4e2a4e 100644
--- a/data/styles/clear/style-clear/symbols/bicycle-l.svg
+++ b/data/styles/clear/style-clear/symbols/bicycle-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bicycle-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M15.875,5.3622 C15.31346,5.4382 15.23786,6.4201 15.78125,6.581 L18,7.456 L18,9.3622 L11,9.3622 L11,8.3622 L12.375,8.3622 C12.70519,8.3622 13,8.0674 13,7.7372 C13,7.407 12.70519,7.1075 12.375,7.1122 L8.5,7.1122 C8.438,7.1022 8.37453,7.1022 8.3125,7.1122 C7.98523,7.1612 7.73216,7.5037 7.78125,7.831 C7.83035,8.1582 8.17274,8.4113 8.5,8.3622 L10,8.3622 L10,9.3622 L8.9375,12.4872 C8.63782,12.4152 8.32165,12.3622 8,12.3622 C5.79086,12.3622 4,14.1531 4,16.3622 C4,18.5713 5.79086,20.3622 8,20.3622 C10.20914,20.3622 12,18.5713 12,16.3622 C12,16.0618 11.93779,15.7687 11.875,15.4872 L13,15.4872 C13.19854,15.4772 13.39085,15.372 13.5,15.206 L16.875,10.3622 L17,10.3622 L18,10.3622 L18.6875,12.3935 C16.62561,12.5541 15,14.2591 15,16.3622 C15,18.5713 16.79086,20.3622 19,20.3622 C21.20914,20.3622 23,18.5713 23,16.3622 C23,14.534 21.76891,13.027 20.09375,12.5497 L19,9.3622 L19,7.0185 C19,6.9136 18.9577,6.8075 18.9063,6.706 C18.9023,6.696 18.9103,6.682 18.9063,6.675 C18.8914,6.643 18.8634,6.611 18.8438,6.581 C18.8118,6.536 18.7892,6.495 18.7501,6.456 C18.7332,6.44 18.7061,6.439 18.6876,6.425 C18.6693,6.41 18.6443,6.407 18.6251,6.394 C18.5927,6.375 18.5674,6.344 18.5314,6.332 L18.5002,6.301 L18.0627,6.1448 L16.21895,5.3948 C16.15394,5.3698 16.06966,5.3668 16.0002,5.3638 C15.9532,5.3638 15.9214,5.3528 15.8752,5.3638 L15.875,5.3622 Z M11,10.3622 L15.40625,10.3622 L12.6875,14.2372 L11.375,14.2372 C11.06533,13.7431 10.67588,13.3363 10.1875,13.0185 L11,10.3622 L11,10.3622 Z M8,13.8622 C9.38071,13.8622 10.5,14.9815 10.5,16.3622 C10.5,17.7429 9.38071,18.8622 8,18.8622 C6.61929,18.8622 5.5,17.7429 5.5,16.3622 C5.5,14.9815 6.61929,13.8622 8,13.8622 L8,13.8622 Z M19,13.8622 C20.38071,13.8622 21.5,14.9815 21.5,16.3622 C21.5,17.7429 20.38071,18.8622 19,18.8622 C17.61929,18.8622 16.5,17.7429 16.5,16.3622 C16.5,16.1896 16.5292,16.0249 16.5625,15.8622 C16.79562,14.723 17.79188,13.8622 19,13.8622 L19,13.8622 Z" id="path5421-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bicycle-m.svg b/data/styles/clear/style-clear/symbols/bicycle-m.svg
index 270e503c58..ce16686b8c 100644
--- a/data/styles/clear/style-clear/symbols/bicycle-m.svg
+++ b/data/styles/clear/style-clear/symbols/bicycle-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bicycle-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <g id="bicycle-18-copy" transform="translate(2.000000, 2.000000)" sketch:type="MSShapeGroup">
                 <path d="M12,3.3622 L12,4.3622 L13,4.8622 L13,6.3622 L8,6.3622 L8,5.3622 L9,5.3622 L9,4.8622 L8,4.3622 L6,4.3622 L6,5.3622 L7,5.3622 L7,6.3622 L5.75,8.4872 C5.50461,8.42232 5.26579,8.3622 5,8.3622 C3.34314,8.3622 2,9.70534 2,11.3622 C2,13.01906 3.34314,14.3622 5,14.3622 C6.65686,14.3622 8,13.01906 8,11.3622 L9,11.3622 L11.5,7.3622 L13,7.3622 L13.53125,8.4247 C12.10342,8.65517 11,9.86933 11,11.3622 C11,13.01905 12.34315,14.3622 14,14.3622 C15.65685,14.3622 17,13.01905 17,11.3622 C17,9.92281 15.97744,8.71559 14.625,8.4247 L14,6.8622 L14,4.3622 L13.5,3.8622 L12,3.3622 L12,3.3622 Z M7.5,7.3622 L10.5,7.3622 L8.5,10.3622 L7.8125,10.3622 C7.60043,9.77101 7.22517,9.24652 6.71875,8.89345 L7.5,7.3622 L7.5,7.3622 Z M5,9.6122 C5.9665,9.6122 6.75,10.3957 6.75,11.3622 C6.75,12.3287 5.9665,13.1122 5,13.1122 C4.0335,13.1122 3.25,12.3287 3.25,11.3622 C3.25,10.3957 4.0335,9.6122 5,9.6122 L5,9.6122 Z M14,9.6122 C14.9665,9.6122 15.75,10.3957 15.75,11.3622 C15.75,12.3287 14.9665,13.1122 14,13.1122 C13.0335,13.1122 12.25,12.3287 12.25,11.3622 C12.25,10.3957 13.0335,9.6122 14,9.6122 L14,9.6122 Z" id="path5430" fill="#FFFFFF"></path>
                 <rect id="rect15834-7" opacity="0.3" x="0" y="0.3622" width="18" height="17.999969"></rect>
diff --git a/data/styles/clear/style-clear/symbols/bicycle-s.svg b/data/styles/clear/style-clear/symbols/bicycle-s.svg
index 3793bf78eb..6f11f61440 100644
--- a/data/styles/clear/style-clear/symbols/bicycle-s.svg
+++ b/data/styles/clear/style-clear/symbols/bicycle-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bicycle-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M9,5.0005 L9,6.0005 L10,6.0005 L10,7.0005 L8,7.0005 L8,6.0005 L7,6.0005 L7,7.0005 L6.5,7.5005 L6,8.0005 L5,8.0005 L4,10.0005 L5,12.0005 L6,12.0005 L7,12.0005 L8,10.0005 L9.5,8.0005 L10.5,8.0005 L8.99995,10 L10,12.0005 L9.99995,12 L10.99995,12 L11.99995,12 L12,12.0005 L12.99995,10 L12,8.0005 L11.99995,8 L11.49995,8 L10.99995,7 L10.99995,6 L9.99995,5 L8.99995,5 L9,5.0005 Z M7,8.0005 L8,8.0005 L8,9.0005 L7,9.0005 L7,10.0005 L7,11.0005 L5,11.0005 L5,10.0005 L5,9.0005 L7,9.0005 L7,8.0005 Z M10,9.0005 L12,9.0005 L12,10.0005 L12,11.0005 L10,11.0005 L10,10.0005 L10,9.0005 Z" id="path5464-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/book-shop-l.svg b/data/styles/clear/style-clear/symbols/book-shop-l.svg
index aa7cd22421..dbe04c7d9c 100644
--- a/data/styles/clear/style-clear/symbols/book-shop-l.svg
+++ b/data/styles/clear/style-clear/symbols/book-shop-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="book-shop-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.944 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.944 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M20.03,6.02997932 L14,7.81073241 L14,18.9594427 L20.03,17.1786896 C20.565,17.042878 21,16.4793614 21,15.9188853 L21,6.79721329 C21,6.23775074 20.565,5.89315424 20.03,6.02997932 L20.03,6.02997932 Z M6.97,17.1786896 L13,18.9594427 L13,7.81073241 L6.97,6.02997932 C6.435,5.89416776 6,6.23775074 6,6.79721329 L6,15.9188853 C6,16.4783479 6.435,17.0418645 6.97,17.1786896 L6.97,17.1786896 Z M6,22 L21,22 L21,19.9729618 L6,19.9729618 L6,22 L6,22 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/book-shop-m.svg b/data/styles/clear/style-clear/symbols/book-shop-m.svg
index 711273a286..c886131ca3 100644
--- a/data/styles/clear/style-clear/symbols/book-shop-m.svg
+++ b/data/styles/clear/style-clear/symbols/book-shop-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="book-shop-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,18 L18,18 L18,16.9570376 L5,16.9570376 L5,18 L5,18 Z M17.038,14.425768 L12,15.9140753 L12,6.52741406 L17.038,5.03910677 C17.569,4.88266242 18,5.22162518 18,5.79838337 L18,13.0991199 C18,13.6748351 17.569,14.2682807 17.038,14.425768 L17.038,14.425768 Z M5,13.0980769 L5,5.79734041 C5,5.22162518 5.431,4.88161945 5.962,5.03806381 L11,6.52741406 L11,15.9140753 L5.962,14.425768 C5.431,14.2682807 5,13.6748351 5,13.0980769 L5,13.0980769 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/boundary_stone-l.svg b/data/styles/clear/style-clear/symbols/boundary_stone-l.svg
index 6349beae23..88a50136d1 100644
--- a/data/styles/clear/style-clear/symbols/boundary_stone-l.svg
+++ b/data/styles/clear/style-clear/symbols/boundary_stone-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="boundary_stone-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M19,8.313 L14.686,4 L12.315,4 L8,8.313 L8,17 L19,17 L19,8.313 L19,8.313 Z M6,19 L6,21 L21,21 L21,19 L6,19 L6,19 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/boundary_stone-m.svg b/data/styles/clear/style-clear/symbols/boundary_stone-m.svg
index 9f9b3c0bda..36d6623975 100644
--- a/data/styles/clear/style-clear/symbols/boundary_stone-m.svg
+++ b/data/styles/clear/style-clear/symbols/boundary_stone-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="boundary_stone-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M16,7.313 L12.686,4 L10.315,4 L7,7.313 L7,14 L16,14 L16,7.313 L16,7.313 Z M5,16 L5,18 L18,18 L18,16 L5,16 L5,16 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bowls-l.svg b/data/styles/clear/style-clear/symbols/bowls-l.svg
index 6035dc4d95..80032c9804 100644
--- a/data/styles/clear/style-clear/symbols/bowls-l.svg
+++ b/data/styles/clear/style-clear/symbols/bowls-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bowls-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M20.439,12.144 C19.916,11.371 19.462,10.704 19.462,9.919 C19.462,9.155 19.622,8.395 19.764,7.725 C19.967,6.765 20.143,5.936 19.829,5.358 C19.597,4.749 18.994,4.099 18.002,4.099 C17.01,4.099 16.407,4.748 16.184,5.335 C15.86,5.936 16.036,6.765 16.239,7.725 C16.382,8.395 16.542,9.156 16.542,9.919 C16.542,10.019 16.516,10.111 16.502,10.207 C18.037,11.665 19,13.72 19,15.999 C19,18.34 17.983,20.442 16.376,21.907 C16.381,21.913 16.391,21.925 16.393,21.928 C16.431,21.974 16.488,22 16.548,22 L19.456,22 C19.517,22 19.573,21.974 19.611,21.928 C19.705,21.816 21.908,19.142 21.908,16.065 C21.908,14.309 21.128,13.157 20.439,12.144 L20.439,12.144 Z M11,10 C7.687,10 5,12.685 5,15.999 C5,19.313 7.687,22 11,22 C14.314,22 17,19.313 17,15.999 C17,12.685 14.314,10 11,10 L11,10 Z M10.8,13.001 C10.8,12.339 11.338,11.8 11.999,11.8 C12.661,11.8 13.2,12.339 13.2,13.001 C13.2,13.662 12.661,14.2 11.999,14.2 C11.338,14.2 10.8,13.662 10.8,13.001 L10.8,13.001 Z M13.999,17.2 C13.338,17.2 12.8,16.662 12.8,16.001 C12.8,15.339 13.338,14.8 13.999,14.8 C14.661,14.8 15.2,15.339 15.2,16.001 C15.2,16.662 14.661,17.2 13.999,17.2 L13.999,17.2 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/bowls-m.svg b/data/styles/clear/style-clear/symbols/bowls-m.svg
index 7389fd42ae..4b9ded13bb 100644
--- a/data/styles/clear/style-clear/symbols/bowls-m.svg
+++ b/data/styles/clear/style-clear/symbols/bowls-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bowls-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M8.999,9 C6.238,9 4,11.238 4,13.999 C4,16.762 6.238,19 8.999,19 C11.762,19 14,16.762 14,13.999 C14,11.238 11.762,9 8.999,9 L8.999,9 Z M9.999,13.1 C9.393,13.1 8.9,12.607 8.9,12 C8.9,11.393 9.392,10.9 9.999,10.9 C10.606,10.9 11.1,11.393 11.1,12 C11.1,12.607 10.606,13.1 9.999,13.1 L9.999,13.1 Z M11.999,15.1 C11.393,15.1 10.9,14.607 10.9,14 C10.9,13.393 11.392,12.9 11.999,12.9 C12.606,12.9 13.1,13.393 13.1,14 C13.1,14.607 12.606,15.1 11.999,15.1 L11.999,15.1 Z M18,14.036 C18,16.61 16.158,18.847 16.079,18.94 C16.048,18.978 16.001,19 15.95,19 L13.888,19 C15.189,17.729 15.999,15.957 15.999,13.999 C15.999,11.821 14.999,9.874 13.435,8.59 C13.387,8.072 13.323,7.361 13.258,7.062 C13.088,6.259 12.942,5.565 13.213,5.063 C13.4,4.573 13.903,4.03 14.734,4.03 C15.562,4.03 16.067,4.573 16.261,5.083 C16.523,5.565 16.376,6.26 16.205,7.062 C16.087,7.623 15.954,8.258 15.954,8.898 C15.954,9.553 16.332,10.11 16.77,10.757 C17.349,11.604 18,12.568 18,14.036 L18,14.036 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/butcher-l.svg b/data/styles/clear/style-clear/symbols/butcher-l.svg
index f9f3b2342b..f475a176ed 100644
--- a/data/styles/clear/style-clear/symbols/butcher-l.svg
+++ b/data/styles/clear/style-clear/symbols/butcher-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="butcher-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M23,9.325 L18.362,4.688 L9.171,13.88 L13.808,18.517 C15.855,17.766 17.781,16.584 19.424,14.941 C21.067,13.298 22.248,11.373 23,9.325 L23,9.325 Z M17.291,8.707 C16.899,8.316 16.898,7.683 17.291,7.292 C17.68,6.9 18.315,6.902 18.706,7.292 C19.098,7.684 19.098,8.317 18.706,8.707 C18.317,9.098 17.681,9.098 17.291,8.707 L17.291,8.707 Z M9.38,16.502 L7.965,15.088 L4.574,18.477 C3.988,19.062 3.988,20.013 4.574,20.599 C5.16,21.184 6.038,21.122 6.535,20.459 L9.38,16.502 L9.38,16.502 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/butcher-m.svg b/data/styles/clear/style-clear/symbols/butcher-m.svg
index a5bfb1685f..a31eef173b 100644
--- a/data/styles/clear/style-clear/symbols/butcher-m.svg
+++ b/data/styles/clear/style-clear/symbols/butcher-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="butcher-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M19.113,8.029 L15.403,4.32 L8.049,11.674 L11.759,15.383 C13.396,14.781 14.937,13.837 16.251,12.522 C17.567,11.208 18.512,9.667 19.113,8.029 L19.113,8.029 Z M14.294,7.707 C13.902,7.316 13.902,6.684 14.294,6.294 C14.683,5.903 15.316,5.904 15.707,6.294 C16.099,6.685 16.099,7.318 15.707,7.707 C15.319,8.098 14.683,8.097 14.294,7.707 L14.294,7.707 Z M8.217,13.771 L7.085,12.64 L4.373,15.351 C3.904,15.819 3.904,16.58 4.373,17.048 C4.842,17.516 5.544,17.467 5.941,16.936 L8.217,13.771 L8.217,13.771 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cafe-l.svg b/data/styles/clear/style-clear/symbols/cafe-l.svg
index 5c05892c6c..6a2bbbd3ac 100644
--- a/data/styles/clear/style-clear/symbols/cafe-l.svg
+++ b/data/styles/clear/style-clear/symbols/cafe-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cafe-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#AB842F" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M8,7 C7.44599,7 7,7.446 7,8 L7,17 C7,17.554 7.44599,18 8,18 L19,18 C19.55401,18 20,17.554 20,17 L20,16 L20.5,16 C21,16 21,15.5 21,15.5 L21,15 L22,15 C23,15 24,14 24,13 L24,12 L24,10 C24,9.5 23.5,9 23,9 L20,9 L20,8 C20,7.446 19.55401,7 19,7 L8,7 Z M20,10 L22.5,10 C23,10 23,10.5 23,10.5 L23,13 C23,13.5 22.5,14 22,14 L21,14 L20,14 L20,10 Z M5,19 L6,20 L7,21 L20,21 L21,20 L22,19 L5,19 Z" id="rect9826-2-1" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cafe-m.svg b/data/styles/clear/style-clear/symbols/cafe-m.svg
index f608a27b6f..4fa8bee328 100644
--- a/data/styles/clear/style-clear/symbols/cafe-m.svg
+++ b/data/styles/clear/style-clear/symbols/cafe-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cafe-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#AB842F" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M7,6.3622 C6.5,6.3622 6,6.8622 6,7.3622 L6,13.3622 C6,13.8622 6.5,14.3622 7,14.3622 L14,14.3622 C14.40011,14.3622 15,13.8622 15,13.3622 L15,12.9178 L15.36111,12.9178 C15.72222,12.9178 15.72222,12.5567 15.72222,12.5567 L15.72222,12.1956 L16.16667,12.1956 C16.88889,12.1956 18,11.8622 18,10.7512 L18,8.8622 C18,8.3622 17.75,7.8622 17.25,7.8622 L15,7.8622 L15,7.3622 C15,6.8622 14.5,6.3622 14,6.3622 L7,6.3622 Z M15,8.5845 L16.88889,8.5845 C17.25,8.5845 17.25,8.8622 17.25,8.8622 L17.25,10.7512 C17.25,11.3232 16.52775,11.3576 16.16667,11.3622 L15.72222,11.3622 L15,11.3622 L15,8.5845 Z M5,15.3622 L7,17.3622 L14,17.3622 L16,15.3622 L5,15.3622 Z" id="rect9826-2-1-5-9" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cafe-s.svg b/data/styles/clear/style-clear/symbols/cafe-s.svg
index 601fcb3b7a..f60d5e08cf 100644
--- a/data/styles/clear/style-clear/symbols/cafe-s.svg
+++ b/data/styles/clear/style-clear/symbols/cafe-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cafe-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#AB842F" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.5,5 C5.22299,5 5,5.223 5,5.5 L5,10 C5,10.277 5.22299,10.5 5.5,10.5 L11.5,10.5 C11.777,10.5 12,10.277 12,10 L12,9.5 L12.25,9.5 C12.5,9.5 12.5,9.25 12.5,9.25 L12.5,9 L13,9 C13.5,9 14,8.5 14,8 L14,7.5 L14,6.5 C14,6.25 13.75,6 13.5,6 L12,6 L12,5.5 C12,5.223 11.777,5 11.5,5 L5.5,5 Z M12,6.5 L13.25,6.5 C13.5,6.5 13.5,6.75 13.5,6.75 L13.5,8 C13.5,8.25 13.25,8.5 13,8.5 L12.5,8.5 L12,8.5 L12,6.5 Z M4,11 L6,12 L11,12 L13,11 L4,11 Z" id="rect9826-2-1-5" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/campsite-l.svg b/data/styles/clear/style-clear/symbols/campsite-l.svg
index a2a20a0dd6..dce5f81f7e 100644
--- a/data/styles/clear/style-clear/symbols/campsite-l.svg
+++ b/data/styles/clear/style-clear/symbols/campsite-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="campsite-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,6.00000003 C13,5.99990003 12.773906,6.23940003 12.625,6.50000003 L6.40625,18 L5.0625,18 C4.4759168,18 4,18.446005 4,19 C4,19.553995 4.4759168,20 5.0625,20 L7,20 L20,20 L21.9375,20 C22.524083,20 23,19.553995 23,19 C23,18.446005 22.524083,18 21.9375,18 L20.59375,18 L14.375,6.50000003 C14.226094,6.23940003 14,5.99990003 13.5,6.00000003 L13.5,6.00000003 Z M13.5,11 L17,18 L10,18 L13.5,11 Z" id="path11349-0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/campsite-m.svg b/data/styles/clear/style-clear/symbols/campsite-m.svg
index 6284dbb564..0520a7023b 100644
--- a/data/styles/clear/style-clear/symbols/campsite-m.svg
+++ b/data/styles/clear/style-clear/symbols/campsite-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="campsite-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,6.00040004 C11.13889,6.00030004 10.9756,6.17330004 10.86806,6.36150004 L7,14.5 L5.5,14.5 C5,14.5 5,15.2778 5,15.2778 C5,15.2778 5,16 5.5,16 L17.5,16 C18,16 18,15.2778 18,15.2778 C18,15.2778 18,14.5001 17.5,14.5 L16,14.4996 L12.13194,6.36110004 C12.0244,6.17290004 11.86111,5.99990004 11.5,6.00000004 L11.5,6.00040004 Z M11.5,9.00000004 L14,14.5 L9,14.5 L11.5,9.00000004 Z" id="path11349-0-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/campsite-s.svg b/data/styles/clear/style-clear/symbols/campsite-s.svg
index b80b62a82e..f92e20054f 100644
--- a/data/styles/clear/style-clear/symbols/campsite-s.svg
+++ b/data/styles/clear/style-clear/symbols/campsite-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="campsite-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.53125,5 C8.28125,5 8.1682,5.1197 8.09375,5.25 L5.23437,11 L4.5,11 C4.20671,11 4,11.223 4,11.5 C4,11.777 4.20671,12 4.5,12 L5.53125,12 L11.53125,12 L12.46875,12 C12.76204,12 13,11.777 13,11.5 C13,11.223 12.76204,11 12.46875,11 L11.82812,11 L8.96875,5.25 C8.89425,5.1197 8.78125,5 8.53125,5 L8.53125,5 Z M8.53125,7.5 L10.03125,11 L7.03125,11 L8.53125,7.5 Z" id="path11349-0-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/car-repair-l.svg b/data/styles/clear/style-clear/symbols/car-repair-l.svg
index 76850530ef..0c7892005d 100755
--- a/data/styles/clear/style-clear/symbols/car-repair-l.svg
+++ b/data/styles/clear/style-clear/symbols/car-repair-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>car-repair-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="car-repair-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="car-repair-l" sketch:type="MSLayerGroup">
             <g id="Layer_2" sketch:type="MSShapeGroup">
                 <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF"></path>
-                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54"></path>
             </g>
             <g id="Layer_1" transform="translate(6.000000, 5.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M0,16 L6,16 L6,18 L9,18 L9,16 L15,16 L15,14 L0,14 L0,16 L0,16 Z M14,5 L12.5,1 C12.312,0.5 12,0 11,0 L4,0 C3,0 2.688,0.5 2.5,1 L1,5 L0,6 L0,11 L2,11 L2,12 C2,12.5 2.5,13 3,13 L4,13 C4.5,13 5,12.5 5,12 L5,11 L10,11 L10,12 C10,12.5 10.5,13 11,13 L12,13 C12.5,13 13,12.5 13,12 L13,11 L15,11 L15,6 L14,5 L14,5 Z M4,9 L2,9 L2,7 L4,7 L4,9 L4,9 Z M3.5,5 L4.5,2 L10.5,2 L11.5,5 L3.5,5 L3.5,5 Z M13,9 L11,9 L11,7 L13,7 L13,9 L13,9 Z" id="Shape"></path>
diff --git a/data/styles/clear/style-clear/symbols/car-repair-m.svg b/data/styles/clear/style-clear/symbols/car-repair-m.svg
index 44dac48534..2558608e19 100755
--- a/data/styles/clear/style-clear/symbols/car-repair-m.svg
+++ b/data/styles/clear/style-clear/symbols/car-repair-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>car-repair-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="car-repair-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="car-repair-m" sketch:type="MSLayerGroup">
             <g id="Layer_2" sketch:type="MSShapeGroup">
                 <path d="M11.5,23 C5.159,23 0,17.842 0,11.5 C0,5.158 5.159,0 11.5,0 C17.841,0 23,5.158 23,11.5 C23,17.842 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF"></path>
-                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54"></path>
             </g>
             <g id="Layer_1" transform="translate(6.000000, 5.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M0,13 L11,13 L11,11 L0,11 L0,13 L0,13 Z M10,4 L8.224,0.447 C8.1,0.2 7.776,0 7.5,0 L3.5,0 C3.224,0 2.9,0.2 2.776,0.447 L1,4 L0,5 L0,8 L1,8 L1,9.5 C1,9.776 1.224,10 1.5,10 L2.5,10 C2.776,10 3,9.776 3,9.5 L3,8 L8,8 L8,9.5 C8,9.776 8.224,10 8.5,10 L9.5,10 C9.776,10 10,9.776 10,9.5 L10,8 L11,8 L11,5 L10,4 L10,4 Z M2,7 L1,7 L1,6 L2,6 L2,7 L2,7 Z M2.118,4 L3.12,2 L7.78,2 L8.882,4 L2.118,4 L2.118,4 Z M10,7 L9,7 L9,6 L10,6 L10,7 L10,7 Z" id="Shape"></path>
diff --git a/data/styles/clear/style-clear/symbols/car_sharing-l.svg b/data/styles/clear/style-clear/symbols/car_sharing-l.svg
index 35aa4a313e..a9c5a86d21 100644
--- a/data/styles/clear/style-clear/symbols/car_sharing-l.svg
+++ b/data/styles/clear/style-clear/symbols/car_sharing-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="car_sharing-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M20.968,11 L19.471,6.998 C19.284,6.499 18.973,6 17.974,6 L9.027,6 C8.028,6 7.716,6.499 7.53,6.998 L6.032,11 L5,12 L5,18 L7,18 L7,18.975 C7,19.473 7.499,19.973 7.998,19.973 L9,19.973 C9.499,19.973 9.998,19.473 9.998,18.975 L9.998,18 L17.002,18 L17.002,18.975 C17.002,19.473 17.501,19.973 18,19.973 L19.002,19.973 C19.501,19.973 20,19.473 20,18.975 L20,18 L22,18 L22,12 L20.968,11 L20.968,11 Z M9.525,8 L17.474,8 L18.472,11 L8.527,11 L9.525,8 L9.525,8 Z M9.2,15.5 C9.2,15.886 8.886,16.2 8.5,16.2 L7.5,16.2 C7.114,16.2 6.8,15.886 6.8,15.5 L6.8,14.5 C6.8,14.114 7.114,13.8 7.5,13.8 L8.5,13.8 C8.886,13.8 9.2,14.114 9.2,14.5 L9.2,15.5 L9.2,15.5 Z M20.2,15.5 C20.2,15.886 19.886,16.2 19.5,16.2 L18.5,16.2 C18.114,16.2 17.8,15.886 17.8,15.5 L17.8,14.5 C17.8,14.114 18.114,13.8 18.5,13.8 L19.5,13.8 C19.886,13.8 20.2,14.114 20.2,14.5 L20.2,15.5 L20.2,15.5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/car_sharing-m.svg b/data/styles/clear/style-clear/symbols/car_sharing-m.svg
index 580040a2cf..0b4db09d2a 100644
--- a/data/styles/clear/style-clear/symbols/car_sharing-m.svg
+++ b/data/styles/clear/style-clear/symbols/car_sharing-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="car_sharing-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17.968,10 L16.471,5.998 C16.284,5.499 15.973,5 14.974,5 L8.027,5 C7.028,5 6.716,5.499 6.53,5.998 L5.032,10 L4,11 L4,16 L6,16 L6,16.975 C6,17.473 6.499,17.973 6.998,17.973 L8,17.973 C8.499,17.973 8.998,17.473 8.998,16.975 L8.998,16 L14.002,16 L14.002,16.975 C14.002,17.473 14.501,17.973 15,17.973 L16.002,17.973 C16.501,17.973 17,17.473 17,16.975 L17,16 L19,16 L19,11 L17.968,10 L17.968,10 Z M8.525,7 L14.474,7 L15.472,10 L7.527,10 L8.525,7 L8.525,7 Z M8.2,13.5 C8.2,13.886 7.886,14.2 7.5,14.2 L6.5,14.2 C6.114,14.2 5.8,13.886 5.8,13.5 L5.8,12.5 C5.8,12.114 6.114,11.8 6.5,11.8 L7.5,11.8 C7.886,11.8 8.2,12.114 8.2,12.5 L8.2,13.5 L8.2,13.5 Z M17.2,13.5 C17.2,13.886 16.886,14.2 16.5,14.2 L15.5,14.2 C15.114,14.2 14.8,13.886 14.8,13.5 L14.8,12.5 C14.8,12.114 15.114,11.8 15.5,11.8 L16.5,11.8 C16.886,11.8 17.2,12.114 17.2,12.5 L17.2,13.5 L17.2,13.5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/caravan_site-l.svg b/data/styles/clear/style-clear/symbols/caravan_site-l.svg
index 5115066fa1..de1bbddc7f 100644
--- a/data/styles/clear/style-clear/symbols/caravan_site-l.svg
+++ b/data/styles/clear/style-clear/symbols/caravan_site-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="caravan_site-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#8C4D16" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M9.5,18 C8.672,18 8,18.672 8,19.5 C8,20.328 8.672,21 9.5,21 C10.328,21 11,20.328 11,19.5 C11,18.672 10.328,18 9.5,18 L9.5,18 Z M22,17 L22,15 L20.485,8.94 C20.216,7.869 19.104,7 18,7 L6,7 C4.896,7 4,7.896 4,9 L4,19 L6.051,19 C6.296,17.309 7.741,16 9.5,16 C11.259,16 12.704,17.309 12.949,19 L23,19 L23,17 L22,17 L22,17 Z M12,12 C12,12.553 11.553,13 11,13 L8,13 C7.447,13 7,12.553 7,12 L7,11 C7,10.447 7.447,10 8,10 L11,10 C11.553,10 12,10.447 12,11 L12,12 L12,12 Z M19,18 L14,18 L14,11.5 C14,10.673 14.673,10 15.5,10 L17.5,10 C18.327,10 19,10.673 19,11.5 L19,18 L19,18 Z M17.5,11 L15.5,11 C15.225,11 15,11.225 15,11.5 L15,17 L18,17 L18,11.5 C18,11.225 17.775,11 17.5,11 L17.5,11 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/caravan_site-m.svg b/data/styles/clear/style-clear/symbols/caravan_site-m.svg
index 987591a974..4bcd1d52d0 100644
--- a/data/styles/clear/style-clear/symbols/caravan_site-m.svg
+++ b/data/styles/clear/style-clear/symbols/caravan_site-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="caravan_site-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#8C4D16" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M10,16.5 C10,17.328 9.328,18 8.5,18 C7.672,18 7,17.328 7,16.5 C7,15.672 7.672,15 8.5,15 C9.328,15 10,15.672 10,16.5 L10,16.5 Z M19,12.6 L19,16 L11.949,16 C11.704,14.309 10.259,13 8.5,13 C6.741,13 5.296,14.309 5.051,16 L4,16 L4,7.601 C4,6.717 4.717,6 5.601,6 L15.201,6 C16.085,6 16.974,6.695 17.189,7.553 L19,12.6 L19,12.6 Z M10,9 C10,8.447 9.553,8 9,8 L7,8 C6.447,8 6,8.447 6,9 L6,10 C6,10.553 6.447,11 7,11 L9,11 C9.553,11 10,10.553 10,10 L10,9 L10,9 Z M16,9.5 C16,8.673 15.327,8 14.5,8 L13.5,8 C12.673,8 12,8.673 12,9.5 L12,14 L16,14 L16,9.5 L16,9.5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/casino-l.svg b/data/styles/clear/style-clear/symbols/casino-l.svg
index 4888ad4cd3..9d0c776912 100644
--- a/data/styles/clear/style-clear/symbols/casino-l.svg
+++ b/data/styles/clear/style-clear/symbols/casino-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="casino-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M21.098,7.2687044 L15.903,4.2687044 C14.946,3.7157044 13.723,4.0437044 13.171,5.0007044 L10.228,10.0987044 L14,10.0987044 C16.205,10.0987044 18,11.8927044 18,14.0987044 L18,15.9797044 C18.336,15.8097044 18.628,15.5457044 18.83,15.1967044 L21.83,10.0017044 C22.383,9.0437044 22.055,7.8217044 21.098,7.2687044 L21.098,7.2687044 Z M20.748,9.8747044 C20.352,10.5607044 19.477,10.7937044 18.791,10.3977044 C18.106,10.0027044 17.871,9.1267044 18.268,8.4427044 C18.664,7.7557044 19.539,7.5217044 20.225,7.9187044 C20.908,8.3147044 21.144,9.1887044 20.748,9.8747044 L20.748,9.8747044 Z M14,12.0987044 L8,12.0987044 C6.896,12.0987044 6,12.9947044 6,14.0987044 L6,20.0987044 C6,21.2027044 6.896,22.0987044 8,22.0987044 L14,22.0987044 C15.104,22.0987044 16,21.2027044 16,20.0987044 L16,14.0987044 C16,12.9947044 15.104,12.0987044 14,12.0987044 L14,12.0987044 Z M8.5,21.0987044 C7.672,21.0987044 7,20.4277044 7,19.5987044 C7,18.7697044 7.672,18.0987044 8.5,18.0987044 C9.328,18.0987044 10,18.7697044 10,19.5987044 C10,20.4277044 9.328,21.0987044 8.5,21.0987044 L8.5,21.0987044 Z M8.5,16.0987044 C7.672,16.0987044 7,15.4277044 7,14.5987044 C7,13.7697044 7.672,13.0987044 8.5,13.0987044 C9.328,13.0987044 10,13.7697044 10,14.5987044 C10,15.4277044 9.328,16.0987044 8.5,16.0987044 L8.5,16.0987044 Z M13.5,21.0987044 C12.672,21.0987044 12,20.4277044 12,19.5987044 C12,18.7697044 12.672,18.0987044 13.5,18.0987044 C14.328,18.0987044 15,18.7697044 15,19.5987044 C15,20.4277044 14.328,21.0987044 13.5,21.0987044 L13.5,21.0987044 Z M13.5,16.0987044 C12.672,16.0987044 12,15.4277044 12,14.5987044 C12,13.7697044 12.672,13.0987044 13.5,13.0987044 C14.328,13.0987044 15,13.7697044 15,14.5987044 C15,15.4277044 14.328,16.0987044 13.5,16.0987044 L13.5,16.0987044 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/casino-m.svg b/data/styles/clear/style-clear/symbols/casino-m.svg
index 4d43661673..733b4b86ec 100644
--- a/data/styles/clear/style-clear/symbols/casino-m.svg
+++ b/data/styles/clear/style-clear/symbols/casino-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="casino-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17.488,6.61421587 L13.331,4.21521587 C12.566,3.77221587 11.588,4.03521587 11.145,4.80121587 L9.248,8.08821587 L11.4,8.08821587 C13.384,8.08821587 15,9.70321587 15,11.6882159 L15,13.5892159 C15.272,13.4542159 15.51,13.2402159 15.674,12.9572159 L18.074,8.80121587 C18.516,8.03521587 18.254,7.05721587 17.488,6.61421587 L17.488,6.61421587 Z M17.208,8.69921587 C16.892,9.24821587 16.191,9.43421587 15.643,9.11821587 C15.095,8.80321587 14.908,8.10121587 15.224,7.55521587 C15.54,7.00521587 16.241,6.81821587 16.789,7.13521587 C17.337,7.45121587 17.524,8.15021587 17.208,8.69921587 L17.208,8.69921587 Z M11.4,10.0882159 L6.6,10.0882159 C5.717,10.0882159 5,10.8052159 5,11.6882159 L5,16.4892159 C5,17.3722159 5.717,18.0892159 6.6,18.0892159 L11.401,18.0892159 C12.284,18.0892159 13.001,17.3722159 13.001,16.4892159 L13.001,11.6882159 C13,10.8052159 12.283,10.0882159 11.4,10.0882159 L11.4,10.0882159 Z M7,17.2882159 C6.338,17.2882159 5.8,16.7502159 5.8,16.0892159 C5.8,15.4272159 6.338,14.8892159 7,14.8892159 C7.662,14.8892159 8.2,15.4272159 8.2,16.0892159 C8.2,16.7502159 7.662,17.2882159 7,17.2882159 L7,17.2882159 Z M7,13.2872159 C6.338,13.2872159 5.8,12.7492159 5.8,12.0882159 C5.8,11.4262159 6.338,10.8882159 7,10.8882159 C7.662,10.8882159 8.2,11.4262159 8.2,12.0882159 C8.2,12.7492159 7.662,13.2872159 7,13.2872159 L7,13.2872159 Z M11,17.2882159 C10.338,17.2882159 9.8,16.7502159 9.8,16.0892159 C9.8,15.4272159 10.338,14.8892159 11,14.8892159 C11.662,14.8892159 12.2,15.4272159 12.2,16.0892159 C12.2,16.7502159 11.662,17.2882159 11,17.2882159 L11,17.2882159 Z M11,13.2872159 C10.338,13.2872159 9.8,12.7492159 9.8,12.0882159 C9.8,11.4262159 10.338,10.8882159 11,10.8882159 C11.662,10.8882159 12.2,11.4262159 12.2,12.0882159 C12.2,12.7492159 11.662,13.2872159 11,13.2872159 L11,13.2872159 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cave-l.svg b/data/styles/clear/style-clear/symbols/cave-l.svg
index 34d27ce888..97d5eab61f 100644
--- a/data/styles/clear/style-clear/symbols/cave-l.svg
+++ b/data/styles/clear/style-clear/symbols/cave-l.svg
@@ -8,7 +8,7 @@
         <g id="cave-l" sketch:type="MSLayerGroup">
             <g id="peak-l-copy" sketch:type="MSShapeGroup">
                 <circle id="Oval-1-Copy-39" fill="#FFFFFF" cx="13.5" cy="13.5" r="13.5"></circle>
-                <circle id="Oval-1-Copy-38" fill="#717065" cx="13.5" cy="13.5" r="12.5"></circle>
+                <circle id="Oval-1-Copy-38" fill="#7F7D54" cx="13.5" cy="13.5" r="12.5"></circle>
             </g>
             <path d="M13.5012442,19 C9.74937728,19 6,14.0836163 6,8.01400679 C6,7.32151952 6.05228215,6.65662139 6.12448132,6 L10.8946054,6 C10.877178,6.44418506 10.8497921,6.88285229 10.8497921,7.34083192 C10.8497921,13.0352292 11.6464726,15.6479202 13.5012442,15.6479202 C15.3560158,15.6479202 16.1526963,13.0352292 16.1526963,7.34083192 C16.1526963,6.88285229 16.1278,6.44418506 16.107883,6 L20.8755174,6 C20.9502062,6.65662139 20.9999988,7.32151952 20.9999988,8.01400679 C21.0024884,14.0836163 17.2556007,19 13.5012442,19 L13.5012442,19 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(13.500000, 12.500000) rotate(-180.000000) translate(-13.500000, -12.500000) "></path>
         </g>
diff --git a/data/styles/clear/style-clear/symbols/cave-m.svg b/data/styles/clear/style-clear/symbols/cave-m.svg
index e307eb67df..4b288e0996 100644
--- a/data/styles/clear/style-clear/symbols/cave-m.svg
+++ b/data/styles/clear/style-clear/symbols/cave-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cave-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M18,14.2958404 C18,14.8817912 17.9546888,15.4443973 17.8921162,16 L13.7580086,16 C13.7731124,15.6241511 13.7968468,15.2529711 13.7968468,14.8654499 C13.7968468,10.0471138 13.1063904,7.83637521 11.4989217,7.83637521 C9.89145295,7.83637521 9.20099658,10.0471138 9.20099658,14.8654499 C9.20099658,15.2529711 9.22257334,15.6241511 9.23983475,16 L5.10788488,16 C5.0431546,15.4443973 5.00000107,14.8817912 5.00000107,14.2958404 C4.9978434,9.16001698 8.24514603,5 11.4989217,5 C14.7505397,5 18,9.16001698 18,14.2958404 Z" id="Shape-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cave-s.svg b/data/styles/clear/style-clear/symbols/cave-s.svg
index f8f58c46e3..61ac63a03e 100644
--- a/data/styles/clear/style-clear/symbols/cave-s.svg
+++ b/data/styles/clear/style-clear/symbols/cave-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cave-s" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" rx="8.5" ry="8.5"></ellipse>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.49925348,4 C10.7503736,4 13,7.02546689 13,10.7606112 C13,11.1867572 12.9686307,11.5959253 12.9253112,12 L10.0632368,12 C10.0736932,11.7266553 10.0901247,11.4567063 10.0901247,11.1748727 C10.0901247,7.67062818 9.61211646,6.06281834 8.49925348,6.06281834 C7.38639051,6.06281834 6.90838225,7.67062818 6.90838225,11.1748727 C6.90838225,11.4567063 6.92332,11.7266553 6.93527021,12 L4.07468953,12 C4.02987626,11.5959253 4.00000074,11.1867572 4.00000074,10.7606112 C3.99850697,7.02546689 6.24663956,4 8.49925348,4 L8.49925348,4 Z" id="Shape-Copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cemetery-l.svg b/data/styles/clear/style-clear/symbols/cemetery-l.svg
index 5794bfe35d..c747b6df30 100644
--- a/data/styles/clear/style-clear/symbols/cemetery-l.svg
+++ b/data/styles/clear/style-clear/symbols/cemetery-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cemetery-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,6 C10.426354,6 9,7.75 9,10.375 L9,14.75 L9,18.25 C8.5,18.25 8,18.6875 8,19.125 L8,20 L19,20 L19,19.125 C19,18.6875 18.5,18.25 18,18.25 L18,10.375 C18,7.75 16.5,6 13.5,6 L13.5,6 Z" id="rect12479-9-copy-3" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cemetery-m.svg b/data/styles/clear/style-clear/symbols/cemetery-m.svg
index 3ed0e11cfe..4e00f91536 100644
--- a/data/styles/clear/style-clear/symbols/cemetery-m.svg
+++ b/data/styles/clear/style-clear/symbols/cemetery-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cemetery-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,5 C8.98519873,5 7.81818182,6.5 7.81818182,8.75 L7.81818182,12.5 L7.81818182,15.5 C7.40909091,15.5 7,15.875 7,16.25 L7,17 L16,17 L16,16.25 C16,15.875 15.5909091,15.5 15.1818182,15.5 L15.1818182,8.75 C15.1818182,6.5 13.9545455,5 11.5,5 L11.5,5 Z" id="rect12479-9-copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cemetery-s.svg b/data/styles/clear/style-clear/symbols/cemetery-s.svg
index aebf4a336e..e25fe59678 100644
--- a/data/styles/clear/style-clear/symbols/cemetery-s.svg
+++ b/data/styles/clear/style-clear/symbols/cemetery-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cemetery-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,4 C6.54404345,4 5.63636364,5.125 5.63636364,6.8125 L5.63636364,9.625 L5.63636364,11.875 C5.31818182,11.875 5,12.15625 5,12.4375 L5,13 L12,13 L12,12.4375 C12,12.15625 11.6818182,11.875 11.3636364,11.875 L11.3636364,6.8125 C11.3636364,5.125 10.4090909,4 8.5,4 L8.5,4 Z" id="rect12479-9-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/chemist-l.svg b/data/styles/clear/style-clear/symbols/chemist-l.svg
index f1354b958f..1b80c63c82 100644
--- a/data/styles/clear/style-clear/symbols/chemist-l.svg
+++ b/data/styles/clear/style-clear/symbols/chemist-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="chemist-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M11,22 L16,22 C17.104,22 18,21.104 18,20 L9,20 C9,21.104 9.896,22 11,22 L11,22 Z M5,12 C5,14.916 6.481,17.469 8.72,19 L18.281,19 C20.518,17.469 22.001,14.916 22.001,12 L5,12 L5,12 Z M20.652,6.771 C21.085,6.338 21.118,5.668 20.724,5.276 C20.33,4.881 19.661,4.915 19.227,5.348 L14.039,10 L18.058,10 L20.652,6.771 L20.652,6.771 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/chemist-m.svg b/data/styles/clear/style-clear/symbols/chemist-m.svg
index b6e3e72fed..6b5a563e60 100644
--- a/data/styles/clear/style-clear/symbols/chemist-m.svg
+++ b/data/styles/clear/style-clear/symbols/chemist-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="chemist-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M9.5,19 L13.5,19 C14.384,19 15.1,18.105 15.1,17 L7.9,17 C7.9,18.105 8.617,19 9.5,19 L9.5,19 Z M4.7,10 C4.7,12.333 5.885,14.674 7.676,15.899 L15.324,15.899 C17.114,14.673 18.301,12.333 18.301,10 L4.7,10 L4.7,10 Z M17.495,5.794 C17.924,5.364 17.957,4.7 17.565,4.31 C17.175,3.918 16.511,3.952 16.08,4.382 L10.932,8.998 L14.919,8.998 L17.495,5.794 L17.495,5.794 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cinema-l.svg b/data/styles/clear/style-clear/symbols/cinema-l.svg
index 21d8d2a775..66bf235454 100644
--- a/data/styles/clear/style-clear/symbols/cinema-l.svg
+++ b/data/styles/clear/style-clear/symbols/cinema-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cinema-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M19,5 L16.75,5.6563 L17.84375,8.625 L20,8 L19,5 Z M15.375,6.0313 L12.4375,6.875 L12.5,7 L13.0625,8.5313 L13.5625,9.8438 L16.5,9 L15.375,6.0313 Z M11.09375,7.25 L8.5,8 L9.625,10.9688 L12.21875,10.2188 L11.5625,8.5313 L11.09375,7.25 Z M7.15625,8.375 L5,9 L6,12 L8.25,11.3438 L7.15625,8.375 Z M6,12 L6,21 C6,21.554 6.44599,22 7,22 L20,22 C20.55401,22 21,21.554 21,21 L21,12 L6,12 Z M8,14 L19,14 L19,17 L8,17 L8,14 Z" id="rect7568-8-4-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cinema-m.svg b/data/styles/clear/style-clear/symbols/cinema-m.svg
index 83be671fc1..cd777a494a 100644
--- a/data/styles/clear/style-clear/symbols/cinema-m.svg
+++ b/data/styles/clear/style-clear/symbols/cinema-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cinema-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M16.23529,4.65997314 L14.5147,5.16177314 L15.3511,7.43207314 L17,6.95407314 L16.23529,4.65997314 Z M13.46323,5.44857314 L11.21691,6.09377314 L12.0772,8.36397314 L14.32353,7.71877314 L13.46323,5.44857314 Z M10.18933,6.38057314 L8.20588,6.95407314 L9.06617,9.22427314 L11.04963,8.65077314 L10.18933,6.38057314 Z M7.17831,7.24087314 L5,8.01107314 L6,10.0110731 L8.0147,9.51107314 L7.17831,7.24087314 Z M6,10.0110731 L6,17.0110731 C6,17.5110731 6.5,18.0110731 7,18.0110731 L17,18.0110731 C17.5,18.0110731 18,17.5110731 18,17.0110731 L18,10.0110731 L6,10.0110731 Z M8,12.0110731 L16,12.0110731 L16,14.0110731 L8,14.0110731 L8,12.0110731 Z" id="rect7568-8-4-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cinema-s.svg b/data/styles/clear/style-clear/symbols/cinema-s.svg
index 3f38bbffe2..084226cdad 100644
--- a/data/styles/clear/style-clear/symbols/cinema-s.svg
+++ b/data/styles/clear/style-clear/symbols/cinema-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cinema-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M11.5,4.5 L4.5,6.5 L5,8 L12,6 L11.5,4.5 L11.5,4.5 Z M5,8 L5,12.5 C5,12.8077 5.19231,13 5.5,13 L11.5,13 C11.80769,13 12,12.8077 12,12.5 L12,8 L5,8 L5,8 Z M6,9 L11,9 L11,10 L6,10 L6,9 L6,9 Z" id="rect7568-8-4-7-5-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/clothes-l.svg b/data/styles/clear/style-clear/symbols/clothes-l.svg
index 4d43d41f74..7aa86c7dc3 100644
--- a/data/styles/clear/style-clear/symbols/clothes-l.svg
+++ b/data/styles/clear/style-clear/symbols/clothes-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="clothes-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M20.974,12 L18,12 L18,22 L9,22 L9,12 L6.026,12 L5,8.342 L10.658,7 C10.937,8.18 11.931,9.075 13.159,9.22 L13.841,9.22 C15.067,9.075 16.062,8.18 16.341,7 L22,8.342 L20.974,12 L20.974,12 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/clothes-m.svg b/data/styles/clear/style-clear/symbols/clothes-m.svg
index e4ea89d1c1..e845b9aef2 100644
--- a/data/styles/clear/style-clear/symbols/clothes-m.svg
+++ b/data/styles/clear/style-clear/symbols/clothes-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="clothes-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17.214,9.889 L14.94,9.889 L14.94,18 L8.059,18 L8.059,9.889 L5.785,9.889 L5,7.093 L9.326,6.066 C9.54,6.968 10.301,7.653 11.238,7.763 L11.76,7.763 C12.697,7.653 13.456,6.968 13.671,6.066 L17.999,7.093 L17.214,9.889 L17.214,9.889 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/college-l.svg b/data/styles/clear/style-clear/symbols/college-l.svg
index d5e7ee37df..7bf7e9ad09 100644
--- a/data/styles/clear/style-clear/symbols/college-l.svg
+++ b/data/styles/clear/style-clear/symbols/college-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="college-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,7 L4,12 L13.5,17 L19,14.21875 L19,18 C19,20 21,20 21,20 L21,19 C21,19 20,18.94281 20,18 L20,13.65625 L23,12 L13.5,7 Z M9,16 L9,18 C9,18.4967 9.3250891,19.1625 10,19.5 L13.5,21 L16.5,19.5 C17.174911,19.1625 18.047132,18.494459 18,18 L18,16 L13.5,18.1875 L9,16 Z" id="path7442-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/college-m.svg b/data/styles/clear/style-clear/symbols/college-m.svg
index 61707a3782..3eb510b27d 100644
--- a/data/styles/clear/style-clear/symbols/college-m.svg
+++ b/data/styles/clear/style-clear/symbols/college-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="college-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,6 L5,9.5 L11.5,13 L16,10.6563 L16,14.2188 C16,16 17.5,15.75 17.5,15.75 L17.5,15 C17.5,15 16.71875,15 16.71875,14.2188 L16.71875,10.25 L18,9.5 L11.5,6 Z M8,12.5 L8,13.9375 C8,14.2963 8.51257,14.7562 9,15 L11.5,16 L14,15 C14.48743,14.7562 15,14.2963 15,13.9375 L15,12.5 L11.5,14 L8,12.5 Z" id="path7442-0-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/college-s.svg b/data/styles/clear/style-clear/symbols/college-s.svg
index 920492bfd2..a317ce71c1 100644
--- a/data/styles/clear/style-clear/symbols/college-s.svg
+++ b/data/styles/clear/style-clear/symbols/college-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="college-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,5 L4,7.5 L8.5,10 L11,8.5 L11,9.75 L8.5,11 L6,9.75 L6,11 L8.5,12.5 L11,11 C11,11.5 12,11.5 12,11.5 L12,11 C12,11 11.5,10.971 11.5,10.5 L11.5,8.5 L13,7.5 L8.5,5 Z" id="path7442-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/computer-l.svg b/data/styles/clear/style-clear/symbols/computer-l.svg
index 4157bc7006..c324e6a292 100644
--- a/data/styles/clear/style-clear/symbols/computer-l.svg
+++ b/data/styles/clear/style-clear/symbols/computer-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="computer-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M22,8 L22,16 C22,17.104 21.104,18 20,18 L15,18 L17,20 L17,21 C17,21.553 16.553,22 16,22 L11,22 C10.447,22 10,21.553 10,21 L10,20 L12,18 L7,18 C5.896,18 5,17.104 5,16 L5,8 C5,6.896 5.896,6 7,6 L20,6 C21.104,6 22,6.896 22,8 L22,8 Z M20,15 L20,8 L7,8 L7,15 L20,15 L20,15 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/computer-m.svg b/data/styles/clear/style-clear/symbols/computer-m.svg
index 7f98c78094..8b539535f0 100644
--- a/data/styles/clear/style-clear/symbols/computer-m.svg
+++ b/data/styles/clear/style-clear/symbols/computer-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="computer-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18,6.601 L18,13.4 C18,14.284 17.283,15.001 16.399,15.001 L12.7,15.001 L14,16.4 L14,17.2 C14,17.642 13.642,18.001 13.199,18.001 L9.8,18.001 C9.359,18.001 9,17.643 9,17.2 L9,16.4 L10.301,15.001 L6.601,15.001 C5.716,15.001 5,14.284 5,13.4 L5,6.601 C5,5.717 5.716,5 6.601,5 L16.4,5 C17.283,5 18,5.717 18,6.601 L18,6.601 Z M16,13 L16,7 L7,7 L7,13 L16,13 L16,13 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/convenience-l.svg b/data/styles/clear/style-clear/symbols/convenience-l.svg
index 210058f7ad..dd9865e906 100644
--- a/data/styles/clear/style-clear/symbols/convenience-l.svg
+++ b/data/styles/clear/style-clear/symbols/convenience-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="convenience-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,7 L5,9 L22,9 L22,7 L5,7 L5,7 Z M6,21 L10,21 L10,16 L13,16 L13,21 L14,21 L14,16 L17,16 L17,21 L21,21 L21,11 L6,11 L6,21 L6,21 Z M10,13 L17,13 L17,15 L10,15 L10,13 L10,13 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/convenience-m.svg b/data/styles/clear/style-clear/symbols/convenience-m.svg
index e46a98d0d2..d6c4e0c3d6 100644
--- a/data/styles/clear/style-clear/symbols/convenience-m.svg
+++ b/data/styles/clear/style-clear/symbols/convenience-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="convenience-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,5 L5,7 L18,7 L18,5 L5,5 L5,5 Z M6,18 L8,18 L8,14 L11,14 L11,18 L12,18 L12,14 L15,14 L15,18 L17,18 L17,9 L6,9 L6,18 L6,18 Z M8,11 L15,11 L15,13 L8,13 L8,11 L8,11 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cricket-l.svg b/data/styles/clear/style-clear/symbols/cricket-l.svg
index ff04db7d64..945b6d0e56 100644
--- a/data/styles/clear/style-clear/symbols/cricket-l.svg
+++ b/data/styles/clear/style-clear/symbols/cricket-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cricket-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M21.377,6.86 C20.653,6.135 19.807,5.61 18.907,5.271 L8.908,15.27 L9.503,16.995 L6.719,19.78 C6.238,20.259 6.238,21.04 6.719,21.519 C7.199,21.999 7.979,21.999 8.458,21.519 L11.242,18.734 L12.968,19.33 L22.967,9.332 C22.628,8.432 22.103,7.585 21.377,6.86 L21.377,6.86 Z M9,11 C10.104,11 11,10.104 11,9 C11,7.896 10.104,7 9,7 C7.896,7 7,7.896 7,9 C7,10.104 7.896,11 9,11 L9,11 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/cricket-m.svg b/data/styles/clear/style-clear/symbols/cricket-m.svg
index fad18d2ed4..0bee681985 100644
--- a/data/styles/clear/style-clear/symbols/cricket-m.svg
+++ b/data/styles/clear/style-clear/symbols/cricket-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cricket-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18.333,6.303 C17.754,5.723 17.076,5.303 16.357,5.032 L8.357,13.032 L8.834,14.411 L6.606,16.64 C6.22,17.024 6.22,17.648 6.606,18.032 C6.99,18.416 7.614,18.416 7.998,18.032 L10.225,15.804 L11.606,16.281 L19.606,8.282 C19.334,7.561 18.914,6.883 18.333,6.303 L18.333,6.303 Z M8.5,9 C9.328,9 10,8.328 10,7.499 C10,6.67 9.328,5.998 8.5,5.998 C7.671,5.998 7,6.67 7,7.499 C7,8.328 7.671,9 8.5,9 L8.5,9 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/curling-l.svg b/data/styles/clear/style-clear/symbols/curling-l.svg
index b2b4a5690c..09b7713976 100644
--- a/data/styles/clear/style-clear/symbols/curling-l.svg
+++ b/data/styles/clear/style-clear/symbols/curling-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="curling-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M22.949,14 L4.029,14 C4.01,14.164 4,14.331 4,14.5 C4,16.985 6.015,19 8.5,19 L18.5,19 C20.985,19 23,16.985 23,14.5 C23,14.329 22.968,14.166 22.949,14 L22.949,14 Z M18.5,10 L12.1,10 C11.547,10 11.1,9.553 11.1,9 C11.1,8.447 11.547,8 12.1,8 L18,8 C18.553,8 19,7.553 19,7 C19,6.447 18.553,6 18,6 L10.697,6 L5.668,11.029 C5.327,11.307 5.031,11.636 4.782,12 L22.24,12 C21.433,10.795 20.06,10 18.5,10 L18.5,10 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/curling-m.svg b/data/styles/clear/style-clear/symbols/curling-m.svg
index c2d9163931..608ff01610 100644
--- a/data/styles/clear/style-clear/symbols/curling-m.svg
+++ b/data/styles/clear/style-clear/symbols/curling-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="curling-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M19.06,12.099 L3.924,12.099 C3.908,12.231 3.901,12.264 3.901,12.399 C3.901,14.387 5.512,16 7.501,16 L15.501,16 C17.489,16 19.101,14.388 19.101,12.399 C19.1,12.262 19.074,12.231 19.06,12.099 L19.06,12.099 Z M15.898,9.098 L10.379,9.098 C9.937,9.098 8.999,8.919 8.999,7.999 C8.999,7.079 9.937,6.801 10.379,6.801 L15.099,6.801 C15.542,6.801 15.9,6.444 15.9,6 C15.9,5.559 15.543,5.201 15.099,5.201 L9.257,5.201 C9.257,5.201 4.832,9.687 4.122,10.996 L18.89,10.996 C18.244,10.033 17.146,9.098 15.898,9.098 L15.898,9.098 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/department_store-l.svg b/data/styles/clear/style-clear/symbols/department_store-l.svg
index c2e21f563c..09d679a7d5 100644
--- a/data/styles/clear/style-clear/symbols/department_store-l.svg
+++ b/data/styles/clear/style-clear/symbols/department_store-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="department_store-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M12,6.28694737 L12.414,5.89473684 L14.586,5.89473684 L15,6.28694737 L15,7.78947368 L17,7.78947368 L17,5.50252632 L15.414,4 L11.586,4 L10,5.50252632 L10,7.78947368 L12,7.78947368 L12,6.28694737 L12,6.28694737 Z M17,9.68421053 L17,12.9185263 L15.414,14.4210526 L11.586,14.4210526 L10,12.9185263 L10,9.68421053 L7,9.68421053 L7,20.1052632 C7,21.1511579 7.896,22 9,22 L18,22 C19.104,22 20,21.1511579 20,20.1052632 L20,9.68421053 L17,9.68421053 L17,9.68421053 Z M12,12.1341053 L12.414,12.5263158 L14.586,12.5263158 L15,12.1341053 L15,9.68421053 L12,9.68421053 L12,12.1341053 L12,12.1341053 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/department_store-m.svg b/data/styles/clear/style-clear/symbols/department_store-m.svg
index c0960da2f7..88073533d4 100644
--- a/data/styles/clear/style-clear/symbols/department_store-m.svg
+++ b/data/styles/clear/style-clear/symbols/department_store-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="department_store-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M10,5.414 L10.414,5 L12.586,5 L13,5.414 L13,7 L14,7 L14,4.586 L13.414,4 L9.586,4 L9,4.586 L9,7 L10,7 L10,5.414 L10,5.414 Z M14,9 L14,12.414 L13.414,13 L9.586,13 L9,12.414 L9,9 L6,9 L6,17 C6,18.104 6.896,19 8,19 L15,19 C16.104,19 17,18.104 17,17 L17,9 L14,9 L14,9 Z M10,11.586 L10.414,12 L12.586,12 L13,11.586 L13,9 L10,9 L10,11.586 L10,11.586 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/diving-l.svg b/data/styles/clear/style-clear/symbols/diving-l.svg
index 32e99df906..744dc79e62 100644
--- a/data/styles/clear/style-clear/symbols/diving-l.svg
+++ b/data/styles/clear/style-clear/symbols/diving-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="diving-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M22.994,13.166 C22.903,14.267 21.936,15.085 20.836,14.993 C19.736,14.903 18.918,13.937 19.007,12.836 C19.099,11.736 20.066,10.918 21.166,11.008 C22.266,11.099 23.084,12.065 22.994,13.166 L22.994,13.166 Z M4.881,8.055 L7.22,12.739 L15.955,16.24 L18.562,19.001 L22,19.001 C22.553,19.001 23,18.664 23,18.247 C23,17.831 22.556,17.438 22.008,17.37 L19.054,17.001 L16.908,13.395 L9.012,10.59 L6.584,7.217 C6.262,6.769 5.649,6.574 5.217,6.783 C4.785,6.992 4.634,7.561 4.881,8.055 L4.881,8.055 Z M11.227,9.939 L16.406,11.696 C17.09,11.927 17.831,11.562 18.062,10.879 L18.062,10.879 C18.294,10.196 17.928,9.455 17.246,9.223 L12.066,7.466 L11.227,9.939 L11.227,9.939 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/diving-m.svg b/data/styles/clear/style-clear/symbols/diving-m.svg
index 1a67a90a50..d56006f9fe 100644
--- a/data/styles/clear/style-clear/symbols/diving-m.svg
+++ b/data/styles/clear/style-clear/symbols/diving-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="diving-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.000000)">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18.892,11.586 C18.828,12.366 18.142,12.947 17.361,12.882 C16.582,12.818 16.001,12.134 16.064,11.352 C16.128,10.573 16.814,9.993 17.595,10.056 C18.374,10.12 18.955,10.806 18.892,11.586 L18.892,11.586 Z M4.482,7.213 L6.353,10.96 L13.341,13.761 L15.427,15.969 L18.177,15.969 C18.618,15.969 18.976,15.699 18.976,15.366 C18.976,15.033 18.621,14.719 18.183,14.664 L15.82,14.369 L14.103,11.484 L7.787,9.24 L5.844,6.542 C5.586,6.184 5.097,6.027 4.75,6.195 C4.404,6.362 4.284,6.818 4.482,7.213 L4.482,7.213 Z M9.359,8.422 L13.502,9.828 C14.049,10.013 14.643,9.721 14.827,9.174 L14.827,9.174 C15.014,8.627 14.721,8.035 14.174,7.849 L10.03,6.444 L9.359,8.422 L9.359,8.422 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/dog_park-l.svg b/data/styles/clear/style-clear/symbols/dog_park-l.svg
index 8bdeadffc3..fd8caae411 100644
--- a/data/styles/clear/style-clear/symbols/dog_park-l.svg
+++ b/data/styles/clear/style-clear/symbols/dog_park-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="dog_park-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M19.457,7.371 L19,6 L18,6 L18,7.668 C17.723,7.946 17.389,8.281 17.058,8.611 L19.732,11.004 L19.734,11 L21.368,11 C22.269,11 23.001,10.328 23.001,9.5 L23.001,9 L19.457,7.371 L19.457,7.371 Z M18.768,13.499 L18.916,13.114 L15.517,10.072 L8.73,10.879 L8.188,8 L7,8 L7,14 L6,20 L6.95,20 C7.474,20 8.062,19.582 8.262,19.067 L9.894,14.485 L16.474,16.547 L17.214,19.041 C17.371,19.57 17.945,20 18.498,20 L19,20 L18.45,14.32 L18.768,13.499 L18.768,13.499 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/dog_park-m.svg b/data/styles/clear/style-clear/symbols/dog_park-m.svg
index 746651d080..d638c78f5e 100644
--- a/data/styles/clear/style-clear/symbols/dog_park-m.svg
+++ b/data/styles/clear/style-clear/symbols/dog_park-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="dog_park-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15.215,11.799 L15.334,11.491 L12.615,9.058 L7.419,9.692 L6.949,7 L6,7 L6,12.034 L5,17 L5.761,17 C6.18,17 6.651,16.666 6.811,16.254 L7.986,13.22 L13.367,14.194 L13.972,16.233 C14.098,16.657 14.557,17.001 14.999,17.001 L15.4,17.001 L14.961,12.457 L15.215,11.799 L15.215,11.799 Z M16.159,7.077 L15.8,6 L15,6 L15,6.729 C14.785,6.95 14.312,7.425 13.847,7.888 L15.987,9.803 L15.988,9.8 L17.296,9.8 C18.017,9.8 18.602,9.262 18.602,8.599 L18.602,8.2 L16.159,7.077 L16.159,7.077 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/doityourself-l.svg b/data/styles/clear/style-clear/symbols/doityourself-l.svg
index d056ce7931..03f64e99db 100644
--- a/data/styles/clear/style-clear/symbols/doityourself-l.svg
+++ b/data/styles/clear/style-clear/symbols/doityourself-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="doityourself-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M19,8 L19,10 L8,10 L8,5 L16,5 C16,6.657 17.343,8 19,8 L19,8 Z M15,21.5 L15,12 L12,12 L12,21.5 C12,22.328 12.672,23 13.5,23 L13.5,23 C14.328,23 15,22.328 15,21.5 L15,21.5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/doityourself-m.svg b/data/styles/clear/style-clear/symbols/doityourself-m.svg
index a8035dea76..eda8c3dd03 100644
--- a/data/styles/clear/style-clear/symbols/doityourself-m.svg
+++ b/data/styles/clear/style-clear/symbols/doityourself-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="doityourself-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15.801,7.4 L15.801,9 L7,9 L7,5 L13.4,5 C13.4,6.326 14.475,7.4 15.801,7.4 L15.801,7.4 Z M13,17.499 L13,10 L10,10 L10,17.499 C10,18.327 10.672,19 11.5,19 L11.5,19 C12.328,19 13,18.327 13,17.499 L13,17.499 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/dot-m.svg b/data/styles/clear/style-clear/symbols/dot-m.svg
index 1241f22b05..81836212b5 100644
--- a/data/styles/clear/style-clear/symbols/dot-m.svg
+++ b/data/styles/clear/style-clear/symbols/dot-m.svg
@@ -1,19 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="5px" height="5px" viewBox="0 0 5 5" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="6px" height="6px" viewBox="0 0 6 6" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>dot-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="City-points" sketch:type="MSLayerGroup" transform="translate(-16.000000, -15.000000)">
-            <g id="dot-m" transform="translate(16.000000, 15.000000)" sketch:type="MSShapeGroup">
-                <g id="Page-1">
-                    <g id="dot-m">
-                        <g id="Page-1">
-                            <g id="cities">
-                                <circle id="Oval-1-Copy-3" fill="#EEEEDD" cx="2.5" cy="2.5" r="2.5"></circle>
-                                <circle id="Oval-1-Copy-2" fill="#555555" cx="2.5" cy="2.5" r="1.66666667"></circle>
-                            </g>
+        <g id="dot-m" sketch:type="MSLayerGroup" transform="translate(0.502392, 0.898800)">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <g id="dot-m">
+                    <g id="Page-1">
+                        <g id="cities">
+                            <circle id="Oval-1-Copy-3" fill="#EEEEDD" cx="2.5" cy="2.5" r="2.5"></circle>
+                            <circle id="Oval-1-Copy-2" fill="#555555" cx="2.5" cy="2.5" r="1.66666667"></circle>
                         </g>
                     </g>
                 </g>
diff --git a/data/styles/clear/style-clear/symbols/dot-s-light.svg b/data/styles/clear/style-clear/symbols/dot-s-light.svg
index 9ef33b7f9c..2609f295a6 100644
--- a/data/styles/clear/style-clear/symbols/dot-s-light.svg
+++ b/data/styles/clear/style-clear/symbols/dot-s-light.svg
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="3px" height="3px" viewBox="0 0 3 3" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="4px" height="4px" viewBox="0 0 4 4" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>dot-s-light</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="City-points" sketch:type="MSLayerGroup" transform="translate(-24.000000, -23.000000)" fill-opacity="0.5" fill="#000000">
-            <g id="dot-s-light" transform="translate(24.000000, 23.000000)" sketch:type="MSShapeGroup">
-                <g id="Page-1">
-                    <g id="dot-s">
-                        <g id="Page-1">
-                            <g id="dot-s">
-                                <g id="Page-1">
-                                    <g id="cities">
-                                        <circle id="Oval-1-Copy" cx="1.5" cy="1.5" r="1.5"></circle>
-                                    </g>
+        <g id="dot-s-light" sketch:type="MSLayerGroup" transform="translate(0.502392, 0.898800)" fill-opacity="0.5" fill="#000000">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <g id="dot-s">
+                    <g id="Page-1">
+                        <g id="dot-s">
+                            <g id="Page-1">
+                                <g id="cities">
+                                    <circle id="Oval-1-Copy" cx="1.5" cy="1.5" r="1.5"></circle>
                                 </g>
                             </g>
                         </g>
diff --git a/data/styles/clear/style-clear/symbols/dot-s.svg b/data/styles/clear/style-clear/symbols/dot-s.svg
index f4dde34347..305b66e454 100644
--- a/data/styles/clear/style-clear/symbols/dot-s.svg
+++ b/data/styles/clear/style-clear/symbols/dot-s.svg
@@ -1,20 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="3px" height="3px" viewBox="0 0 3 3" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="4px" height="4px" viewBox="0 0 4 4" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>dot-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="City-points" sketch:type="MSLayerGroup" transform="translate(-24.000000, -16.000000)" fill-opacity="0.65" fill="#000003">
-            <g id="dot-s" transform="translate(24.000000, 16.000000)" sketch:type="MSShapeGroup">
-                <g id="Page-1">
-                    <g id="dot-s">
-                        <g id="Page-1">
-                            <g id="dot-s">
-                                <g id="Page-1">
-                                    <g id="cities">
-                                        <circle id="Oval-1-Copy" cx="1.5" cy="1.5" r="1.5"></circle>
-                                    </g>
+        <g id="dot-s" sketch:type="MSLayerGroup" transform="translate(0.502392, 0.898800)" fill-opacity="0.65" fill="#000003">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <g id="dot-s">
+                    <g id="Page-1">
+                        <g id="dot-s">
+                            <g id="Page-1">
+                                <g id="cities">
+                                    <circle id="Oval-1-Copy" cx="1.5" cy="1.5" r="1.5"></circle>
                                 </g>
                             </g>
                         </g>
diff --git a/data/styles/clear/style-clear/symbols/electronics-l.svg b/data/styles/clear/style-clear/symbols/electronics-l.svg
index 703d303812..87caae73af 100644
--- a/data/styles/clear/style-clear/symbols/electronics-l.svg
+++ b/data/styles/clear/style-clear/symbols/electronics-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="electronics-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M8,16 L8,19 C8,20.104 8.672,21 9.5,21 L11,21 L11,14 L9.5,14 C8.672,14 8,14.896 8,16 L8,16 Z M17.5,14 L16,14 L16,21 L17.5,21 C18.328,21 19,20.104 19,19 L19,16 C19,14.896 18.328,14 17.5,14 L17.5,14 Z M13.5,4 C8.262,4 4,8.262 4,13.5 L5.023,18.217 L6,18 L6,13 L6.026,13 C6.285,9.098 9.533,6 13.5,6 C17.467,6 20.715,9.098 20.974,13 L21,13 L21,18 L21.977,18.217 L22.977,13.717 L23,13.5 C23,8.262 18.738,4 13.5,4 L13.5,4 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/electronics-m.svg b/data/styles/clear/style-clear/symbols/electronics-m.svg
index 3712220e11..1f6b6b29ef 100644
--- a/data/styles/clear/style-clear/symbols/electronics-m.svg
+++ b/data/styles/clear/style-clear/symbols/electronics-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="electronics-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17,13.601 L17,16.4 C17,17.284 16.463,18.001 15.8,18.001 L14,18.001 L14,12.001 L15.8,12.001 C16.463,12.001 17,12.716 17,13.601 L17,13.601 Z M7.2,18 L9,18 L9,12 L7.2,12 C6.537,12 6,12.717 6,13.601 L6,16.4 C6,17.284 6.537,18 7.2,18 L7.2,18 Z M11.5,4 C7.31,4 4,7.409 4,11.601 L4,15 L5,15 L5,11.2 L5.021,11.2 C5.228,8.078 8.326,5.6 11.5,5.6 C14.674,5.6 17.771,8.078 17.979,11.2 L18,11.2 L18,15 L19,15 L18.982,11.773 L19,11.6 C19,7.409 15.691,4 11.5,4 L11.5,4 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/embassy-l.svg b/data/styles/clear/style-clear/symbols/embassy-l.svg
index 3b30228aa9..bd0dc633fa 100644
--- a/data/styles/clear/style-clear/symbols/embassy-l.svg
+++ b/data/styles/clear/style-clear/symbols/embassy-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="embassy-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M12,5.16554271 L10,6.16554271 L8,7.16554271 L8,22.1655427 C8,22.6655427 8.5,23.1655427 9,23.1655427 C9.5,23.1655427 10,22.6655427 10,22.1655427 L10,13.1655427 C10,13.1655427 11.000008,12.6655427 12.00008,12.1655427 C14,11.1656427 16.211251,15.0598427 18.00012,14.1654427 C20.0002,13.1654427 21.00012,12.6655427 21.00012,12.6655427 L21.00012,5.66554271 C21.00012,5.66554271 20,6.16554271 18,7.16554271 C16.211131,8.05994271 14.00016,4.16554271 12,5.16554271 L12,5.16554271 Z" id="rect9498-4-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/embassy-m.svg b/data/styles/clear/style-clear/symbols/embassy-m.svg
index c62f94558a..67f099df91 100644
--- a/data/styles/clear/style-clear/symbols/embassy-m.svg
+++ b/data/styles/clear/style-clear/symbols/embassy-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="embassy-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <path d="M11.5,22 C17.2989899,22 22,17.2989899 22,11.5 C22,5.70101013 17.2989899,1 11.5,1 C5.70101013,1 1,5.70101013 1,11.5 C1,17.2989899 5.70101013,22 11.5,22 Z" id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M11.5,22 C17.2989899,22 22,17.2989899 22,11.5 C22,5.70101013 17.2989899,1 11.5,1 C5.70101013,1 1,5.70101013 1,11.5 C1,17.2989899 5.70101013,22 11.5,22 Z" id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M11,5 L8,6.5 L8,19 L9,19 L9,11 L11,10 L14.5,12 L17,11 L17,6 L14.5,7 L11,5 Z" id="rect9498-4-99-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/embassy-s.svg b/data/styles/clear/style-clear/symbols/embassy-s.svg
index 1c6dcaac3f..c196e97af4 100644
--- a/data/styles/clear/style-clear/symbols/embassy-s.svg
+++ b/data/styles/clear/style-clear/symbols/embassy-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="embassy-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,4 L6,5 L6,13 L7,13 L7,8 L8.5,7.5 L11,9 L13,8 L13,4.5 L11,5.5 L8.5,4 Z" id="rect9498-4-99-4-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/fastfood-l.svg b/data/styles/clear/style-clear/symbols/fastfood-l.svg
index c07e31d63d..813c5598d5 100644
--- a/data/styles/clear/style-clear/symbols/fastfood-l.svg
+++ b/data/styles/clear/style-clear/symbols/fastfood-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fastfood-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#AB842F" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <g id="g16674-copy" transform="translate(4.000000, 7.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M8,0 C5,0 1,1.5 1,4 L1,6 L18,6 L18,4 C17.99998,1.5 14,0 11,0 L8,0 Z M7.5,1 C7.777,1 8,1.223 8,1.5 C8,1.777 7.777,2 7.5,2 C7.223,2 7,1.777 7,1.5 C7,1.223 7.223,1 7.5,1 L7.5,1 Z M11.5,1 C11.777,1 12,1.223 12,1.5 C12,1.777 11.777,2 11.5,2 C11.223,2 11,1.777 11,1.5 C11,1.223 11.223,1 11.5,1 L11.5,1 Z M5.5,3 C5.777,3 6,3.223 6,3.5 C6,3.777 5.777,4 5.5,4 C5.223,4 5,3.777 5,3.5 C5,3.223 5.223,3 5.5,3 L5.5,3 Z M9.5,3 C9.777,3 10,3.223 10,3.5 C10,3.777 9.777,4 9.5,4 C9.223,4 9,3.777 9,3.5 C9,3.223 9.223,3 9.5,3 L9.5,3 Z M13.5,3 C13.777,3 14,3.223 14,3.5 C14,3.777 13.777,4 13.5,4 C13.223,4 13,3.777 13,3.5 C13,3.223 13.223,3 13.5,3 L13.5,3 Z M1,7 C0.49997,7 -9.99999997e-06,7.5 0,8 C9.99999997e-06,8.5 0.49997,9 1,9 L18,9 C18.50001,9 18.99999,8.5 19,8 C19,7.5 18.5,7 18,7 L1,7 Z M1,10 L1,11 C1,12 2,13 3,13 L16,13 C17,13 18,12 18,11 L18,10 L1,10 Z" id="rect13326-2-5-2-3"></path>
             </g>
diff --git a/data/styles/clear/style-clear/symbols/fastfood-m.svg b/data/styles/clear/style-clear/symbols/fastfood-m.svg
index 0c4101ce24..dc03c99ebe 100644
--- a/data/styles/clear/style-clear/symbols/fastfood-m.svg
+++ b/data/styles/clear/style-clear/symbols/fastfood-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fastfood-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#AB842F" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11,7 C8.94737,7 5.5,7.7895 5.5,9.5 L5.5,11 L17.5,11 L17.5,9.5 C17.5,7.7895 14.05263,7 12,7 L11,7 Z M9,8.125 C9.20711,8.125 9.375,8.2929 9.375,8.5 C9.375,8.7071 9.20711,8.875 9,8.875 C8.79289,8.875 8.625,8.7071 8.625,8.5 C8.625,8.2929 8.79289,8.125 9,8.125 L9,8.125 Z M14,8.125 C14.20711,8.125 14.375,8.2929 14.375,8.5 C14.375,8.7071 14.20711,8.875 14,8.875 C13.79289,8.875 13.625,8.7071 13.625,8.5 C13.625,8.2929 13.79289,8.125 14,8.125 L14,8.125 Z M7,9.125 C7.20711,9.125 7.375,9.2929 7.375,9.5 C7.375,9.7071 7.20711,9.875 7,9.875 C6.79289,9.875 6.625,9.7071 6.625,9.5 C6.625,9.2929 6.79289,9.125 7,9.125 L7,9.125 Z M11.375,9.125 C11.58211,9.125 11.75,9.2929 11.75,9.5 C11.75,9.7071 11.58211,9.875 11.375,9.875 C11.16789,9.875 11,9.7071 11,9.5 C11,9.2929 11.16789,9.125 11.375,9.125 L11.375,9.125 Z M16,9.125 C16.20711,9.125 16.375,9.2929 16.375,9.5 C16.375,9.7071 16.20711,9.875 16,9.875 C15.79289,9.875 15.625,9.7071 15.625,9.5 C15.625,9.2929 15.79289,9.125 16,9.125 L16,9.125 Z M5.5,12 C5.15787,12 4.99999,12.1579 5,12.5 C5.00001,12.8422 5.15787,13 5.5,13 L17.5,13 C17.84211,13 17.99999,12.8422 18,12.5 C18.00001,12.1579 17.84211,12 17.5,12 L6.5,12 L5.5,12 Z M5.5,14.625 C5.5,15.3092 6.19079,16 6.875,16 L16.125,16 C16.80921,16 17.5,15.3092 17.5,14.625 L17.5,14 L5.5,14 L5.5,14.625 Z" id="rect13326-2-5-2-3-6-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/fastfood-s.svg b/data/styles/clear/style-clear/symbols/fastfood-s.svg
index 1dab488d7a..512744fd0b 100644
--- a/data/styles/clear/style-clear/symbols/fastfood-s.svg
+++ b/data/styles/clear/style-clear/symbols/fastfood-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fastfood-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#AB842F" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.05044132,5 C6.62939132,5 4.3512,5.8723 4.44736,7.0526 L4.44736,8.25 L12.5,8.25 L12.5,7.0526 C12.5,5.8684 10.4050722,5 8.98402216,5 L8.05044132,5 Z M4,9 L4,10 L13,10 L13,9 L4,9 Z M4.49996,10.75 C4.49996,11.2237 5.02628,12 5.49996,12 L11.49996,12 C11.97364,12 12.49996,11.2237 12.49996,10.75 L4.49996,10.75 Z" id="rect13326-2-5-2-3-1-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/fire_station-l.svg b/data/styles/clear/style-clear/symbols/fire_station-l.svg
index e11e04a103..06b5140b5c 100644
--- a/data/styles/clear/style-clear/symbols/fire_station-l.svg
+++ b/data/styles/clear/style-clear/symbols/fire_station-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fire_station-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M13.5,5 L6,6.89473684 L6,13.2013684 C6,18.482 8.982,20.2914737 13.5,23 C18.018,20.2924211 21,18.482 21,13.2013684 L21,6.89473684 L13.5,5 L13.5,5 Z M13.441,19.1053684 C13.441,19.1053684 5.972,14.1638947 13.382,7.90557895 C10.418,13.0062105 14.612,16.4404211 15.134,10.9513684 C19.912,16.3456842 13.441,19.1053684 13.441,19.1053684 L13.441,19.1053684 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/fire_station-m.svg b/data/styles/clear/style-clear/symbols/fire_station-m.svg
index 80796960e9..40a1af5a69 100644
--- a/data/styles/clear/style-clear/symbols/fire_station-m.svg
+++ b/data/styles/clear/style-clear/symbols/fire_station-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fire_station-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,6.4728 L5,11.3793333 C5,15.486 7.585,16.8934667 11.5,19 C15.415,16.8934667 18,15.486 18,11.3793333 L18,6.4728 L11.5,4 L5,6.4728 Z M11.3957358,6 C8.82978238,9.96666667 12.4608863,12.6378667 12.9135252,8.3688 C17.0522243,12.5641333 11.4466952,14.7108 11.4466952,14.7108 C11.4466952,14.7108 4.97885384,10.8682667 11.3957358,6 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/florist-l.svg b/data/styles/clear/style-clear/symbols/florist-l.svg
index ba3f93f910..a2f9f5da8b 100644
--- a/data/styles/clear/style-clear/symbols/florist-l.svg
+++ b/data/styles/clear/style-clear/symbols/florist-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="florist-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15.433,18.433 C14.22,19.646 13.779,21.334 14.104,22.898 C15.665,23.222 17.355,22.781 18.568,21.568 C19.781,20.355 20.222,18.666 19.897,17.103 C18.336,16.778 16.646,17.22 15.433,18.433 L15.433,18.433 Z M7.104,17.103 C6.779,18.665 7.22,20.355 8.433,21.568 C9.646,22.781 11.336,23.222 12.897,22.898 C13.222,21.335 12.781,19.646 11.568,18.433 C10.355,17.22 8.664,16.778 7.104,17.103 L7.104,17.103 Z M14.92,14.494 C14.92,14.202 14.876,13.923 14.812,13.65 C14.958,13.886 15.124,14.114 15.33,14.32 C15.9,14.891 16.61,15.233 17.35,15.352 C17.915,15.442 18.454,14.904 18.363,14.339 C18.245,13.6 17.901,12.89 17.331,12.319 C17.125,12.112 16.895,11.946 16.658,11.799 C16.929,11.861 17.207,11.906 17.497,11.906 C18.303,11.907 19.048,11.646 19.654,11.208 C20.118,10.872 20.118,10.109 19.654,9.776 C19.048,9.336 18.302,9.078 17.496,9.078 C17.204,9.078 16.925,9.122 16.653,9.185 C16.888,9.039 17.117,8.873 17.322,8.668 C17.893,8.098 18.235,7.388 18.354,6.648 C18.443,6.083 17.906,5.544 17.34,5.636 C16.601,5.753 15.891,6.098 15.32,6.667 C15.113,6.874 14.947,7.104 14.799,7.342 C14.863,7.071 14.907,6.792 14.907,6.502 C14.907,5.694 14.647,4.95 14.208,4.345 C13.873,3.881 13.112,3.881 12.777,4.345 C12.338,4.95 12.079,5.695 12.079,6.502 C12.079,6.793 12.124,7.073 12.187,7.346 C12.041,7.11 11.875,6.882 11.67,6.677 C11.1,6.106 10.39,5.764 9.65,5.645 C9.085,5.555 8.547,6.093 8.636,6.657 C8.755,7.397 9.097,8.107 9.669,8.677 C9.875,8.884 10.105,9.051 10.343,9.198 C10.072,9.134 9.793,9.09 9.503,9.09 C8.695,9.09 7.952,9.351 7.346,9.789 C6.882,10.124 6.882,10.885 7.346,11.219 C7.952,11.66 8.696,11.919 9.503,11.919 C9.795,11.919 10.074,11.874 10.346,11.811 C10.111,11.957 9.883,12.122 9.678,12.327 C9.107,12.898 8.764,13.608 8.646,14.348 C8.557,14.913 9.093,15.451 9.659,15.36 C10.398,15.243 11.109,14.899 11.679,14.329 C11.886,14.123 12.053,13.893 12.2,13.655 C12.137,13.926 12.093,14.204 12.093,14.494 C12.092,15.302 12.353,16.046 12.792,16.651 C13.127,17.115 13.888,17.115 14.222,16.651 C14.662,16.047 14.92,15.302 14.92,14.494 L14.92,14.494 Z M13.5,13 C12.119,13 11,11.881 11,10.5 C11,9.119 12.119,8 13.5,8 C14.881,8 16,9.119 16,10.5 C16,11.881 14.881,13 13.5,13 L13.5,13 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/florist-m.svg b/data/styles/clear/style-clear/symbols/florist-m.svg
index 5208279883..4e3fefadf5 100644
--- a/data/styles/clear/style-clear/symbols/florist-m.svg
+++ b/data/styles/clear/style-clear/symbols/florist-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="florist-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M13.194,15.193 C12.183,16.205 11.815,17.613 12.086,18.915 C13.387,19.186 14.796,18.817 15.808,17.807 C16.818,16.796 17.185,15.388 16.914,14.086 C15.614,13.816 14.205,14.184 13.194,15.193 L13.194,15.193 Z M6.086,14.086 C5.815,15.388 6.184,16.796 7.193,17.807 C8.204,18.818 9.614,19.186 10.914,18.915 C11.185,17.613 10.816,16.205 9.807,15.193 C8.796,14.184 7.386,13.816 6.086,14.086 L6.086,14.086 Z M12.702,12.88 C12.702,12.633 12.665,12.397 12.609,12.166 C12.733,12.365 12.874,12.559 13.047,12.732 C13.53,13.215 14.132,13.505 14.757,13.606 C15.235,13.681 15.691,13.226 15.613,12.749 C15.513,12.123 15.222,11.522 14.74,11.041 C14.565,10.865 14.371,10.725 14.171,10.601 C14.4,10.654 14.636,10.692 14.881,10.692 C15.563,10.692 16.193,10.472 16.706,10.102 C17.098,9.817 17.098,9.172 16.706,8.89 C16.193,8.517 15.562,8.299 14.88,8.299 C14.633,8.299 14.397,8.336 14.167,8.39 C14.365,8.266 14.56,8.126 14.732,7.953 C15.215,7.47 15.505,6.869 15.606,6.244 C15.68,5.765 15.226,5.31 14.748,5.387 C14.123,5.487 13.522,5.779 13.039,6.261 C12.864,6.436 12.724,6.63 12.599,6.831 C12.654,6.602 12.692,6.366 12.692,6.12 C12.692,5.436 12.471,4.808 12.099,4.295 C11.817,3.902 11.172,3.902 10.889,4.295 C10.517,4.808 10.298,5.437 10.298,6.12 C10.298,6.366 10.336,6.603 10.39,6.835 C10.266,6.635 10.126,6.442 9.953,6.27 C9.47,5.787 8.869,5.497 8.244,5.396 C7.765,5.319 7.31,5.775 7.386,6.25 C7.487,6.877 7.776,7.478 8.261,7.96 C8.435,8.135 8.629,8.277 8.831,8.401 C8.601,8.347 8.365,8.31 8.12,8.31 C7.436,8.31 6.808,8.53 6.294,8.9 C5.902,9.183 5.902,9.828 6.294,10.111 C6.808,10.484 7.437,10.703 8.12,10.703 C8.366,10.703 8.603,10.665 8.833,10.611 C8.634,10.735 8.44,10.874 8.268,11.047 C7.785,11.53 7.495,12.132 7.395,12.758 C7.32,13.237 7.774,13.691 8.251,13.613 C8.877,13.513 9.478,13.223 9.96,12.741 C10.135,12.566 10.277,12.372 10.401,12.171 C10.347,12.4 10.31,12.636 10.31,12.881 C10.308,13.564 10.529,14.193 10.901,14.705 C11.183,15.098 11.828,15.098 12.111,14.705 C12.483,14.193 12.702,13.563 12.702,12.88 L12.702,12.88 Z M11.5,11.1 C10.616,11.1 9.9,10.385 9.9,9.5 C9.9,8.616 10.616,7.9 11.5,7.9 C12.385,7.9 13.1,8.616 13.1,9.5 C13.1,10.385 12.385,11.1 11.5,11.1 L11.5,11.1 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/fuel-l.svg b/data/styles/clear/style-clear/symbols/fuel-l.svg
index 0ba830aaaa..027288d765 100644
--- a/data/styles/clear/style-clear/symbols/fuel-l.svg
+++ b/data/styles/clear/style-clear/symbols/fuel-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fuel-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M8,4.5 C7.4459904,4.5 7,4.946 7,5.5 L7,21.5 C7,22 7.5,22.5 8,22.5 L17,22.5 C17.5,22.5 18,22 18,21.5 L18,16.5 L18.5,16.5 C19,16.5 19,17 19,17 L19,19 C19,20 19.5,20.5 20.5,20.5 C21.5,20.5 22,20 22,19 L22,13.5 C22,12.5 20,11.5 20,10.5 L20,7.5 L19,7.5 L18,6.5 L18,5.5 C18,4.946 17.55401,4.5 17,4.5 L8,4.5 Z M9,6.5 L16,6.5 L16,10.5 L9,10.5 L9,6.5 Z M18,9.5 L19,9.5 L19,11 C19,12 21,13 21,14 L21,19 C21,19.5 20.5,19.5 20.5,19.5 C20.5,19.5 20,19.5 20,19 L20,16.5 C20,16 19.5,15.5 19,15.5 L18,15.5 L18,9.5 Z" id="rect7223-2-4-9-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/fuel-m.svg b/data/styles/clear/style-clear/symbols/fuel-m.svg
index ac5da8af15..b6beceb60d 100644
--- a/data/styles/clear/style-clear/symbols/fuel-m.svg
+++ b/data/styles/clear/style-clear/symbols/fuel-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fuel-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M8,5 C7.5,5 7,5.5 7,6 L7,17 C7,17.5 7.5,18 8,18 L14,18 C14.5,18 15,17.5 15,17 L15,14 L15.25,14 C15.38687,14 15.5,14.096 15.5,14.25 L15.5,15 C15.5,15.5 16,16 16.5,16 L17,16 C17.5,16 18,15.5928 18,15 L18,11.5 C18,10.5 17,10.5 17,9.5002 L17,8.0002 L16,8.0002 L15,7 L15,6.0002 C15,5.5002 14.5,5.0002 14,5.0002 L8,5 Z M8,6.5 L14,6.5 L14,9 L8,9 L8,6.5 Z M15,10 L16,10 C16,11 17,11 17,12 L17,14.75 C17,15 16.75002,15 16.75002,15 C16.75002,15 16.5,15 16.50002,14.75 L16.50002,14 C16.50002,13.4094 16.00064,12.9986 15.50002,13 L14.99993,12.9998 L15,10 Z" id="rect7223-2-4-9-4-2-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/fuel-s.svg b/data/styles/clear/style-clear/symbols/fuel-s.svg
index ba744bb2e4..9ee7e9c156 100644
--- a/data/styles/clear/style-clear/symbols/fuel-s.svg
+++ b/data/styles/clear/style-clear/symbols/fuel-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="fuel-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.5,4 C5.22299,4 5,4.223 5,4.5 L5,12.5 C5,12.75 5.25,13 5.5,13 L9.5,13 C9.75,13 10,12.75 10,12.5 L10,12 L11.25,12 C11.75,12 12,11.75 12,11.25 L12,8.5 C12,8 11,7.5 11,7 L11,6.75 L11,6 L10,5 L10,4.5 C10,4.223 9.777,4 9.5,4 L5.5,4 L5.5,4 Z M6,5 L9,5 L9,7 L6,7 L6,5 L6,5 Z M10,6.5 L10.5,6.5 L10.5,7.25 C10.5,7.75 11.5,8.25 11.5,8.75 L11.5,11 L11.5,11.25 C11.5,11.5 11.25,11.5 11.25,11.5 L10.5,11.5 L10.5,10 L10,10 L10,6.5 L10,6.5 Z" id="rect7223-2-4-9-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/furniture-l.svg b/data/styles/clear/style-clear/symbols/furniture-l.svg
index cd28e730a6..37ddaa5b1c 100644
--- a/data/styles/clear/style-clear/symbols/furniture-l.svg
+++ b/data/styles/clear/style-clear/symbols/furniture-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="furniture-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M22,15.16 C22,16.264 21.104,17.159 20,17.159 L20,22 L18,22 L18,20 L9,20 L9,22 L7,22 L7,17.159 C5.896,17.159 5,16.263 5,15.16 C5,14.055 5.896,13.159 7,13.159 C8.104,13.159 9,14.055 9,15.16 L9,16 L11,16 L11,15.16 C11,13.302 9.721,11.748 8,11.301 L8,6.529 C9.605,5.559 11.488,5.001 13.501,5.001 C15.513,5.001 17.395,5.56 19,6.529 L19,11.301 C17.279,11.748 16,13.302 16,15.16 L16,16 L18,16 L18,15.16 C18,14.055 18.896,13.159 20,13.159 C21.104,13.159 22,14.055 22,15.16 L22,15.16 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/furniture-m.svg b/data/styles/clear/style-clear/symbols/furniture-m.svg
index 167c02a9b4..32d51ff7c3 100644
--- a/data/styles/clear/style-clear/symbols/furniture-m.svg
+++ b/data/styles/clear/style-clear/symbols/furniture-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="furniture-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18,11.9333333 C18,12.5418667 17.581,13.0542667 17,13.2474667 L17,18 L15,18 L15,16.1333333 L8,16.1333333 L8,18 L6,18 L6,13.2474667 C5.419,13.0542667 5,12.5418667 5,11.9333333 C5,11.1605333 5.672,10.5333333 6.5,10.5333333 C7.327,10.5333333 7.999,11.1596 8,11.9314667 L8,13.3333333 L9.2,13.3333333 L9.2,11.9305333 C9.198,10.7022667 8.249,9.68026667 7,9.46093333 L7,5.25906667 C8.308,4.46106667 9.859,4 11.501,4 C13.141,4 14.692,4.46013333 16,5.25906667 L16,9.46093333 C14.751,9.68026667 13.802,10.7032 13.8,11.9314667 L13.8,13.3333333 L15,13.3333333 L15,11.9314667 C15.001,11.1596 15.673,10.5333333 16.5,10.5333333 C17.328,10.5333333 18,11.1605333 18,11.9333333 L18,11.9333333 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/gallery-l.svg b/data/styles/clear/style-clear/symbols/gallery-l.svg
index 3beb82ac53..5b7fd1eb17 100644
--- a/data/styles/clear/style-clear/symbols/gallery-l.svg
+++ b/data/styles/clear/style-clear/symbols/gallery-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="art-gallery-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M12,6 C7,6 4,10 4,12 C4,14 5,15.5 7,15.5 C9,15.5 10,16 10,17.5 C10,19.5 11.5,21 13.5,21 C20,21 23,17.5 23,14 C23,8 18,6 12,6 L12,6 Z M10.75,8 C11.44034,8 12,8.55966 12,9.25 C12,9.94034 11.44034,10.5 10.75,10.5 C10.05966,10.5 9.5,9.94034 9.5,9.25 C9.5,8.55966 10.05966,8 10.75,8 L10.75,8 Z M14.75,8 C15.44033,8 16,8.55967 16,9.25 C16,9.94033 15.44033,10.5 14.75,10.5 C14.05967,10.5 13.5,9.94033 13.5,9.25 C13.5,8.55967 14.05967,8 14.75,8 L14.75,8 Z M18.75,10 C19.44034,10 20,10.55966 20,11.25 C20,11.94034 19.44034,12.5 18.75,12.5 C18.05966,12.5 17.5,11.94034 17.5,11.25 C17.5,10.55966 18.05966,10 18.75,10 L18.75,10 Z M7.25,11 C7.94034,11 8.5,11.55966 8.5,12.25 C8.5,12.94034 7.94034,13.5 7.25,13.5 C6.55966,13.5 6,12.94034 6,12.25 C6,11.55966 6.55966,11 7.25,11 L7.25,11 Z M13.5,16 C14.32843,16 15,16.67157 15,17.5 C15,18.32843 14.32843,19 13.5,19 C12.67157,19 12,18.32843 12,17.5 C12,16.67157 12.67157,16 13.5,16 L13.5,16 Z" id="path6511" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/gallery-m.svg b/data/styles/clear/style-clear/symbols/gallery-m.svg
index 46007cf897..ae735174e9 100644
--- a/data/styles/clear/style-clear/symbols/gallery-m.svg
+++ b/data/styles/clear/style-clear/symbols/gallery-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="art-gallery-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10.5000045,7 C6.61111446,7 4.00000442,10.44444 4.00000442,12.0000001 C4.00000442,13.5000001 4.99999444,14.5000001 6.50000446,14.5000001 C8.05556448,14.5000001 9.5000045,14.8333301 9.5000045,16.0000001 C9.5000045,17.5555601 10.9444445,18.5000002 12.5000045,18.5000002 C17.0000046,18.5000002 19.0000046,15.7222201 19.0000046,13.0000001 C19.0000046,7.50000001 14.3660046,7 10.5000045,7 L10.5000045,7 Z M9.00000449,8.50000002 C9.5522845,8.50000002 10.0000045,8.94772003 10.0000045,9.50000003 C10.0000045,10.05228 9.5522845,10.5 9.00000449,10.5 C8.44772449,10.5 8.00000448,10.05228 8.00000448,9.50000003 C8.00000448,8.94772003 8.44772449,8.50000002 9.00000449,8.50000002 L9.00000449,8.50000002 Z M12.0000045,8.50000002 C12.5522745,8.50000002 13.0000046,8.94773003 13.0000046,9.50000003 C13.0000046,10.05227 12.5522745,10.5 12.0000045,10.5 C11.4477345,10.5 11.0000045,10.05227 11.0000045,9.50000003 C11.0000045,8.94773003 11.4477345,8.50000002 12.0000045,8.50000002 L12.0000045,8.50000002 Z M15.0000046,10 C15.5446246,10 15.9687546,10.45538 15.9687546,11.0000001 C15.9687546,11.5446201 15.5446246,11.9687501 15.0000046,11.9687501 C14.4553846,11.9687501 14.0000046,11.5446201 14.0000046,11.0000001 C14.0000046,10.45538 14.4553846,10 15.0000046,10 L15.0000046,10 Z M7.00000447,11.0000001 C7.55229447,11.0000001 8.00000448,11.4477101 8.00000448,12.0000001 C8.00000448,12.5522901 7.55229447,13.0000001 7.00000447,13.0000001 C6.44771446,13.0000001 6.00000445,12.5522901 6.00000445,12.0000001 C6.00000445,11.4477101 6.44771446,11.0000001 7.00000447,11.0000001 L7.00000447,11.0000001 Z M12.2500045,14.5000001 C12.9403545,14.5000001 13.5000046,15.0596501 13.5000046,15.7500001 C13.5000046,16.4403501 12.9403545,17.0000001 12.2500045,17.0000001 C11.5596545,17.0000001 11.0000045,16.4403501 11.0000045,15.7500001 C11.0000045,15.0596501 11.5596545,14.5000001 12.2500045,14.5000001 L12.2500045,14.5000001 Z" id="path6511-1" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/gallery-s.svg b/data/styles/clear/style-clear/symbols/gallery-s.svg
index c66f511ccc..f9a6a91c67 100644
--- a/data/styles/clear/style-clear/symbols/gallery-s.svg
+++ b/data/styles/clear/style-clear/symbols/gallery-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="art-gallery-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8,5 C5.5,5 4,6.5 4,8 C4,9 4.5,10 6,10 C7,10 7,10.25 7,11 C7,12.5 8.5,13 9.5,13 C12,13 13,10.75 13,9 C13,5.5 10.48528,5 8,5 L8,5 Z M7.375,6 C7.72017,6 8,6.2798 8,6.625 C8,6.9702 7.72017,7.25 7.375,7.25 C7.02983,7.25 6.75,6.9702 6.75,6.625 C6.75,6.2798 7.02983,6 7.375,6 L7.375,6 Z M9.375,6 C9.72017,6 10,6.2798 10,6.625 C10,6.9702 9.72017,7.25 9.375,7.25 C9.02983,7.25 8.75,6.9702 8.75,6.625 C8.75,6.2798 9.02983,6 9.375,6 L9.375,6 Z M5.625,6.75 C5.97017,6.75 6.25,7.0298 6.25,7.375 C6.25,7.7202 5.97017,8 5.625,8 C5.27983,8 5,7.7202 5,7.375 C5,7.0298 5.27983,6.75 5.625,6.75 L5.625,6.75 Z M11.375,7 C11.72017,7 12,7.2798 12,7.625 C12,7.9702 11.72017,8.25 11.375,8.25 C11.02983,8.25 10.75,7.9702 10.75,7.625 C10.75,7.2798 11.02983,7 11.375,7 L11.375,7 Z M9,9.5 C9.55228,9.5 10,9.9477 10,10.5 C10,11.0523 9.55228,11.5 9,11.5 C8.44772,11.5 8,11.0523 8,10.5 C8,9.9477 8.44772,9.5 9,9.5 L9,9.5 Z" id="path6558" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/garden_center-l.svg b/data/styles/clear/style-clear/symbols/garden_center-l.svg
index 4ecf166dc0..235d748f7d 100644
--- a/data/styles/clear/style-clear/symbols/garden_center-l.svg
+++ b/data/styles/clear/style-clear/symbols/garden_center-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="garden_center-l" sketch:type="MSLayerGroup">
             <path d="M13.4238214,27 C6.24664286,27 0.405964286,20.943 0.405964286,13.5 C0.405964286,6.057 6.24664286,0 13.4238214,0 C20.601,0 26.4416786,6.057 26.4416786,13.5 C26.4416786,20.943 20.601,27 13.4238214,27 L13.4238214,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M25.4773929,13.5 C25.4773929,20.403 20.0802857,26 13.4238214,26 C6.76735714,26 1.37025,20.403 1.37025,13.5 C1.37025,6.597 6.76735714,1 13.4238214,1 C20.0802857,1 25.4773929,6.597 25.4773929,13.5 L25.4773929,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M25.4773929,13.5 C25.4773929,20.403 20.0802857,26 13.4238214,26 C6.76735714,26 1.37025,20.403 1.37025,13.5 C1.37025,6.597 6.76735714,1 13.4238214,1 C20.0802857,1 25.4773929,6.597 25.4773929,13.5 L25.4773929,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M14.2897002,13.895 C15.7949502,14.219 17.424593,13.778 18.5942716,12.565 C19.7639502,11.352 20.1892002,9.663 19.8758073,8.1 C18.3705573,7.776 16.7409144,8.217 15.5712359,9.43 C14.4015573,10.643 13.975343,12.332 14.2897002,13.895 L14.2897002,13.895 Z M12.8587002,13.912 C13.1200216,12.613 12.7642002,11.204 11.7902716,10.193 C10.8173073,9.182 9.45862873,8.814 8.20312873,9.086 C7.9418073,10.387 8.29859301,11.794 9.2715573,12.805 C10.2445216,13.816 11.6012716,14.184 12.8587002,13.912 L12.8587002,13.912 Z M13.6207573,9.5 C14.5216704,8.91384362 15.1192355,7.90166636 15.12025,6.75050357 C15.12025,5.59833364 14.5226849,4.58817066 13.6197427,4 C12.7178151,4.58817066 12.1212645,5.59934078 12.12025,6.75050357 C12.12025,7.90166636 12.7168006,8.91182934 13.6207573,9.5 L13.6207573,9.5 Z M9.11030391,17.999 L9.67562469,17.999 L11.0904117,22.999 L16.0406813,22.999 L17.4554683,17.999 L18.0207891,17.999 C18.5682889,17.999 19.010843,17.552 19.010843,16.999 L19.010843,15.999 L8.12025,15.999 L8.12025,16.999 C8.12025,17.552 8.5628041,17.999 9.11030391,17.999 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/garden_center-m.svg b/data/styles/clear/style-clear/symbols/garden_center-m.svg
index fd2933ca5c..08d571bd07 100644
--- a/data/styles/clear/style-clear/symbols/garden_center-m.svg
+++ b/data/styles/clear/style-clear/symbols/garden_center-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="garden_center-m" sketch:type="MSLayerGroup">
             <path d="M11.4242917,23 C5.3475,23 0.403458333,17.841 0.403458333,11.5 C0.403458333,5.159 5.3475,0 11.4242917,0 C17.5010833,0 22.445125,5.159 22.445125,11.5 C22.445125,17.841 17.5010833,23 11.4242917,23 L11.4242917,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M21.4867917,11.5 C21.4867917,17.299 16.9816667,22 11.4242917,22 C5.86691667,22 1.36179167,17.299 1.36179167,11.5 C1.36179167,5.701 5.86691667,1 11.4242917,1 C16.9816667,1 21.4867917,5.701 21.4867917,11.5 L21.4867917,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M21.4867917,11.5 C21.4867917,17.299 16.9816667,22 11.4242917,22 C5.86691667,22 1.36179167,17.299 1.36179167,11.5 C1.36179167,5.701 5.86691667,1 11.4242917,1 C16.9816667,1 21.4867917,5.701 21.4867917,11.5 L21.4867917,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M13.0020468,8.347 C13.9325884,7.377 15.2272968,7.024 16.4232968,7.284 C16.6734218,8.534 16.3351301,9.886 15.4055468,10.855 C14.4759634,11.824 13.1802968,12.178 11.9833384,11.918 C11.7332134,10.668 12.0724634,9.316 13.0020468,8.347 L13.0020468,8.347 Z M10.8802968,11.83 C11.0882551,10.791 10.8055468,9.664 10.0302551,8.855 C9.25688009,8.046 8.17588009,7.751 7.17729676,7.968 C6.97029676,9.009 7.25396342,10.135 8.02733842,10.944 C8.80263009,11.753 9.88075509,12.047 10.8802968,11.83 L10.8802968,11.83 Z M7.11179167,14.2 C7.11179167,14.642 7.47792803,15 7.92997348,15 L8.39735985,15 L8.98235985,19 L14.0959962,19 L14.8262235,15 L15.2936098,15 C15.7456553,15 16.1117917,14.643 16.1117917,14.2 L16.1117917,13 L7.11179167,13 L7.11179167,14.2 L7.11179167,14.2 Z M11.4246301,4 C10.6311301,4 9.98713009,4.672 9.98713009,5.5 C9.98713009,6.328 10.6311301,7 11.4246301,7 C12.2181301,7 12.8621301,6.328 12.8621301,5.5 C12.8621301,4.672 12.2181301,4 11.4246301,4 L11.4246301,4 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/gate-l.svg b/data/styles/clear/style-clear/symbols/gate-l.svg
index 441a785cda..a4865180d1 100644
--- a/data/styles/clear/style-clear/symbols/gate-l.svg
+++ b/data/styles/clear/style-clear/symbols/gate-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="gate-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,19 L22,19 C22.552,19 23,18.553 23,18 L23,17 L4,17 L4,18 C4,18.553 4.448,19 5,19 L5,19 Z M10,14 L21.5,14 C22.329,14 23,13.328 23,12.5 C23,11.672 22.329,11 21.5,11 L16.883,11 L11.299,6 L9.299,6 L12.383,11 L8.208,11 L5.833,8 L4,8 L5.5,12 L10,14 L10,14 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/gate-m.svg b/data/styles/clear/style-clear/symbols/gate-m.svg
index 6fc2355a14..1d9ef8bd87 100644
--- a/data/styles/clear/style-clear/symbols/gate-m.svg
+++ b/data/styles/clear/style-clear/symbols/gate-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="gate-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,15.8 L18,15.8 C18.552,15.8 19,15.353 19,14.8 L19,14.199 L4,14.199 L4,14.8 C4,15.353 4.448,15.8 5,15.8 L5,15.8 Z M9,12 L17.5,12 C18.329,12 19,11.328 19,10.5 C19,9.672 18.329,9 17.5,9 L13.9,9 L10.3,6 L8.7,6 L10.5,9 L7.207,9 L5.528,7 L4,7 L5.25,10.333 L9,12 L9,12 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/gift-l.svg b/data/styles/clear/style-clear/symbols/gift-l.svg
index 0688e3252f..4cab46d5a5 100644
--- a/data/styles/clear/style-clear/symbols/gift-l.svg
+++ b/data/styles/clear/style-clear/symbols/gift-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="gift-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M20,10.6700916 L15,10.6700916 L15,14.4467277 L21,14.4467277 L21,11.6142506 C21,11.0921307 20.553,10.6700916 20,10.6700916 L20,10.6700916 Z M6,21.055841 C6,21.5779609 6.447,22 7,22 L12,22 L12,16.3350458 L6,16.3350458 L6,21.055841 L6,21.055841 Z M6,11.6142506 L6,14.4467277 L12,14.4467277 L12,10.6700916 L7,10.6700916 C6.447,10.6700916 6,11.0921307 6,11.6142506 L6,11.6142506 Z M15,22 L20,22 C20.553,22 21,21.5779609 21,21.055841 L21,16.3350458 L15,16.3350458 L15,22 L15,22 Z M10.498,9.72404423 L16.502,9.72404423 C17.856,9.72404423 18.955,8.68546929 18.955,7.40802211 C18.955,6.13057494 17.855,5.092 16.502,5.092 C15.847,5.092 15.231,5.33370471 14.769,5.76990619 L13.5,6.95671409 L12.232,5.77179451 C11.77,5.33370471 11.154,5.092 10.498,5.092 C9.144,5.092 8.045,6.13057494 8.045,7.40802211 C8.045,8.68546929 9.145,9.72404423 10.498,9.72404423 L10.498,9.72404423 Z M10.44,5.85299218 C10.868,5.85299218 11.269,6.00972258 11.571,6.29580277 L13.5,8.10009069 L15.427,6.29674693 C15.73,6.01066674 16.133,5.85299218 16.56,5.85299218 C17.442,5.85299218 18.16,6.53089837 18.16,7.36364664 C18.16,8.19639491 17.442,8.87430109 16.56,8.87430109 L10.441,8.87430109 C9.559,8.87430109 8.841,8.19639491 8.841,7.36364664 C8.841,6.53089837 9.559,5.85299218 10.44,5.85299218 L10.44,5.85299218 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/gift-m.svg b/data/styles/clear/style-clear/symbols/gift-m.svg
index f101698570..647a5450b8 100644
--- a/data/styles/clear/style-clear/symbols/gift-m.svg
+++ b/data/styles/clear/style-clear/symbols/gift-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="gift-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17,8 L13,8 L13,11 L18,11 L18,9 C18,8.447 17.553,8 17,8 L17,8 Z M5,17 C5,17.553 5.447,18 6,18 L10,18 L10,13 L5,13 L5,17 L5,17 Z M5,9 L5,11 L10,11 L10,8 L6,8 C5.447,8 5,8.447 5,9 L5,9 Z M13,18 L17,18 C17.553,18 18,17.553 18,17 L18,13 L13,13 L13,18 L13,18 Z M8.649,7 L14.35,7 C15.171,7 15.84,6.331 15.84,5.51 C15.84,4.689 15.171,4.02 14.35,4.02 C13.953,4.02 13.577,4.175 13.294,4.458 L11.499,6.237 L9.702,4.457 C9.421,4.175 9.047,4.02 8.648,4.02 C7.827,4.02 7.158,4.689 7.158,5.51 C7.158,6.331 7.828,7 8.649,7 L8.649,7 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/golf-l.svg b/data/styles/clear/style-clear/symbols/golf-l.svg
index e2910a77f0..5f8034cbf9 100644
--- a/data/styles/clear/style-clear/symbols/golf-l.svg
+++ b/data/styles/clear/style-clear/symbols/golf-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="golf-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M10,5.5 L10,17.9375 C8,17.9995 7,19.5 7,20.5 C7,21 7.5,21 7.5,21 L19.5,21 C19.5,21 20,21 20,20.5 C20,18 18.5,16 17,16 C15.42767,16 14.55691,18.7803 13,19 C12.31729,19.096 11.6576,18.6547 11,18.3125 L11,11 L18,8 L11.50162,5.215 C11.12515,5.0537 10.75012,5 10.5,5 C10.15852,5 10,5 10,5.5 Z" id="rect8138-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/golf-m.svg b/data/styles/clear/style-clear/symbols/golf-m.svg
index 1e39b8972f..3fe997525c 100644
--- a/data/styles/clear/style-clear/symbols/golf-m.svg
+++ b/data/styles/clear/style-clear/symbols/golf-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="golf-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M9,5.3823 L9,14.6581 C7.47058,14.7051 7,15.7353 7,16.5 C7,16.8823 7.5,17 7.5,17 L15.5,17 C15.5,17 16,16.8823 16,16.5 C16,14.5882 15.14706,13 14,13 C12.79763,13 12.48469,15.3025 11.29411,15.4706 C10.77204,15.5446 10.26758,15.2065 9.7647,14.9449 L9.7647,9.5882 L15.11765,7.2941 L10.1483,5.1644 C9.86043,5.041 9.57362,5 9.38235,5 C9.12122,5 9,5 9,5.3823 Z" id="rect8138-7-4-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/golf-s.svg b/data/styles/clear/style-clear/symbols/golf-s.svg
index a76b6d8a1a..06dc6f0c6f 100644
--- a/data/styles/clear/style-clear/symbols/golf-s.svg
+++ b/data/styles/clear/style-clear/symbols/golf-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="golf-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7,4 C6.80487,4 6.5,4.2143 6.5,4.5 L6.5,11.25 C5.35714,11.285 5,12.1429 5,12.7143 C5,13 5.28571,13 5.28571,13 L11.71429,13 C11.71429,13 12,13 12,12.7143 C12,11.2857 11.35714,10.1429 10.5,10.1429 C9.60152,10.1429 9.31823,11.7316 8.42857,11.8571 C8.03845,11.9121 7.37578,11.6598 7,11.4643 L7,7.5 L11,6 L7,4 Z" id="rect8138-7-8-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/greengrocer-l.svg b/data/styles/clear/style-clear/symbols/greengrocer-l.svg
index bf2bf4fd3c..c1114fceff 100644
--- a/data/styles/clear/style-clear/symbols/greengrocer-l.svg
+++ b/data/styles/clear/style-clear/symbols/greengrocer-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="greengrocer-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17.5,4 C16.454,4 15.535,4.597 15,5.499 C15.535,6.402 16.454,7 17.499,7 C18.544,7 19.463,6.402 20,5.499 C19.463,4.596 18.545,4 17.5,4 L17.5,4 Z M16.012,13.269 L14.959,8.089 C14.948,8.027 14.937,7.967 14.922,7.907 L14.901,7.803 L14.89,7.803 C14.632,6.921 13.908,6.243 13,6.057 L13,4 L12,4 L12,6.057 C11.093,6.244 10.368,6.921 10.11,7.803 L10.1,7.803 L10.079,7.907 C10.064,7.967 10.053,8.027 10.042,8.089 L8.989,13.269 C7.774,14.278 7.001,15.799 7.001,17.5 C7.001,20.537 9.464,23 12.501,23 C15.538,23 18.001,20.537 18.001,17.5 C18,15.799 17.227,14.277 16.012,13.269 L16.012,13.269 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/greengrocer-m.svg b/data/styles/clear/style-clear/symbols/greengrocer-m.svg
index 45652a5dab..b784be4841 100644
--- a/data/styles/clear/style-clear/symbols/greengrocer-m.svg
+++ b/data/styles/clear/style-clear/symbols/greengrocer-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="greengrocer-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18,5 C17.57,5.603 16.835,6 15.999,6 C15.163,6 14.429,5.603 14,5 C14.429,4.397 15.163,4 16,4 C16.836,4 17.57,4.397 18,5 L18,5 Z M14.374,11.012 L13.513,6.774 C13.503,6.723 13.494,6.673 13.482,6.625 L13.465,6.539 L13.455,6.539 C13.245,5.818 12.651,5.264 11.908,5.11 L11.908,4 L11.092,4 L11.092,5.109 C10.349,5.262 9.755,5.817 9.545,6.538 L9.535,6.538 L9.518,6.624 C9.505,6.673 9.497,6.723 9.487,6.773 L8.626,11.011 C7.632,11.835 7,13.081 7,14.473 C7,16.958 9.015,18.974 11.5,18.974 C13.985,18.974 16,16.958 16,14.473 C16,13.082 15.368,11.836 14.374,11.012 L14.374,11.012 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/grocery-l.svg b/data/styles/clear/style-clear/symbols/grocery-l.svg
index 25af0d2c78..0a8d73ea4a 100644
--- a/data/styles/clear/style-clear/symbols/grocery-l.svg
+++ b/data/styles/clear/style-clear/symbols/grocery-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="grocery-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M21,5.999983 C20.416667,5.999983 19.899101,6.163382 19.53125,6.531233 C19.163399,6.899084 19,7.41665 19,7.999983 L5,7.999983 L7,16.999983 L19,16.999983 L19,17.999983 L8,17.999983 C7,17.999983 7,18.999983 8,18.999983 L9.5,18.999983 L17.5,18.999983 L19,18.999983 C19.5,18.999983 20,18.499983 20,17.999983 L20,16.999983 L20,8.999983 L20,7.999983 C20,7.999983 20.0866,7.350882 20.21875,7.218733 C20.350899,7.086584 20.583333,6.999983 21,6.999983 L21.4,6.999983 C21.9,6.999983 22,6.75131 22,6.499983 C22,6.252562 21.9,5.999983 21.4,5.999983 L21,5.999983 L21,5.999983 Z M17.5,18.999983 C16.671573,18.999983 16,19.671556 16,20.499983 C16,21.32841 16.671573,21.999983 17.5,21.999983 C18.328427,21.999983 19,21.32841 19,20.499983 C19,19.671556 18.328427,18.999983 17.5,18.999983 L17.5,18.999983 Z M9.5,18.999983 C8.6715729,18.999983 8,19.671556 8,20.499983 C8,21.32841 8.6715729,21.999983 9.5,21.999983 C10.328427,21.999983 11,21.32841 11,20.499983 C11,19.671556 10.328427,18.999983 9.5,18.999983 L9.5,18.999983 Z" id="rect7842-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/grocery-m.svg b/data/styles/clear/style-clear/symbols/grocery-m.svg
index 075b287d0e..ab4d2f6674 100644
--- a/data/styles/clear/style-clear/symbols/grocery-m.svg
+++ b/data/styles/clear/style-clear/symbols/grocery-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="grocery-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
         </g>
         <g id="g21554-copy" sketch:type="MSLayerGroup" transform="translate(5.000000, 7.000000)" fill="#FFFFFF">
             <path d="M11.5,0 C10.5,0 10,0.5 10,1.5 L0,1.5 L1.05882,7.5 L10.23529,7.5 L10.23529,8.5 L1.82353,8.5 C1.05882,8.5 1.05918,9.2411 1.82353,9.2647 L2.97059,9.2647 L9.08823,9.2647 L10.23529,9.2647 C10.61765,9.2647 11,8.8823 11,8.5 L11,7.5 L11,2.5588 L11,1.5 C11,1 11.23836,0.7647 11.7647,0.7647 L13,0.7647 L13,0 L11.5,0 Z M9,9.2059 C8.3665,9.2059 7.85294,9.7195 7.85294,10.3529 C7.85294,10.9864 8.3665,11.5 9,11.5 C9.63351,11.5 10.14706,10.9864 10.14706,10.3529 C10.14706,9.7195 9.63351,9.2059 9,9.2059 L9,9.2059 Z M3,9.2059 C2.36649,9.2059 1.85294,9.7195 1.85294,10.3529 C1.85294,10.9864 2.36649,11.5 3,11.5 C3.6335,11.5 4.14706,10.9864 4.14706,10.3529 C4.14706,9.7195 3.6335,9.2059 3,9.2059 L3,9.2059 Z" id="rect7842-0" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-clear/symbols/grocery-s.svg b/data/styles/clear/style-clear/symbols/grocery-s.svg
index 0ce5c56d06..0d37f91bd5 100644
--- a/data/styles/clear/style-clear/symbols/grocery-s.svg
+++ b/data/styles/clear/style-clear/symbols/grocery-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="grocery-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M12.5,5.3622 C12.20834,5.3622 11.94955,5.4442 11.76562,5.6279 C11.5817,5.8118 11.5,6.0706 11.5,6.3622 L4,6.3622 L5,10.3622 L11.5,10.3622 L11.5,11.3622 L5.36742,11.3622 C4.86742,11.3622 4.86742,11.8622 5.36742,11.8622 L6.25,11.8622 L10.75,11.8622 L11.5,11.8622 C11.75,11.8622 12,11.6122 12,11.3622 L12,10.8622 L12,6.8622 L12,6.3622 C12,6.3622 12.0433,6.0377 12.10937,5.9716 C12.17547,5.9056 12.29166,5.8622 12.5,5.8622 L13,5.8622 L13,5.3622 L12.5,5.3622 L12.5,5.3622 Z M10.75,11.8622 C10.33578,11.8622 10,12.198 10,12.6122 C10,13.0264 10.33578,13.3622 10.75,13.3622 C11.16422,13.3622 11.5,13.0264 11.5,12.6122 C11.5,12.198 11.16422,11.8622 10.75,11.8622 L10.75,11.8622 Z M6.25,11.8622 C5.83578,11.8622 5.5,12.198 5.5,12.6122 C5.5,13.0264 5.83578,13.3622 6.25,13.3622 C6.66422,13.3622 7,13.0264 7,12.6122 C7,12.198 6.66422,11.8622 6.25,11.8622 L6.25,11.8622 Z" id="rect7842-7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/hairdresser-l.svg b/data/styles/clear/style-clear/symbols/hairdresser-l.svg
index a556f92a4d..dc3bda1582 100644
--- a/data/styles/clear/style-clear/symbols/hairdresser-l.svg
+++ b/data/styles/clear/style-clear/symbols/hairdresser-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hairdresser-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M20.513,17.428 L20.005,16.549 C19.188,15.133 17.393,14.641 15.965,15.425 L14.524,18.949 L14.669,19.303 L14.688,19.276 C14.729,19.367 14.76,19.461 14.811,19.549 L15.319,20.428 C16.147,21.863 17.981,22.355 19.417,21.527 C20.85,20.698 21.341,18.863 20.513,17.428 L20.513,17.428 Z M18.782,20.291 C18.57,20.414 18.329,20.479 18.085,20.479 C17.585,20.479 17.119,20.21 16.871,19.779 L16.27,18.74 C15.883,18.07 16.113,17.213 16.781,16.828 C16.993,16.705 17.235,16.64 17.479,16.64 C17.978,16.64 18.443,16.909 18.693,17.34 L19.294,18.38 C19.68,19.048 19.45,19.906 18.782,20.291 L18.782,20.291 Z M17.051,5.071 L13.484,11.251 L9.916,5.071 L9.05,5.571 L12.249,13.39 L11.06,15.451 C9.624,14.622 7.79,15.114 6.962,16.549 L6.454,17.428 C5.626,18.864 6.117,20.699 7.552,21.527 C8.988,22.355 10.822,21.863 11.65,20.428 L12.158,19.549 C12.208,19.463 12.238,19.371 12.278,19.282 L12.299,19.303 L17.918,5.572 L17.051,5.071 L17.051,5.071 Z M10.68,18.738 L10.086,19.765 C9.84,20.193 9.38,20.458 8.885,20.458 C8.643,20.458 8.405,20.394 8.195,20.272 C7.534,19.889 7.306,19.04 7.688,18.378 L8.282,17.351 C8.528,16.923 8.989,16.657 9.483,16.657 C9.725,16.657 9.964,16.721 10.175,16.844 C10.835,17.227 11.062,18.076 10.68,18.738 L10.68,18.738 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/hairdresser-m.svg b/data/styles/clear/style-clear/symbols/hairdresser-m.svg
index f7ed8b18b8..ae87a9246d 100644
--- a/data/styles/clear/style-clear/symbols/hairdresser-m.svg
+++ b/data/styles/clear/style-clear/symbols/hairdresser-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hairdresser-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17.459,15.053 L17.027,14.306 C16.333,13.102 14.806,12.682 13.593,13.348 L12.365,16.345 L12.49,16.647 L12.504,16.622 C12.54,16.701 12.567,16.779 12.61,16.855 L13.042,17.602 C13.745,18.822 15.304,19.241 16.525,18.536 C17.746,17.831 18.162,16.272 17.459,15.053 L17.459,15.053 Z M15.987,17.485 C15.807,17.589 15.601,17.643 15.395,17.643 C14.968,17.643 14.574,17.415 14.362,17.05 L13.852,16.166 C13.524,15.596 13.718,14.866 14.286,14.54 C14.466,14.435 14.673,14.38 14.88,14.38 C15.305,14.38 15.699,14.609 15.912,14.974 L16.423,15.86 C16.751,16.429 16.555,17.158 15.987,17.485 L15.987,17.485 Z M14.516,4.548 L11.484,9.802 L8.452,4.548 L7.714,4.972 L10.435,11.619 L9.422,13.371 C8.202,12.666 6.644,13.084 5.941,14.306 L5.509,15.053 C4.806,16.273 5.222,17.831 6.441,18.535 C7.663,19.24 9.222,18.821 9.925,17.601 L10.357,16.854 C10.398,16.78 10.425,16.704 10.459,16.626 L10.478,16.646 L15.255,4.971 L14.516,4.548 L14.516,4.548 Z M9.1,16.165 L8.596,17.039 C8.386,17.403 7.996,17.628 7.574,17.628 C7.37,17.628 7.167,17.572 6.988,17.471 C6.426,17.147 6.233,16.424 6.557,15.862 L7.063,14.989 C7.271,14.626 7.663,14.397 8.084,14.397 C8.288,14.397 8.492,14.454 8.67,14.556 C9.231,14.88 9.424,15.602 9.1,16.165 L9.1,16.165 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/hardware-l.svg b/data/styles/clear/style-clear/symbols/hardware-l.svg
index be8dbdca80..26c215eece 100644
--- a/data/styles/clear/style-clear/symbols/hardware-l.svg
+++ b/data/styles/clear/style-clear/symbols/hardware-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hardware-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17,5 L14,5 L14,11 L19,11 L19,7 C19,5.896 18.104,5 17,5 L17,5 Z M8,17.5 C8,20.537 10.463,23 13.5,23 C16.537,23 19,20.537 19,17.5 L19,12 L8,12 L8,17.5 L8,17.5 Z M13,5 L10,5 C8.896,5 8,5.896 8,7 L8,11 L13,11 L13,5 L13,5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/hardware-m.svg b/data/styles/clear/style-clear/symbols/hardware-m.svg
index 9e18edf339..0b54c5a2ca 100644
--- a/data/styles/clear/style-clear/symbols/hardware-m.svg
+++ b/data/styles/clear/style-clear/symbols/hardware-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hardware-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M14.364,5 L12,5 L12,9 L16,9 L16,6.637 C16,5.733 15.267,5 14.364,5 L14.364,5 Z M7,14.5 C7,16.984 9.016,19 11.5,19 C13.984,19 16,16.984 16,14.5 L16,10 L7,10 L7,14.5 L7,14.5 Z M11,5 L8.637,5 C7.734,5 7,5.733 7,6.637 L7,9 L11,9 L11,5 L11,5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/heliport-l.svg b/data/styles/clear/style-clear/symbols/heliport-l.svg
index 33239a63bb..e51ec898fc 100644
--- a/data/styles/clear/style-clear/symbols/heliport-l.svg
+++ b/data/styles/clear/style-clear/symbols/heliport-l.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>heliport-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.519" r="13.5"></circle>
-        <ellipse id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.519" rx="12.5" ry="12.5"></ellipse>
-        <path d="M20.0526316,19.019 C20.5263158,19.019 21,18.519 21,18.019 L21,15.019 C21,14.019 20.5445432,13.5382 20.0526316,13.019 C20.0526316,13.019 19.4210495,12.3523 19.1052632,12.019 C18.7894768,11.6857 18.1578947,11.019 17.2105263,11.019 L14.009058,11.019 L14.009058,9.019 L18.1578947,9.019 L19.0526316,9.019 C19.5774642,9.019 20,8.573 20,8.019 C20,7.465 19.5774642,7.019 19.0526316,7.019 L18.1578947,7.019 L14.8421053,7.019 L13.8947368,7.019 L9.63157895,7.019 L7.9853363,7.019 C7.46049894,7.019 7.03796788,7.465 7.03796788,8.019 C7.03796788,8.573 7.46049894,9.019 7.9853363,9.019 L9.63157895,9.019 L12.9962654,9.019 L12.9962654,11.019 L10.5789474,11.019 L6.52302632,11.019 C6.19519611,10.4221 5.59541432,10.019 4.89473684,10.019 C4.28049615,10.019 3.73452162,10.3275111 3.38830818,10.8057518 C3.14470488,11.1422524 3,11.5627834 3,12.019 C3,13.1236 3.84830305,14.019 4.89473684,14.019 C5.44140821,14.019 5.91075253,13.7537 6.25657895,13.3628 L9.63157895,17.019 C10.5789474,18.0453 11.2894737,19.019 11.7631579,19.019 L20.0526316,19.019 Z M5.84210526,12.019 C5.84210526,12.5713 5.41795421,13.019 4.89473684,13.019 C4.37151947,13.019 3.94736842,12.5713 3.94736842,12.019 C3.94736842,11.4667 4.37151947,11.019 4.89473684,11.019 C5.41795421,11.019 5.84210526,11.4667 5.84210526,12.019 Z" id="rect9361" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+        <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+        <path d="M20.0526316,19 C20.5263158,19 21,18.5 21,18 L21,15 C21,14 20.5445432,13.5192 20.0526316,13 C20.0526316,13 19.4210495,12.3333 19.1052632,12 C18.7894768,11.6667 18.1578947,11 17.2105263,11 L14.009058,11 L14.009058,9 L18.1578947,9 L19.0526316,9 C19.5774642,9 20,8.554 20,8 C20,7.446 19.5774642,7 19.0526316,7 L18.1578947,7 L14.8421053,7 L13.8947368,7 L9.63157895,7 L7.9853363,7 C7.46049894,7 7.03796788,7.446 7.03796788,8 C7.03796788,8.554 7.46049894,9 7.9853363,9 L9.63157895,9 L12.9962654,9 L12.9962654,11 L10.5789474,11 L6.52302632,11 C6.19519611,10.4031 5.59541432,10 4.89473684,10 C4.28049615,10 3.73452162,10.3085111 3.38830818,10.7867518 C3.14470488,11.1232524 3,11.5437834 3,12 C3,13.1046 3.84830305,14 4.89473684,14 C5.44140821,14 5.91075253,13.7347 6.25657895,13.3438 L9.63157895,17 C10.5789474,18.0263 11.2894737,19 11.7631579,19 L20.0526316,19 Z M5.84210526,12 C5.84210526,12.5523 5.41795421,13 4.89473684,13 C4.37151947,13 3.94736842,12.5523 3.94736842,12 C3.94736842,11.4477 4.37151947,11 4.89473684,11 C5.41795421,11 5.84210526,11.4477 5.84210526,12 Z" id="rect9361" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/heliport-m.svg b/data/styles/clear/style-clear/symbols/heliport-m.svg
index 9304831e08..89173cb40e 100644
--- a/data/styles/clear/style-clear/symbols/heliport-m.svg
+++ b/data/styles/clear/style-clear/symbols/heliport-m.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>heliport-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.519" rx="11.5" ry="11.5"></ellipse>
-        <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.519" rx="10.5" ry="10.5"></ellipse>
-        <path d="M17.1618468,16.019 C17.5809234,16.019 18,15.5868889 18,15.1547778 L18,12.5622222 C18,11.698 17.5970554,11.2825556 17.1618468,10.8337778 C17.1618468,10.8337778 16.603078,10.2576667 16.3236936,9.96966667 C16.04432,9.68155556 15.4946433,9.02091157 14.6564901,9.02091157 L12.0087546,9.02091164 L11.9996624,7.0273074 L15.011649,7.02730734 C15.4759749,7.02730734 15.9978548,6.99155556 15.9978548,6.51277778 C15.9978548,6.03411112 15.6084122,6.019 15.011649,6.019 L8.10908776,6.019 C7.77718829,6.019 7.11687224,6.03455556 7.11687224,6.51277778 C7.11687224,6.99155556 7.64744507,6.97575178 8.10908776,7.02730734 L10.9228786,7.02730726 L10.9319707,9.02091149 L7.11687214,9.02091157 C6.82684082,8.50502269 6.29619797,8.15668935 5.67630641,8.15668935 C4.75051017,8.15668935 4,8.93046713 4,9.8851338 C4,10.8396894 4.75051017,11.6134671 5.67630641,11.6134671 C6.15994338,11.6134671 6.57518365,11.3842449 6.88114222,11.046356 L9.85795875,14.2905556 C10.7304235,15.1416667 11.3247322,16.019 11.7437981,16.019 L17.1618468,16.019 Z" id="rect9361-7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-        <circle id="Oval-410" fill="#717065" sketch:type="MSShapeGroup" cx="5.75" cy="9.769" r="0.75"></circle>
+        <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+        <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+        <path d="M17.1618468,16 C17.5809234,16 18,15.5678889 18,15.1357778 L18,12.5432222 C18,11.679 17.5970554,11.2635556 17.1618468,10.8147778 C17.1618468,10.8147778 16.603078,10.2386667 16.3236936,9.95066667 C16.04432,9.66255556 15.4946433,9.00191157 14.6564901,9.00191157 L12.0087546,9.00191164 L11.9996624,7.0083074 L15.011649,7.00830734 C15.4759749,7.00830734 15.9978548,6.97255556 15.9978548,6.49377778 C15.9978548,6.01511112 15.6084122,6 15.011649,6 L8.10908776,6 C7.77718829,6 7.11687224,6.01555556 7.11687224,6.49377778 C7.11687224,6.97255556 7.64744507,6.95675178 8.10908776,7.00830734 L10.9228786,7.00830726 L10.9319707,9.00191149 L7.11687214,9.00191157 C6.82684082,8.48602269 6.29619797,8.13768935 5.67630641,8.13768935 C4.75051017,8.13768935 4,8.91146713 4,9.8661338 C4,10.8206894 4.75051017,11.5944671 5.67630641,11.5944671 C6.15994338,11.5944671 6.57518365,11.3652449 6.88114222,11.027356 L9.85795875,14.2715556 C10.7304235,15.1226667 11.3247322,16 11.7437981,16 L17.1618468,16 Z" id="rect9361-7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <circle id="Oval-410" fill="#7F7D54" sketch:type="MSShapeGroup" cx="5.65002441" cy="9.85009766" r="0.75"></circle>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/heliport-s.svg b/data/styles/clear/style-clear/symbols/heliport-s.svg
index bc60524043..09993548fb 100644
--- a/data/styles/clear/style-clear/symbols/heliport-s.svg
+++ b/data/styles/clear/style-clear/symbols/heliport-s.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>heliport-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.519" r="8.5"></circle>
-        <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.519" r="7.5"></circle>
-        <path d="M12.4983883,12.019 C12.7483883,12.019 12.9983883,11.769207 12.9983883,11.5194141 L12.9983883,10.0206562 C12.9983883,9.52107031 12.7580083,9.28086939 12.4983883,9.02148437 C12.4983883,9.02148437 12.1650483,8.68846039 11.9983883,8.52189844 C11.8317283,8.3554364 11.4983883,8.0223125 10.9983883,8.0223125 L9,8.01651563 L9,6.01817188 L10.5,6.01817188 L11.5,6.01817188 C11.77699,6.01817188 12,5.76764852 12,5.51858594 C12,5.22354054 11.77699,5.019 11.5,5.019 L10.5,5.019 L9,5.019 L8.5,5.019 L6.5,5.019 L6,5.019 L5.5,5.019 C5.223,5.019 5,5.24181533 5,5.51858594 C5,5.79535655 5.223,6.01817188 5.5,6.01817188 L6,6.01817188 L6.5,6.01817188 L8,6.01817188 L8,8.01651563 L7,8.01651563 L4.85938,8.01651563 C4.68635,7.71836274 4.3698,7.51692969 4,7.51692969 C3.44772,7.51692969 3,7.96425894 3,8.51610156 C3,9.06794419 3.44772,9.51527344 4,9.51527344 C4.28852,9.51527344 4.53623,9.38278325 4.71875,9.18744515 L6.5,11.0140313 C7,11.5268063 7.375,12.0132031 7.625,12.0132031 L12.4983883,12.019 Z M4.5,8.51610156 C4.5,8.79207284 4.27614,9.0156875 4,9.0156875 C3.72386,9.0156875 3.5,8.79207284 3.5,8.51610156 C3.5,8.24013029 3.72386,8.01651563 4,8.01651563 C4.27614,8.01651563 4.5,8.24013029 4.5,8.51610156 Z" id="rect9361-1" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+        <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+        <path d="M12.4983883,12 C12.7483883,12 12.9983883,11.750207 12.9983883,11.5004141 L12.9983883,10.0016562 C12.9983883,9.50207031 12.7580083,9.26186939 12.4983883,9.00248437 C12.4983883,9.00248437 12.1650483,8.66946039 11.9983883,8.50289844 C11.8317283,8.3364364 11.4983883,8.0033125 10.9983883,8.0033125 L9,7.99751563 L9,5.99917188 L10.5,5.99917188 L11.5,5.99917188 C11.77699,5.99917188 12,5.74864852 12,5.49958594 C12,5.20454054 11.77699,5 11.5,5 L10.5,5 L9,5 L8.5,5 L6.5,5 L6,5 L5.5,5 C5.223,5 5,5.22281533 5,5.49958594 C5,5.77635655 5.223,5.99917188 5.5,5.99917188 L6,5.99917188 L6.5,5.99917188 L8,5.99917188 L8,7.99751563 L7,7.99751563 L4.85938,7.99751563 C4.68635,7.69936274 4.3698,7.49792969 4,7.49792969 C3.44772,7.49792969 3,7.94525894 3,8.49710156 C3,9.04894419 3.44772,9.49627344 4,9.49627344 C4.28852,9.49627344 4.53623,9.36378325 4.71875,9.16844515 L6.5,10.9950313 C7,11.5078063 7.375,11.9942031 7.625,11.9942031 L12.4983883,12 Z M4.5,8.49710156 C4.5,8.77307284 4.27614,8.9966875 4,8.9966875 C3.72386,8.9966875 3.5,8.77307284 3.5,8.49710156 C3.5,8.22113029 3.72386,7.99751563 4,7.99751563 C4.27614,7.99751563 4.5,8.22113029 4.5,8.49710156 Z" id="rect9361-1" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/historic-ship-l.svg b/data/styles/clear/style-clear/symbols/historic-ship-l.svg
index 620a58c7cc..e98c223fd2 100644
--- a/data/styles/clear/style-clear/symbols/historic-ship-l.svg
+++ b/data/styles/clear/style-clear/symbols/historic-ship-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="historic-ship-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M21.507,12.0784539 L19.891,12.2704539 C19.62,10.7494539 18.823,9.41445388 17.691,8.45745388 L18.665,7.15445388 C19.152,6.48445388 18.966,5.60645388 18.249,5.19245388 C17.532,4.77845388 16.678,5.05645388 16.341,5.81245388 L15.699,7.30945388 C15.011,7.06245388 14.272,6.91945388 13.499,6.91945388 C12.726,6.91945388 11.986,7.06245388 11.298,7.31045388 L10.655,5.81245388 C10.319,5.05545388 9.466,4.77845388 8.749,5.19145388 C8.032,5.60545388 7.846,6.48445388 8.331,7.15445388 L9.306,8.45845388 C8.176,9.41345388 7.381,10.7474539 7.108,12.2644539 L5.492,12.0764539 C4.668,11.9904539 4,12.5934539 4,13.4214539 C4,14.2494539 4.668,14.8524539 5.492,14.7664539 L7.108,14.5784539 C7.38,16.0934539 8.174,17.4254539 9.301,18.3804539 L8.331,19.6844539 C7.845,20.3564539 8.032,21.2354539 8.749,21.6494539 C9.466,22.0634539 10.322,21.7864539 10.659,21.0304539 L11.305,19.5354539 C11.992,19.7814539 12.728,19.9234539 13.499,19.9234539 C14.27,19.9234539 15.007,19.7814539 15.693,19.5354539 L16.338,21.0284539 C16.677,21.7864539 17.531,22.0634539 18.249,21.6494539 C18.966,21.2354539 19.153,20.3544539 18.667,19.6854539 L17.696,18.3804539 C18.825,17.4244539 19.62,16.0894539 19.891,14.5714539 L21.507,14.7634539 C22.33,14.8504539 22.998,14.2494539 22.998,13.4214539 C22.998,12.5934539 22.33,11.9914539 21.507,12.0784539 L21.507,12.0784539 Z M18.075,12.4864539 L14.346,12.9304539 L16.583,9.93845388 C17.326,10.5984539 17.87,11.4774539 18.075,12.4864539 L18.075,12.4864539 Z M13.498,8.74845388 C14.016,8.74845388 14.504,8.85245388 14.97,9.00845388 L13.497,12.4424539 L12.025,9.00945388 C12.491,8.85345388 12.98,8.74845388 13.498,8.74845388 L13.498,8.74845388 Z M10.412,9.94045388 L12.632,12.9084539 L8.923,12.4754539 C9.13,11.4714539 9.672,10.5964539 10.412,9.94045388 L10.412,9.94045388 Z M8.923,14.3654539 L12.605,13.9354539 L10.405,16.8934539 C9.668,16.2374539 9.129,15.3654539 8.923,14.3654539 L8.923,14.3654539 Z M13.498,18.0924539 C12.984,18.0924539 12.499,17.9884539 12.037,17.8354539 L13.498,14.4524539 L14.959,17.8354539 C14.496,17.9884539 14.012,18.0924539 13.498,18.0924539 L13.498,18.0924539 Z M16.592,16.8954539 L14.374,13.9144539 L18.075,14.3544539 C17.871,15.3594539 17.33,16.2354539 16.592,16.8954539 L16.592,16.8954539 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/historic-ship-m.svg b/data/styles/clear/style-clear/symbols/historic-ship-m.svg
index 57a64b4dbf..7e2f06d907 100644
--- a/data/styles/clear/style-clear/symbols/historic-ship-m.svg
+++ b/data/styles/clear/style-clear/symbols/historic-ship-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="historic-ship-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18,10.5203959 L17.416,10.5645183 C17.178,9.10946115 16.397,7.82893245 15.279,6.93766094 L15.615,6.4709445 C15.892,6.00128658 15.728,5.40318358 15.25,5.13158599 C14.771,4.8619494 14.16,5.02177036 13.883,5.49044779 L13.63,6.00716956 C12.967,5.75910389 12.251,5.61791236 11.5,5.61791236 C10.745,5.61791236 10.025,5.76106488 9.359,6.01109154 L9.114,5.49142829 C8.839,5.02078987 8.228,4.8609689 7.748,5.13158599 C7.271,5.40318358 7.106,6.00226707 7.383,6.471925 L7.712,6.94256342 C6.598,7.83481543 5.822,9.11142215 5.584,10.5635378 L5,10.5203959 C4.447,10.5203959 4,10.958678 4,11.5008926 C4,12.0431073 4.447,12.4813893 5,12.4813893 L5.582,12.4284425 C5.819,13.8834996 6.596,15.1640283 7.712,16.0582414 L7.383,16.5288798 C7.108,16.9985377 7.272,17.5976212 7.75,17.8672578 C8.229,18.1388554 8.84,17.9780539 9.115,17.5093765 L9.359,16.9897132 C10.025,17.2397399 10.745,17.3828924 11.5,17.3828924 C12.251,17.3828924 12.967,17.2407204 13.63,16.9936352 L13.883,17.5093765 C14.159,17.9790344 14.772,18.1398359 15.248,17.8672578 C15.728,17.5976212 15.892,16.9975572 15.615,16.5288798 L15.279,16.0631438 C16.4,15.1689308 17.18,13.8864411 17.418,12.427462 L18,12.4813893 C18.553,12.4813893 19,12.0431073 19,11.5008926 C19,10.958678 18.553,10.5203959 18,10.5203959 L18,10.5203959 Z M16.411,10.6400165 L13.892,10.8282719 C13.772,10.4154828 13.553,10.044855 13.249,9.7516865 L14.689,7.7544147 C15.573,8.47802127 16.201,9.48106941 16.411,10.6400165 L16.411,10.6400165 Z M11.5,6.59840908 C12.097,6.59840908 12.66,6.71802967 13.19,6.90530455 L12.103,9.13005159 C11.909,9.08200725 11.708,9.04965085 11.499,9.04965085 C11.267,9.04965085 11.047,9.09083172 10.833,9.14868102 L9.782,6.91412902 C10.32,6.71999067 10.894,6.59840908 11.5,6.59840908 L11.5,6.59840908 Z M8.289,7.77108314 L9.705,9.79875034 C9.425,10.0840749 9.222,10.4370537 9.107,10.8282719 L6.588,10.6400165 C6.797,9.49087438 7.417,8.49468972 8.289,7.77108314 L8.289,7.77108314 Z M6.586,12.3382368 L9.088,12.1127226 C9.197,12.5284532 9.41,12.9030029 9.705,13.2020544 L8.289,15.2297216 C7.411,14.5031736 6.79,13.4962034 6.586,12.3382368 L6.586,12.3382368 Z M11.5,16.4033762 C10.895,16.4033762 10.321,16.2817946 9.784,16.0886367 L10.835,13.8540847 C11.048,13.911934 11.268,13.9531149 11.5,13.9531149 C11.709,13.9531149 11.909,13.9207585 12.104,13.8727142 L13.192,16.0974612 C12.66,16.2837556 12.097,16.4033762 11.5,16.4033762 L11.5,16.4033762 Z M14.69,15.2463901 L13.25,13.2481378 C13.568,12.9422228 13.797,12.5500241 13.912,12.1127226 L16.414,12.3382368 C16.208,13.5060084 15.579,14.517881 14.69,15.2463901 L14.69,15.2463901 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/hotel-l.svg b/data/styles/clear/style-clear/symbols/hotel-l.svg
index e1e90d8e31..aa6efb586c 100644
--- a/data/styles/clear/style-clear/symbols/hotel-l.svg
+++ b/data/styles/clear/style-clear/symbols/hotel-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hotel-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M7,8 C5.89543,8 5,8.8954 5,10 C5,11.1046 5.89543,12 7,12 C8.10457,12 9,11.1046 9,10 C9,8.8954 8.10457,8 7,8 L7,8 Z M10,10 C10,11.6569 8.65686,13 7,13 L5.5,13 C5.24741,13 4.9987,13 5,13.5 C5.00035,13.636 5,14.1157 5,14.5 C5,15 5.38857,15 5.5,15 L22,15 L22,13 C22,12 22,10 17,10 L10,10 Z M6,16 C5.5,16 5,16.5 5,17 C4.99976,17.9907 5,19.1445 5,20 C5,20.5 5.5,21 6,21 C6.5,21 7,20.5 7,20 L7,18 L20,18 L20,20 C20,20.5 20.5,21 21,21 C21.5,21 22,20.5 22,20 L22,17 C22,16.5 21.5,16 21,16 L6,16 Z" id="path4536" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/hotel-m.svg b/data/styles/clear/style-clear/symbols/hotel-m.svg
index c3b94ec0b6..177cbce4fe 100644
--- a/data/styles/clear/style-clear/symbols/hotel-m.svg
+++ b/data/styles/clear/style-clear/symbols/hotel-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hotel-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6.49999,7.75 C5.67157,7.75 5,8.4215 5,9.25 C5,10.0784 5.67157,10.7499 6.49999,10.7499 C7.32842,10.7499 7.99998,10.0784 7.99998,9.25 C7.99998,8.4215 7.32842,7.75 6.49999,7.75 L6.49999,7.75 Z M9,8.9999 C9,10.9999 8,11.9999 6.5,11.9999 L5.5,11.9999 C5,11.9999 5,12.4999 5,12.4999 C5,12.4999 5,12.9999 5.5,12.9999 L18,12.9999 L18,11.2498 C18,10.4998 18,8.9999 14.25003,8.9999 L9,8.9999 Z M5.74999,13.9999 C5.37499,13.9999 4.99999,14.3749 4.99999,14.7499 C4.99981,15.4929 4.99999,15.6083 4.99999,16.2499 C4.99999,16.6249 5.37499,16.9999 5.74999,16.9999 C6.12499,16.9999 6.49998,16.6249 6.49998,16.2499 L6.5,14.9999 L16.50002,14.9999 L16.5,16.2499 C16.49999,16.6249 16.875,16.9999 17.25,16.9999 C17.625,16.9999 17.99999,16.6249 17.99999,16.2499 L17.99999,14.7499 C17.99999,14.3749 17.625,13.9999 17.25,13.9999 L5.74999,13.9999 Z" id="path4536-7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/hotel-s.svg b/data/styles/clear/style-clear/symbols/hotel-s.svg
index f219903614..727db6388b 100644
--- a/data/styles/clear/style-clear/symbols/hotel-s.svg
+++ b/data/styles/clear/style-clear/symbols/hotel-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="hotel-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5,6 C4.44771,6 4,6.4477 4,7 C4,7.5523 4.44771,8 5,8 C5.55228,8 6,7.5523 6,7 C6,6.4477 5.55228,6 5,6 L5,6 Z M7,7 C7,8 6.5,9 5,9 L4.25,9 C4.1237,9 3.99935,9 4,9.25 C4.00017,9.318 4,9.5579 4,9.75 C4,10 4.19428,10 4.25,10 L13,10 L13,8.5 C13,8 13,7 10.5,7 L7,7 Z M4.5,11 C4.25,11 4,11.25 4,11.5 C3.99988,11.9954 4,12.0723 4,12.5 C4,12.75 4.25,13 4.5,13 C4.75,13 5,12.75 5,12.5 L5,12 L12,12 L12,12.5 C12,12.75 12.25,13 12.5,13 C12.75,13 13,12.75 13,12.5 L13,11.5 C13,11.25 12.75,11 12.5,11 L4.5,11 Z" id="path4536-6" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-l.svg b/data/styles/clear/style-clear/symbols/hunting-tower-l.svg
index cbf1b8defb..a2d83ef315 100755
--- a/data/styles/clear/style-clear/symbols/hunting-tower-l.svg
+++ b/data/styles/clear/style-clear/symbols/hunting-tower-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>hunting-tower-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="hunting-tower-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="hunting-tower-l" sketch:type="MSLayerGroup">
             <g id="Layer_2" sketch:type="MSShapeGroup">
                 <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF"></path>
-                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065"></path>
+                <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54"></path>
             </g>
             <g id="Layer_1" transform="translate(7.000000, 6.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M1,10 C1,10.553 1.447,11 2,11 L2,16 L4,16 L4,11 L6,11 L6,14 L8,14 L8,11 L10,11 L10,16 L12,16 L12,11 C12.553,11 13,10.553 13,10 L13,5 L1,5 L1,10 L1,10 Z M13,0 L1,0 C0.447,0 0,0.448 0,1 L0,2 L14,2 L14,1 C14,0.448 13.553,0 13,0 L13,0 Z" id="Shape"></path>
diff --git a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg
index 5c6babb90a..81deec076a 100755
--- a/data/styles/clear/style-clear/symbols/hunting-tower-m.svg
+++ b/data/styles/clear/style-clear/symbols/hunting-tower-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>hunting-tower-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="hunting-tower-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="hunting-tower-m" sketch:type="MSLayerGroup">
             <g id="Layer_2" sketch:type="MSShapeGroup">
                 <path d="M11.5,23 C5.159,23 0,17.842 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.842 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF"></path>
-                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065"></path>
+                <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54"></path>
             </g>
             <g id="Layer_1" transform="translate(6.000000, 5.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M1,8 C1,8.553 1.447,9 2,9 L2,14 L3,14 L3,9 L5,9 L5,12 L6,12 L6,9 L8,9 L8,14 L9,14 L9,9 C9.553,9 10,8.553 10,8 L10,3 L1,3 L1,8 L1,8 Z M10,0 L1,0 C0.447,0 0,0.447 0,1 L11,1 C11,0.447 10.553,0 10,0 L10,0 Z" id="Shape"></path>
diff --git a/data/styles/clear/style-clear/symbols/information-l.svg b/data/styles/clear/style-clear/symbols/information-l.svg
index 351d4b1ef3..552865d8ec 100644
--- a/data/styles/clear/style-clear/symbols/information-l.svg
+++ b/data/styles/clear/style-clear/symbols/information-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="information-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11.0635378,11.7954545 L11.0635378,11.2941176 C11.4659448,11.0935825 11.7483321,11.0100272 12.1013216,10.9231283 C12.454311,10.8362295 12.8284742,10.7593586 13.2238224,10.6925134 C13.6191706,10.6256681 14.010983,10.5688505 14.3992714,10.5220588 C14.7875598,10.4752671 15.1299545,10.4518717 15.4264656,10.4518717 L15.8076923,10.6925134 L13.9015588,19.4358289 L15.3841071,19.4358289 L15.3841071,20.1176471 C15.2005526,20.2379685 14.9852322,20.3516037 14.7381396,20.4585561 C14.491047,20.5655086 14.2298387,20.6590905 13.9545069,20.7393048 C13.6791752,20.8195191 13.4003177,20.8830212 13.1179261,20.9298128 C12.8355346,20.9766045 12.5672666,21 12.3131142,21 C11.7765702,21 11.5118332,20.9030758 11.3070993,20.7092246 C11.1023654,20.5153734 11,20.304814 11,20.0775401 C11,19.8101591 11.021179,19.5494665 11.0635378,19.2954545 C11.1058965,19.0414426 11.162374,18.7606967 11.2329719,18.4532086 L12.5672653,12.1363636 L11.0635378,11.7954545 Z M14.3653846,9.00802139 C15.1619492,9.00802139 15.8076923,8.33465287 15.8076923,7.5040107 C15.8076923,6.67336852 15.1619492,6 14.3653846,6 C13.5688201,6 12.9230769,6.67336852 12.9230769,7.5040107 C12.9230769,8.33465287 13.5688201,9.00802139 14.3653846,9.00802139 Z" id="i" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/information-m.svg b/data/styles/clear/style-clear/symbols/information-m.svg
index 12daa0c5ac..92d3ea840e 100644
--- a/data/styles/clear/style-clear/symbols/information-m.svg
+++ b/data/styles/clear/style-clear/symbols/information-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="information-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M9.06353778,9.79545455 L9.06353778,9.29411765 C9.46594481,9.09358249 9.74833213,9.01002717 10.1013216,8.92312834 C10.454311,8.83622951 10.8284742,8.75935862 11.2238224,8.69251337 C11.6191706,8.62566811 12.010983,8.5688505 12.3992714,8.52205882 C12.7875598,8.47526714 13.1299545,8.45187166 13.4264656,8.45187166 L13.8076923,8.69251337 L11.9015588,17.4358289 L13.3841071,17.4358289 L13.3841071,18.1176471 C13.2005526,18.2379685 12.9852322,18.3516037 12.7381396,18.4585561 C12.491047,18.5655086 12.2298387,18.6590905 11.9545069,18.7393048 C11.6791752,18.8195191 11.4003177,18.8830212 11.1179261,18.9298128 C10.8355346,18.9766045 10.5672666,19 10.3131142,19 C9.77657023,19 9.51183317,18.9030758 9.30709929,18.7092246 C9.10236541,18.5153734 9,18.304814 9,18.0775401 C9,17.8101591 9.02117905,17.5494665 9.06353778,17.2954545 C9.10589652,17.0414426 9.16237398,16.7606967 9.23297187,16.4532086 L10.5672653,10.1363636 L9.06353778,9.79545455 Z M12.3653846,7.00802139 C13.1619492,7.00802139 13.8076923,6.33465287 13.8076923,5.5040107 C13.8076923,4.67336852 13.1619492,4 12.3653846,4 C11.5688201,4 10.9230769,4.67336852 10.9230769,5.5040107 C10.9230769,6.33465287 11.5688201,7.00802139 12.3653846,7.00802139 Z" id="i-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/information-s.svg b/data/styles/clear/style-clear/symbols/information-s.svg
index 6dedab4e1f..bcfd4f26bf 100644
--- a/data/styles/clear/style-clear/symbols/information-s.svg
+++ b/data/styles/clear/style-clear/symbols/information-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="information-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7.03964758,7.89163498 L7.03964758,7.55893536 C7.29074956,7.42585525 7.46695925,7.37040586 7.68722467,7.31273764 C7.90749009,7.25506942 8.14096793,7.20405599 8.3876652,7.15969582 C8.63436247,7.11533565 8.87885341,7.07763007 9.12114537,7.04657795 C9.36343733,7.01552583 9.57709159,7 9.76211454,7 L10,7.15969582 L8.81057269,11.9619772 L9.73568282,11.9619772 L9.73568282,12.4144487 C9.6211448,12.494297 9.48678491,12.5697081 9.33259912,12.6406844 C9.17841333,12.7116607 9.01541936,12.773764 8.84361233,12.8269962 C8.67180531,12.8802284 8.49779824,12.9223699 8.3215859,12.9534221 C8.14537357,12.9844742 7.97797436,13 7.81938326,13 C7.48457982,13 7.3193839,12.9356787 7.19162996,12.8070342 C7.06387601,12.6783897 7,12.5386573 7,12.3878327 C7,12.210392 7.01321573,12.0373899 7.03964758,11.8688213 C7.06607943,11.7002526 7.10132137,11.5139427 7.14537445,11.3098859 L7.97797357,8.11787072 L7.03964758,7.89163498 Z M9,6 C9.55228475,6 10,5.55228475 10,5 C10,4.44771525 9.55228475,4 9,4 C8.44771525,4 8,4.44771525 8,5 C8,5.55228475 8.44771525,6 9,6 Z" id="i-copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/jewelry-l.svg b/data/styles/clear/style-clear/symbols/jewelry-l.svg
index e2cf3ea912..1cf195b902 100644
--- a/data/styles/clear/style-clear/symbols/jewelry-l.svg
+++ b/data/styles/clear/style-clear/symbols/jewelry-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="jewelry-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M14.674,8.102 L17,5 L17,4 L10,4 L10,5 L12.326,8.102 C8.747,8.668 6,11.765 6,15.5 C6,19.636 9.364,23 13.5,23 C17.636,23 21,19.636 21,15.5 C21,11.765 18.253,8.668 14.674,8.102 L14.674,8.102 Z M13.5,21 C10.463,21 8,18.537 8,15.5 C8,12.463 10.463,10 13.5,10 C16.537,10 19,12.463 19,15.5 C19,18.537 16.537,21 13.5,21 L13.5,21 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/jewelry-m.svg b/data/styles/clear/style-clear/symbols/jewelry-m.svg
index 528eb7a85f..d08f967c74 100644
--- a/data/styles/clear/style-clear/symbols/jewelry-m.svg
+++ b/data/styles/clear/style-clear/symbols/jewelry-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="jewelry-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M12.489,8.094 L15,6 L15,5 L8,5 L8,6 L10.395,8.111 C7.887,8.623 6,10.84 6,13.5 C6,16.538 8.463,19 11.5,19 C14.537,19 17,16.538 17,13.5 C17,10.801 15.054,8.561 12.489,8.094 L12.489,8.094 Z M11.5,17.29 C9.41,17.29 7.71,15.59 7.71,13.5 C7.71,11.41 9.41,9.71 11.5,9.71 C13.59,9.71 15.29,11.41 15.29,13.5 C15.29,15.59 13.59,17.29 11.5,17.29 L11.5,17.29 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/kindergarten-l.svg b/data/styles/clear/style-clear/symbols/kindergarten-l.svg
index 766118bdcd..25fe546cd9 100644
--- a/data/styles/clear/style-clear/symbols/kindergarten-l.svg
+++ b/data/styles/clear/style-clear/symbols/kindergarten-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="kindergarten-l" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-46" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <g id="icons2-01" transform="translate(5.000000, 7.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M16.4031178,8.51254099 C16.3324747,8.49406439 16.2610957,8.48371749 16.1875092,8.48371749 C15.8239916,8.48371749 15.5016824,8.73056492 15.405284,9.08309853 C15.1896754,9.87537531 14.8430827,10.6077879 14.3949406,11.2566862 C13.9394398,9.27895053 12.5863384,4.15700956 12.5863384,4.00919673 C12.5863384,3.62488336 12.8968737,3.3107811 13.2802596,3.3107811 C13.4568674,3.3107811 13.6165502,3.37803594 13.7401756,3.48520024 L14.3831667,4.45286156 C14.5053204,4.66497298 14.7356463,4.8068733 14.9998221,4.8068733 C15.3949819,4.8068733 15.7202345,4.48316319 15.7202345,4.08332948 L15.7165552,1.59859578 C15.6952151,1.59859578 15.6488556,1.59416139 15.6488556,1.59416139 C15.4177938,1.56164257 15.2389784,1.36135618 15.2389784,1.12116033 C15.2389784,1.01916948 15.2676772,0.926047392 15.3206595,0.84918472 L16.3567583,0.416093122 L12.9114355,0 C10.7744818,0 9.04372596,1.73901797 9.04372596,3.88452122 C9.04372596,4.12397801 9.06359433,4.82461084 9.10848213,5.05298166 L2.42240732,5.05298166 C2.12364589,5.05298166 1.88007438,5.29465564 1.88007438,5.59545476 C1.88007438,5.8955148 2.12364589,6.13792785 2.42240732,6.13792785 L3.94270564,6.13792785 L2.67333749,11.3505474 C2.19355312,10.677999 1.82046926,9.91602383 1.59382266,9.08457665 C1.49742427,8.73204305 1.17658687,8.48519562 0.812333395,8.48519562 C0.739482701,8.48519562 0.666632007,8.49554252 0.597460641,8.51401912 C0.388474811,8.57166613 0.214074665,8.70765393 0.106638288,8.89685436 C-0.000798089125,9.08605478 -0.0280251162,9.30555684 0.0293724003,9.514712 C1.07135808,13.3341956 4.55420995,16 8.49992128,16 C12.4463685,16 15.9284845,13.3327174 16.9704702,9.514712 C17.0286035,9.30407871 16.9999048,9.08457665 16.8932043,8.89537623 C16.7857679,8.7061758 16.6113678,8.57092706 16.4031178,8.51254099 Z M8.49992128,14.3688854 C6.80007175,14.3688854 5.20913033,13.7584184 3.95815882,12.7259458 C4.37392288,10.585616 6.24522909,8.96928265 8.49992128,8.96928265 C10.7546135,8.96928265 12.6259197,10.586355 13.0409479,12.7266848 C11.7914481,13.7584184 10.2005067,14.3688854 8.49992128,14.3688854 L8.49992128,14.3688854 Z" id="Shape"></path>
             </g>
diff --git a/data/styles/clear/style-clear/symbols/kindergarten-m.svg b/data/styles/clear/style-clear/symbols/kindergarten-m.svg
index b739bdc880..946ce2dc67 100644
--- a/data/styles/clear/style-clear/symbols/kindergarten-m.svg
+++ b/data/styles/clear/style-clear/symbols/kindergarten-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="kindergarten-m" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="12.5"></circle>
-            <circle id="Oval-1-Copy-47" fill="#717065" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-47" fill="#7F7D54" sketch:type="MSShapeGroup" cx="12.5" cy="12.5" r="11.5"></circle>
             <path d="M19.4733392,14.5186499 C19.4110071,14.5024828 19.3480256,14.4934293 19.2830963,14.4934293 C18.9623455,14.4934293 18.6779551,14.7094208 18.5928977,15.0178877 C18.4026548,15.7111299 18.0968377,16.3519909 17.7014182,16.9197769 C17.2995057,15.1892582 16.2820633,10.7950599 16.2820633,10.6657236 C16.2820633,10.3294494 16.556065,10.05461 16.8943467,10.05461 C17.0501771,10.05461 17.1910737,10.1134579 17.300155,10.2072267 L17.7910295,11.0664304 C17.8988121,11.2520279 18.1020409,11.3761906 18.3351371,11.3761906 C18.6838076,11.3761906 18.9707952,11.0929443 18.9707952,10.7430898 L18.9675487,8.46894781 C18.9487192,8.46894781 18.5714799,7.88046797 18.618229,7.81321313 L19.7324338,7.23425798 L16.3924431,7.0701765 C14.5068957,7.0701765 12.9797582,8.59181722 12.9797582,10.4691326 C12.9797582,10.6786573 12.9972891,11.291711 13.036896,11.4915355 L7.13741822,11.4915355 C6.8738052,11.4915355 6.65888915,11.7030002 6.65888915,11.9661994 C6.65888915,12.228752 6.8738052,12.4408634 7.13741822,12.4408634 L8.47885792,12.4408634 L7.3588272,17.0019054 C6.93548805,16.4134256 6.60629641,15.7466974 6.40631411,15.0191811 C6.3212567,14.7107142 6.03816488,14.4947227 5.71676476,14.4947227 C5.65248474,14.4947227 5.58820471,14.5037762 5.52717115,14.5199432 C5.34277189,14.5703844 5.18888941,14.6893737 5.09409261,14.8549241 C4.9992958,15.0204744 4.97527196,15.2125387 5.02591682,15.3955495 C5.94531596,18.7375976 9.01842055,21.0701765 12.4999305,21.0701765 C15.9820898,21.0701765 19.0545451,18.7363043 19.9739443,15.3955495 C20.0252384,15.2112454 19.999916,15.0191811 19.9057685,14.8536307 C19.8109717,14.6880803 19.6570892,14.5697377 19.4733392,14.5186499 Z M12.4999305,19.6429512 C11.0000633,19.6429512 9.59629147,19.1087926 8.49249308,18.205379 C8.85934372,16.3325905 10.5104963,14.9182988 12.4999305,14.9182988 C14.4893648,14.9182988 16.1405174,16.3332371 16.5067187,18.2060257 C15.4042189,19.1087926 14.0004471,19.6429512 12.4999305,19.6429512 L12.4999305,19.6429512 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/kindergarten-s.svg b/data/styles/clear/style-clear/symbols/kindergarten-s.svg
index 3acf278b3b..b7ffa902d9 100644
--- a/data/styles/clear/style-clear/symbols/kindergarten-s.svg
+++ b/data/styles/clear/style-clear/symbols/kindergarten-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="kindergarten-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-38" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-48" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-48" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M13.6137821,9.83659341 C13.5680719,9.82542179 13.5218855,9.81916567 13.4742706,9.81916567 C13.2390534,9.81916567 13.0305004,9.96841861 12.968125,10.1815733 C12.8286135,10.6606126 12.6043476,11.1034559 12.3143733,11.4958034 C12.0196375,10.2999925 11.0735131,7.1635443 11.0735131,7.07417129 C11.0735131,6.84180145 11.1744477,6.65188379 11.4225209,6.65188379 C11.5367965,6.65188379 11.6401207,6.69254851 11.7201136,6.75734395 L12.3067549,7.38196355 C12.3857956,7.51021383 12.53483,7.59601192 12.7057672,7.59601192 C12.9614589,7.59601192 13.1719164,7.40028502 13.1719164,7.15853101 L13.1695357,5.65617063 C13.1557274,5.65617063 12.8790852,5.24952341 12.9133679,5.20304944 L13.5837848,4.94118651 L11.3544583,4.68960147 C9.97172354,4.68960147 8.85182268,5.74107499 8.85182268,7.03832431 C8.85182268,7.18310859 8.86467868,7.60673668 8.89372373,7.74481799 L4.56744003,7.74481799 C4.37412381,7.74481799 4.21651871,7.89094287 4.21651871,8.07281696 C4.21651871,8.25424418 4.37412381,8.40081592 4.56744003,8.40081592 L5.55116247,8.40081592 L4.72980661,11.5525553 C4.4193579,11.1459081 4.1779507,10.6851902 4.03129701,10.182467 C3.96892158,9.96931234 3.76132091,9.8200594 3.52562749,9.8200594 C3.47848881,9.8200594 3.43135012,9.82631552 3.38659218,9.83748714 C3.25136605,9.87234262 3.1385189,9.95456579 3.06900125,10.0689633 C2.99948359,10.1833607 2.9818661,10.3160796 3.01900567,10.4425425 C3.6932317,12.7519412 5.94684173,14.3637835 8.49994906,14.3637835 C11.0535325,14.3637835 13.3066664,12.7510474 13.9808925,10.4425425 C14.0185082,10.3151859 13.9999384,10.182467 13.9308969,10.0680695 C13.8613792,9.95367206 13.7485321,9.87189575 13.6137821,9.83659341 Z M5.56116159,12.3841712 C5.83018539,11.09005 7.04103059,10.112756 8.49994906,10.112756 C9.95886754,10.112756 11.1697127,11.0904968 11.4382604,12.3846181 C10.6297605,13.0084417 9.60032785,13.3775523 8.49994906,13.3775523 C7.40004643,13.3775523 6.37061375,13.0084417 5.56116159,12.3841712 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/kiosk-l.svg b/data/styles/clear/style-clear/symbols/kiosk-l.svg
index 8e454b0d1c..e8e262a2aa 100644
--- a/data/styles/clear/style-clear/symbols/kiosk-l.svg
+++ b/data/styles/clear/style-clear/symbols/kiosk-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="kiosk-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M4,7 L4,9 L23,9 L23,7 L4,7 L4,7 Z M6,22 L21,22 L21,11 L6,11 L6,22 L6,22 Z M14,13 L19,13 L19,20 L14,20 L14,13 L14,13 Z M8,13 L13,13 L13,20 L8,20 L8,13 L8,13 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/kiosk-m.svg b/data/styles/clear/style-clear/symbols/kiosk-m.svg
index 9a1cf4b9bd..31a1397cf8 100644
--- a/data/styles/clear/style-clear/symbols/kiosk-m.svg
+++ b/data/styles/clear/style-clear/symbols/kiosk-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="kiosk-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M4,6 L4,8 L19,8 L19,6 L4,6 L4,6 Z M6,19 L17,19 L17,10 L6,10 L6,19 L6,19 Z M12,12 L15,12 L15,17 L12,17 L12,12 L12,12 Z M8,12 L11,12 L11,17 L8,17 L8,12 L8,12 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/laundry-l.svg b/data/styles/clear/style-clear/symbols/laundry-l.svg
index e52c510adb..94dae25fea 100755
--- a/data/styles/clear/style-clear/symbols/laundry-l.svg
+++ b/data/styles/clear/style-clear/symbols/laundry-l.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>laundry-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="Layer_2" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="Layer_2" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.944 0,13.5 C0,6.056 6.056,0 13.5,0 C20.944,0 27,6.056 27,13.5 C27,20.944 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
         </g>
-        <g id="Layer_1" sketch:type="MSLayerGroup" transform="translate(7.000000, 5.019000)" fill="#FFFFFF">
+        <g id="Layer_1" sketch:type="MSLayerGroup" transform="translate(7.000000, 5.000000)" fill="#FFFFFF">
             <path d="M4.051,10 C4.018,10.162 4,10.329 4,10.5 C4,11.878 5.121,13 6.5,13 C7.879,13 9,11.878 9,10.5 C9,10.329 8.982,10.162 8.949,10 L4.051,10 L4.051,10 Z M11,0 L2,0 C0.9,0 0,0.9 0,2 L0,15 C0,16.1 0.9,17 2,17 L11,17 C12.1,17 13,16.1 13,15 L13,2 C13,0.9 12.1,0 11,0 L11,0 Z M6,1.8 C6.662,1.8 7.2,2.339 7.2,3 C7.2,3.661 6.662,4.2 6,4.2 C5.338,4.2 4.8,3.662 4.8,3 C4.8,2.338 5.338,1.8 6,1.8 L6,1.8 Z M3,1.8 C3.662,1.8 4.2,2.339 4.2,3 C4.2,3.661 3.662,4.2 3,4.2 C2.338,4.2 1.8,3.662 1.8,3 C1.8,2.338 2.338,1.8 3,1.8 L3,1.8 Z M6.5,15.2 C3.908,15.2 1.8,13.092 1.8,10.5 C1.8,7.908 3.908,5.8 6.5,5.8 C9.092,5.8 11.2,7.908 11.2,10.5 C11.2,13.092 9.092,15.2 6.5,15.2 L6.5,15.2 Z" id="Shape" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/laundry-m.svg b/data/styles/clear/style-clear/symbols/laundry-m.svg
index 11413c4d31..8a191d5751 100755
--- a/data/styles/clear/style-clear/symbols/laundry-m.svg
+++ b/data/styles/clear/style-clear/symbols/laundry-m.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>laundry-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="Layer_2" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="Layer_2" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
         </g>
-        <g id="Layer_1" sketch:type="MSLayerGroup" transform="translate(7.000000, 5.019000)" fill="#FFFFFF">
+        <g id="Layer_1" sketch:type="MSLayerGroup" transform="translate(7.000000, 5.000000)" fill="#FFFFFF">
             <path d="M8.1,0 L0.9,0 C0.405,0 0,0.45 0,1 L0,12 C0,12.55 0.405,13 0.9,13 L8.1,13 C8.595,13 9,12.55 9,12 L9,1 C9,0.45 8.595,0 8.1,0 L8.1,0 Z M1,2 L4,2 L4,3 L1,3 L1,2 L1,2 Z M4.5,11 C2.8453125,11 1.5,9.65375 1.5,8 C1.5,6.34625 2.84625,5 4.5,5 C6.15375,5 7.5,6.34625 7.5,8 C7.5,9.65375 6.1546875,11 4.5,11 L4.5,11 Z M4.5,10 C5.32666667,10 6,9.55166667 6,9 L3,9 C3,9.55166667 3.67333333,10 4.5,10 L4.5,10 Z" id="Shape-Copy-21" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/library-l.svg b/data/styles/clear/style-clear/symbols/library-l.svg
index 271459cc28..a548d17932 100644
--- a/data/styles/clear/style-clear/symbols/library-l.svg
+++ b/data/styles/clear/style-clear/symbols/library-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="library-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M14,9 L14,20 L20.03,18.2136739 C20.565,18.0774374 21,17.5121572 21,16.9499271 L21,7.79970822 C21,7.2384948 20.565,6.89281986 20.03,7.03007315 L14,9 Z" id="Path" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M13,20.0217561 L13,9.02147896 L6.97,7.02958017 C6.435,6.8955768 6,7.23458534 6,7.78659925 L6,16.786826 C6,17.3388399 6.435,17.8948539 6.97,18.0298573 L13,20.0217561 Z" id="Path" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-clear/symbols/library-m.svg b/data/styles/clear/style-clear/symbols/library-m.svg
index 6d25fd0974..01d5d78da0 100644
--- a/data/styles/clear/style-clear/symbols/library-m.svg
+++ b/data/styles/clear/style-clear/symbols/library-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="library-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M12,17 L12,8 L17.038,6.03941465 C17.569,5.88173864 18,6.22337 18,6.80466891 L18,14.1628829 C18,14.7431306 17.569,15.3412483 17.038,15.4999755 L12,17 Z M5,6.80361774 C5,6.22337 5.431,5.88068746 5.962,6.03836348 L11,8 L11,17 L5.962,15.4999755 C5.431,15.3412483 5,14.7431306 5,14.1618317 L5,6.80361774 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/library-s.svg b/data/styles/clear/style-clear/symbols/library-s.svg
index 86613a39cc..2a039f33f3 100644
--- a/data/styles/clear/style-clear/symbols/library-s.svg
+++ b/data/styles/clear/style-clear/symbols/library-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="library-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M9,13 L9,5.63636364 L13.1983333,4.03224835 C13.6408333,3.9032407 14,4.18275727 14,4.65836547 L14,10.6787224 C14,11.1534705 13.6408333,11.6428395 13.1983333,11.7727072 L9,13 Z M3,4.65750542 C3,4.18275727 3.35916667,3.90238065 3.80166667,4.0313883 L8,5.63636364 L8,13 L3.80166667,11.7727072 C3.35916667,11.6428395 3,11.1534705 3,10.6778623 L3,4.65750542 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/lift_gate-l.svg b/data/styles/clear/style-clear/symbols/lift_gate-l.svg
index 4024b57242..afd1a2dbc3 100644
--- a/data/styles/clear/style-clear/symbols/lift_gate-l.svg
+++ b/data/styles/clear/style-clear/symbols/lift_gate-l.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="lift_gate-l" sketch:type="MSLayerGroup" transform="translate(4.000000, 7.000000)" fill="#717065">
+        <g id="lift_gate-l" sketch:type="MSLayerGroup" transform="translate(4.000000, 7.000000)" fill="#7F7D54">
             <path d="M18.487,1.198 C18.343,0.664 17.796,0.348 17.261,0.491 L7.999,2.972 L7.999,2.809 C7.116,2.297 6.093,1.999 4.999,1.999 C3.905,1.999 2.882,2.297 1.999,2.809 L1.999,4.58 L0.84,4.891 L1.358,6.823 L2,6.651 L2,14 L8,14 L8,5.043 L17.779,2.423 C18.313,2.28 18.63,1.732 18.487,1.198 L18.487,1.198 Z M4,7.201 C3.338,7.201 2.8,6.662 2.8,6 C2.8,5.338 3.338,4.8 4,4.8 C4.662,4.8 5.2,5.338 5.2,6 C5.2,6.662 4.662,7.201 4,7.201 L4,7.201 Z" id="Shape" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/lift_gate-m.svg b/data/styles/clear/style-clear/symbols/lift_gate-m.svg
index 51e8dd38fd..055976bfa7 100644
--- a/data/styles/clear/style-clear/symbols/lift_gate-m.svg
+++ b/data/styles/clear/style-clear/symbols/lift_gate-m.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="lift_gate-m" sketch:type="MSLayerGroup" transform="translate(5.000000, 7.000000)" fill="#717065">
+        <g id="lift_gate-m" sketch:type="MSLayerGroup" transform="translate(5.000000, 7.000000)" fill="#7F7D54">
             <path d="M14.273,0.758 C14.158,0.33 13.719,0.078 13.293,0.193 L5.883,2.178 L5.883,2.047 C5.176,1.638 4.359,1.4 3.483,1.4 C2.608,1.4 1.79,1.638 1.084,2.047 L1.084,3.465 L0.157,3.713 L0.571,5.258 L1.084,5.121 L1.084,11 L5.884,11 L5.884,3.834 L13.708,1.738 C14.134,1.623 14.387,1.186 14.273,0.758 L14.273,0.758 Z M4,6 L2,6 L2,4 L4,4 L4,6 L4,6 Z" id="Shape" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/lighthouse-l.svg b/data/styles/clear/style-clear/symbols/lighthouse-l.svg
index e9851e9584..5a1d2313cd 100644
--- a/data/styles/clear/style-clear/symbols/lighthouse-l.svg
+++ b/data/styles/clear/style-clear/symbols/lighthouse-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="lighthouse-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13,4 L10.5,5.5 C9.986461,5.8081 10,6.5 10,6.5 L10,10 L9,10 L9,12 L10,13 L10,14 L9,23 L17,23 L16,14 L16,13 L17,12 L17,10 L16,10 L16,6.5 C16,6.5 16.005,5.803 15.5,5.5 L13,4 Z M14,8 L14,10 L12,10 L12,8 C12,8 12,7 13,7 C14,7 14,8 14,8 L14,8 Z" id="rect4650-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/lighthouse-m.svg b/data/styles/clear/style-clear/symbols/lighthouse-m.svg
index 6d35e02034..c37cc8f7c6 100644
--- a/data/styles/clear/style-clear/symbols/lighthouse-m.svg
+++ b/data/styles/clear/style-clear/symbols/lighthouse-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="lighthouse-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,4 L9.0000002,6 L9.0000002,9 L8,9 L8,10 L9.0000002,11 L8,19 L15,19 L14,11 L15,10 L15,9 L14,9 L14,6 L11.5,4 Z M11.5,6 L12.5,7 L12.5,9 L10.5,9 L10.5,7 L11.5,6 Z" id="rect4650" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/lighthouse-s.svg b/data/styles/clear/style-clear/symbols/lighthouse-s.svg
index 240bb3a4f4..3ba3648ffd 100644
--- a/data/styles/clear/style-clear/symbols/lighthouse-s.svg
+++ b/data/styles/clear/style-clear/symbols/lighthouse-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="lighthouse-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8,4 L7,5 L7,7 L6,7 L6,8 L7,9 L7,10 L6,14 L11,14 L10,10 L10,9 L11,8 L11,7 L10,7 L10,5 L9,4 L8,4 Z M8,5 L9,5 L9,7 L8,7 L8,5 Z" id="path5217" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/mail-l.svg b/data/styles/clear/style-clear/symbols/mail-l.svg
index 4536c25d83..fd76776160 100644
--- a/data/styles/clear/style-clear/symbols/mail-l.svg
+++ b/data/styles/clear/style-clear/symbols/mail-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="mail-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M6,8 C5,8 5.5,8.3393 6,8.75 L13,14.5 L21,8.75 C21.5,8.3393 22,8 21,8 L13,8 L6,8 Z M5,9.5 L5,18 C5,18.5 5.50625,19 5.90625,19 L21.09375,19 C21.49375,19 22,18.5 22,18 L22,9.5 L13,16 L5,9.5 Z" id="path7085" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/mail-m.svg b/data/styles/clear/style-clear/symbols/mail-m.svg
index 084cf7ecf5..4c7f7b1456 100644
--- a/data/styles/clear/style-clear/symbols/mail-m.svg
+++ b/data/styles/clear/style-clear/symbols/mail-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="mail-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6,7 C5.1875,7 5.40625,7.3382 5.8125,7.6719 L11.5,12 L17.1875,7.6719 C17.60585,7.3535 17.8125,7 17,7 L6,7 Z M5,8.5 L5,15 C5,15.5 5.5,16 6,16 L17,16 C17.5,16 18,15.5 18,15 L18,8.5 L11.5,13.5 L5,8.5 Z" id="path7085-23-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/mail-s.svg b/data/styles/clear/style-clear/symbols/mail-s.svg
index e546330ab4..005a33f779 100644
--- a/data/styles/clear/style-clear/symbols/mail-s.svg
+++ b/data/styles/clear/style-clear/symbols/mail-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="mail-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M4,6 L8.5,9 L13,6 L4,6 Z M4,7 L4,11.5 C4,11.75 4.3,12 4.5,12 L12.5,12 C12.7,12 13.05423,11.744 13,11.5 L13.00003,7 L8.5,10.5 L4,7 Z" id="path7085-2-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/marketplace-l.svg b/data/styles/clear/style-clear/symbols/marketplace-l.svg
index 3ea5ed4cb8..7a27774177 100644
--- a/data/styles/clear/style-clear/symbols/marketplace-l.svg
+++ b/data/styles/clear/style-clear/symbols/marketplace-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="marketplace-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M7,22 L20,22 L20,18 L7,18 L7,22 L7,22 Z M19,11 L17,11 L17,15 L10,15 L10,11 L8,11 L8,15 L6,15 L6,17 L21,17 L21,15 L19,15 L19,11 L19,11 Z M6,5 L6,7 C6,8.1048 7.119,9 8.5,9 C9.881,9 11,8.1048 11,7 C11,8.1048 12.119,9 13.5,9 C14.881,9 16,8.1048 16,7 C16,8.1048 17.119,9 18.5,9 C19.881,9 21,8.1048 21,7 L21,5 L6,5 L6,5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/marketplace-m.svg b/data/styles/clear/style-clear/symbols/marketplace-m.svg
index a38c14171f..84d6d1bfd1 100644
--- a/data/styles/clear/style-clear/symbols/marketplace-m.svg
+++ b/data/styles/clear/style-clear/symbols/marketplace-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="marketplace-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M6,4 L6,6.167 C6,7.179 6.82,8 7.834,8 C8.846,8 9.666,7.179 9.666,6.167 C9.666,7.179 10.487,8 11.5,8 C12.513,8 13.334,7.179 13.334,6.167 C13.334,7.179 14.154,8 15.166,8 C16.18,8 17,7.179 17,6.167 L17,4 L6,4 L6,4 Z M16,9 L14,9 L14,12 L9,12 L9,9 L7,9 L7,12 L6,12 L6,14 L17,14 L17,12 L16,12 L16,9 L16,9 Z M7,19 L16,19 L16,15 L7,15 L7,19 L7,19 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/military-l.svg b/data/styles/clear/style-clear/symbols/military-l.svg
index 7e0285376b..e02806758d 100644
--- a/data/styles/clear/style-clear/symbols/military-l.svg
+++ b/data/styles/clear/style-clear/symbols/military-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="military-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M17.1029057,12.3396 L20.0072222,12.3396 C21.3605556,12.3396 22.4583333,14.1457875 22.4583333,16.3761 L20.615822,16.3761 C20.6490971,16.5201634 20.6666667,16.6700577 20.6666667,16.82395 C20.6666667,17.937136 19.6530546,19.4607756 18.519926,19.4607756 L7.8651208,19.4607756 C6.73199224,19.4607756 5.79055556,17.937136 5.79055556,16.82395 C5.79055556,16.670046 5.80809411,16.5201534 5.84131218,16.3761 L4.67944444,16.3761 C4.67944444,14.1457875 5.77722222,12.3396 7.13166667,12.3396 L8.02733294,12.3396 L8.02733294,6.94850297 L15.4141499,6.94850297 L16.2465142,9.6057 L22.9912688,9.6057 L22.9912688,10.981 L16.6773256,10.981 L17.1029057,12.3396 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/military-m.svg b/data/styles/clear/style-clear/symbols/military-m.svg
index 513cbea82b..2acc091383 100644
--- a/data/styles/clear/style-clear/symbols/military-m.svg
+++ b/data/styles/clear/style-clear/symbols/military-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="military-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M14.5688918,10.122 L17.4065,10.122 C18.6245,10.122 19.6125,11.511375 19.6125,13.227 L17.9542398,13.227 C17.9841874,13.337818 18,13.4531213 18,13.5715 C18,14.4277969 17.0678353,15.4963591 16.0480196,15.4963591 L6.45869491,15.4963591 C5.43887921,15.4963591 4.6115,14.4277969 4.6115,13.5715 C4.6115,13.4531123 4.6272847,13.3378103 4.65718096,13.227 L3.6115,13.227 C3.6115,11.511375 4.5995,10.122 5.8185,10.122 L6.6115,10.122 L6.6115,6.019 L13.2945,6.019 L13.9157,8.019 L20.0532028,8.019 L20.0532028,9.00950677 L14.2233514,9.00950677 L14.5688918,10.122 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/military-s.svg b/data/styles/clear/style-clear/symbols/military-s.svg
index 6bdbf95110..602973073f 100644
--- a/data/styles/clear/style-clear/symbols/military-s.svg
+++ b/data/styles/clear/style-clear/symbols/military-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="military-s" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M11.033347,7.97893641 L12.4405343,7.97893641 C13.2389406,7.97893641 14.014549,8.67695893 14.014549,9.95445007 L13.8294799,9.95445007 L13.4354903,9.95445007 C13.4354903,9.95445007 13.0925936,9.95445007 12.5272656,9.95445006 C12.5378674,10.0310317 12.5464286,10.1103852 12.5464286,10.1916869 C12.5464286,10.8293039 12.0198608,11.4870979 11.3708209,11.4870979 L5.26790069,11.4870979 C4.61886084,11.4870979 4.02560464,10.8293039 4.02560464,10.1916869 C4.02560464,10.1103795 4.03415063,10.0310267 4.05040709,9.95444999 C3.80830543,9.95444998 3.34072847,9.95444998 3.34072847,9.95444998 L2.94673891,9.95445007 C2.94673891,8.67695893 4.04546905,7.97893641 4.84453085,7.97893641 L5.01233991,7.97893641 L5.00678353,4.9270054 L9.53179704,4.9270054 L10.0608464,6.0023091 L14.0034124,6.00230908 L14.0034122,6.98099997 L10.5423623,6.98099999 L11.033347,7.97893641 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-l.svg b/data/styles/clear/style-clear/symbols/mobile_phone-l.svg
index 595160239f..e5ec653bbb 100644
--- a/data/styles/clear/style-clear/symbols/mobile_phone-l.svg
+++ b/data/styles/clear/style-clear/symbols/mobile_phone-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="mobile_phone-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.944 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.944 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18,4 C17.447,4 17,4.448 17,5 L17,6 L10,6 C8.896,6 8,6.896 8,8 L8,21 C8,22.104 8.896,23 10,23 L17,23 C18.104,23 19,22.104 19,21 L19,5 C19,4.448 18.553,4 18,4 L18,4 Z M13,21 L11,21 C10.447,21 10,20.552 10,20 L10,19 L13,19 L13,21 L13,21 Z M13,18 L10,18 L10,17 C10,16.448 10.447,16 11,16 L13,16 L13,18 L13,18 Z M17,20 C17,20.552 16.553,21 16,21 L14,21 L14,19 L17,19 L17,20 L17,20 Z M17,18 L14,18 L14,16 L16,16 C16.553,16 17,16.448 17,17 L17,18 L17,18 Z M17,14 L10,14 L10,8 L17,8 L17,14 L17,14 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/mobile_phone-m.svg b/data/styles/clear/style-clear/symbols/mobile_phone-m.svg
index 3a4b3f100b..37d40cfb32 100644
--- a/data/styles/clear/style-clear/symbols/mobile_phone-m.svg
+++ b/data/styles/clear/style-clear/symbols/mobile_phone-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="mobile_phone-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15,4 C14.447,4 14,4.448 14,5 L14,6 L9,6 C7.896,6 7,6.896 7,8 L7,17 C7,18.104 7.896,19 9,19 L14,19 C15.104,19 16,18.104 16,17 L16,5 C16,4.448 15.553,4 15,4 L15,4 Z M11,17 L9,17 L9,16 L11,16 L11,17 L11,17 Z M11,15 L9,15 L9,14 L11,14 L11,15 L11,15 Z M14,17 L12,17 L12,16 L14,16 L14,17 L14,17 Z M14,15 L12,15 L12,14 L14,14 L14,15 L14,15 Z M14,12 L9,12 L9,8 L14,8 L14,12 L14,12 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/monument-l.svg b/data/styles/clear/style-clear/symbols/monument-l.svg
index 75560306cc..7e44dd8ffc 100644
--- a/data/styles/clear/style-clear/symbols/monument-l.svg
+++ b/data/styles/clear/style-clear/symbols/monument-l.svg
@@ -7,12 +7,12 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="monument-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11,7 L11,16 L9,16 C8.44599,16 8,16.446 8,17 L8,19 L7,19 C6.44601,19 6,19.446 6,20 L6,21 L21,21 L21,20 C21,19.446 20.55399,19 20,19 L19,19 L19,17 C19,16.446 18.55401,16 18,16 L16,16 L16,7 C16,6 13.5,4 13.5,4 C13.5,4 10.90946,6.0041 11,7 Z" id="path11719" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-l-copy-2" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11,7 L11,16 L9,16 C8.44599,16 8,16.446 8,17 L8,19 L7,19 C6.44601,19 6,19.446 6,20 L6,21 L21,21 L21,20 C21,19.446 20.55399,19 20,19 L19,19 L19,17 C19,16.446 18.55401,16 18,16 L16,16 L16,7 C16,6 13.5,4 13.5,4 C13.5,4 10.90946,6.0041 11,7 Z" id="path11719" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/monument-m.svg b/data/styles/clear/style-clear/symbols/monument-m.svg
index 3e90ab06d8..ecf6de53fa 100644
--- a/data/styles/clear/style-clear/symbols/monument-m.svg
+++ b/data/styles/clear/style-clear/symbols/monument-m.svg
@@ -7,12 +7,12 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="monument-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10,6.5 L10,14 L9,14 C8.56908,14 8,14.5136 8,14.9445 L8,16.5 L7,16.5 C6.5,16.5 6,17 6,17.5 L6,18 L17,18 L17,17.5 C17,17 16.5,16.5 16,16.5 L15,16.5 L15,15 C15,14.5 14.5,14 14,14 L13,14 L13,6.5 C13,5.7223 11.44444,4 11.44444,4 C11.44444,4 10,5.7223 10,6.5 Z" id="path11719-5" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-m-copy-2" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10,6.5 L10,14 L9,14 C8.56908,14 8,14.5136 8,14.9445 L8,16.5 L7,16.5 C6.5,16.5 6,17 6,17.5 L6,18 L17,18 L17,17.5 C17,17 16.5,16.5 16,16.5 L15,16.5 L15,15 C15,14.5 14.5,14 14,14 L13,14 L13,6.5 C13,5.7223 11.44444,4 11.44444,4 C11.44444,4 10,5.7223 10,6.5 Z" id="path11719-5" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/monument-s.svg b/data/styles/clear/style-clear/symbols/monument-s.svg
index aaf44d9a8f..9e54000f49 100644
--- a/data/styles/clear/style-clear/symbols/monument-s.svg
+++ b/data/styles/clear/style-clear/symbols/monument-s.svg
@@ -7,12 +7,12 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="monument-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,4 C8.5,4 7,5.5 7,6 L7,10 L6.5,10 C6.22299,10 6.03629,10.2254 6,10.5 L6,12 L5.5,12 C5.223,12 5,12.223 5,12.5 L5,13 L12,13 L12,12.5 C12,12.223 11.77699,12 11.5,12 L11,12 L11,10.5 C11,10.223 10.777,10 10.5,10 L10,10 L10,6 C10,5.5 8.5,4 8.5,4 L8.5,4 Z" id="path11719-7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
         <g id="monument-s-copy-2" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,4 C8.5,4 7,5.5 7,6 L7,10 L6.5,10 C6.22299,10 6.03629,10.2254 6,10.5 L6,12 L5.5,12 C5.223,12 5,12.223 5,12.5 L5,13 L12,13 L12,12.5 C12,12.223 11.77699,12 11.5,12 L11,12 L11,10.5 C11,10.223 10.777,10 10.5,10 L10,10 L10,6 C10,5.5 8.5,4 8.5,4 L8.5,4 Z" id="path11719-7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/motel-l.svg b/data/styles/clear/style-clear/symbols/motel-l.svg
index d91c2dc4ac..ef3a37d094 100644
--- a/data/styles/clear/style-clear/symbols/motel-l.svg
+++ b/data/styles/clear/style-clear/symbols/motel-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="motel-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#8C4D16" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M7,14 L22,14 L22,19 L20,19 L20,16 L7,16 L7,19 L5,19 L5,14 L7,14 L7,14 L7,14 Z M7,13 C8.104,13 9,12.104 9,11 C9,9.896 8.104,9 7,9 C5.896,9 5,9.896 5,11 C5,12.104 5.896,13 7,13 L7,13 Z M21.02,10.804 L10.981,9.197 C10.44,9.089 10.001,9.448 10.001,10.001 L10.001,13.001 L22.001,13.001 L22.001,12.001 C22,11.447 21.561,10.912 21.02,10.804 L21.02,10.804 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/motel-m.svg b/data/styles/clear/style-clear/symbols/motel-m.svg
index a02ead39fd..3bc4e3ce13 100644
--- a/data/styles/clear/style-clear/symbols/motel-m.svg
+++ b/data/styles/clear/style-clear/symbols/motel-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="motel-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#8C4D16" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M7,12 L18,12 L18,16 L16,16 L16,14 L7,14 L7,16 L5,16 L5,12 L7,12 L7,12 L7,12 Z M6.5,11 C7.328,11 8,10.328 8,9.5 C8,8.672 7.328,8 6.5,8 C5.672,8 5,8.672 5,9.5 C5,10.328 5.672,11 6.5,11 L6.5,11 Z M17.02,8.804 L9.981,8.197 C9.44,8.089 9.001,8.448 9.001,9.001 L9.001,11.001 L18.001,11.001 L18.001,10.001 C18,9.447 17.561,8.912 17.02,8.804 L17.02,8.804 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/museum-l.svg b/data/styles/clear/style-clear/symbols/museum-l.svg
index 6f06532684..abe0ee61cc 100644
--- a/data/styles/clear/style-clear/symbols/museum-l.svg
+++ b/data/styles/clear/style-clear/symbols/museum-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="museum-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,3.3622 L7,8.3622 L20,8.3622 L13.5,3.3622 Z M8,9.3622 C7.44599,9.3622 7.07835,9.8138 7,10.3622 L7,17.3622 L5.25,20.3622 C5.10167,20.6165 5,20.7189 5,20.8622 C5,21.3622 5.63165,21.3622 6,21.3622 L21,21.3622 C21.35499,21.3622 22,21.3622 22,20.8622 C22,20.716 21.9134,20.6423 21.75,20.3622 L20,17.3622 L20,10.3622 C20,9.8082 19.55401,9.3622 19,9.3622 L8,9.3622 Z M10,11.3622 L11.5,11.3622 C12,11.3622 12.5,12.3622 12.5,12.3622 L13.5,14.8622 L14.5,12.3622 C14.72318,11.8042 15,11.3622 15.5,11.3622 L17,11.3622 C17.554,11.3622 18,11.8082 18,12.3622 L18,17.3622 C18,17.8622 17.5,18.3622 17,18.3622 C16.5,18.3622 16,17.8622 16,17.3622 L16,13.3622 L14.5,16.3622 C14.5,16.3622 14,17.3622 13.5,17.3622 C13,17.3622 12.5,16.3622 12.5,16.3622 L11,13.3622 L11,17.3622 C11,17.8622 10.5,18.3622 10,18.3622 C9.5,18.3622 9,17.8622 9,17.3622 L9,16.3622 L9,12.3622 C9,11.8082 9.446,11.3622 10,11.3622 L10,11.3622 Z" id="rect7645-6-5-0" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/museum-m.svg b/data/styles/clear/style-clear/symbols/museum-m.svg
index adef35408e..d3ae23e85c 100644
--- a/data/styles/clear/style-clear/symbols/museum-m.svg
+++ b/data/styles/clear/style-clear/symbols/museum-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="museum-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,5.3622 L7,8.3622 L16,8.3622 L11.5,5.3622 Z M8,9.3622 C7.5,9.3622 7,9.8622 7,10.3067 L7,15.3622 L6,16.8622 C6,17.2233 6.23397,17.3622 6.5,17.3622 L16.5,17.3622 C16.75638,17.3622 17,17.2233 17,16.8622 L16,15.3622 L16,10.3067 C16,9.8622 15.5,9.3622 15,9.3622 L8,9.3622 Z M10,10.8622 C10.5,10.8622 10.5,10.8622 11,11.8622 L11.5,12.8622 L12,11.8622 C12.5,10.8622 12.5,10.8622 13,10.8622 C13.5,10.8622 14,11.3622 14,11.8622 L14,15.3622 C14,15.7233 13.86111,15.8622 13.5,15.8622 C13.13889,15.8622 13,15.7233 13,15.3622 L13,12.4733 L12,14.3622 C11.7353,14.8622 11.2647,14.8622 11,14.3622 L10,12.4733 L10,15.3622 C10,15.7233 9.86111,15.8622 9.5,15.8622 C9.13889,15.8622 8.99995,15.7233 8.99995,15.3622 L8.99995,14.64 L9,11.8622 C9.00001,11.3622 9.5,10.8622 10,10.8622 L10,10.8622 Z" id="rect7645-6-5-0-1" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/museum-s.svg b/data/styles/clear/style-clear/symbols/museum-s.svg
index 37b0691ff0..8c04b519dd 100644
--- a/data/styles/clear/style-clear/symbols/museum-s.svg
+++ b/data/styles/clear/style-clear/symbols/museum-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="museum-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <g id="museum-12-copy" transform="translate(2.000000, 2.000000)" sketch:type="MSShapeGroup">
                 <g id="g21713" transform="translate(2.000000, 1.000000)" fill="#FFFFFF">
                     <path d="M4.5,0.3622 L1,2.3622 L8,2.3622 L4.5,0.3622 Z M1.5,3.3622 C1.22299,3.3622 1,3.5852 1,3.8622 L1,7.3622 L1,8.3622 L0,9.3622 L9,9.3622 L8,8.3622 L8,7.3622 L8,3.8622 C8,3.5852 7.777,3.3622 7.5,3.3622 L1.5,3.3622 Z M2.5,4.3622 L3.25,4.3622 C3.5,4.3622 3.75,4.8622 3.75,4.8622 L4.5,6.3622 L5.25,4.8622 C5.38438,4.5935 5.5,4.3622 5.75,4.3622 L6.5,4.3622 C6.777,4.3622 7,4.5852 7,4.8622 L7,7.3622 C7,7.6122 6.75,7.8622 6.5,7.8622 C6.25,7.8622 6,7.6122 6,7.3622 L6,5.3622 L5.25,6.8622 C5.13059,7.101 5,7.3622 4.5,7.3622 C4,7.3622 3.8694,7.101 3.75,6.8622 L3,5.3622 L3,7.3622 C3,7.6122 2.75,7.8622 2.5,7.8622 C2.25,7.8622 2,7.6122 2,7.3622 L2,6.8622 L2,4.8622 C2,4.5852 2.223,4.3622 2.5,4.3622 L2.5,4.3622 Z" id="rect7645-6-5-0-0"></path>
diff --git a/data/styles/clear/style-clear/symbols/npark-l.svg b/data/styles/clear/style-clear/symbols/npark-l.svg
index f4c14e1c03..015ba7265e 100644
--- a/data/styles/clear/style-clear/symbols/npark-l.svg
+++ b/data/styles/clear/style-clear/symbols/npark-l.svg
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
-    <title>npark-l</title>
+    <title>nparkF-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="npark-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-44" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-45" fill="#3A7921" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <g id="Shape-Copy-7-+-Shape-Copy-6-Copy" transform="translate(5.000000, 6.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
-                <path d="M13.5582294,1.30575109 C13.3777058,1.30575109 13.215857,1.32691593 13.0527633,1.35430572 C11.904882,1.59209892 11.0445935,2.60303125 11.0445935,3.81814203 C11.0445935,3.89408645 11.0670033,3.96256093 11.0732283,4.03726037 L0.88131168,14.9973583 L9.12170553,14.9973583 C13.0944704,14.9973583 16.0731103,11.1847511 16.0731103,7.21447626 L16.0731103,4.74068003 L17.0482533,3.81814189 L16.0258007,3.32761575 C15.7967224,2.17350951 14.7783202,1.30575109 13.5582294,1.30575109 Z M13.7325281,3.11596736 C13.7325281,2.72628531 14.0462657,2.41254769 14.4347028,2.41254769 C14.8231398,2.41254769 15.1393674,2.72628531 15.1393674,3.11596736 C15.1393674,3.5056494 14.8243848,3.81814203 14.4347028,3.81814203 C14.0450207,3.81814203 13.7325281,3.5056494 13.7325281,3.11596736 Z" id="Shape-Copy-7"></path>
-                <path d="M2.04829175,0.0607605348 C2.04829175,0.0607605348 9.49831522,2.18097945 11.0782082,3.76336244 C12.6605912,5.34699043 12.6605912,7.91416095 11.0782082,9.49654395 C9.49707023,11.0776819 6.92989971,11.0776819 5.34751672,9.49654395 C3.76513372,7.91416095 2.04829175,0.0607605348 2.04829175,0.0607605348 L2.04829175,0.0607605348 Z" id="Shape-Copy-6"></path>
-            </g>
-        </g>
+        <circle id="Oval-1-Copy-44" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+        <circle id="Oval-1-Copy-45" fill="#3A7921" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+        <path d="M13.5,5 L8,9.87164526 L11.0555556,9.87164526 L8,13.8987163 L11.0555556,13.8987163 L8,17.9720917 L12.983552,17.9720917 L12.983552,21.8951683 L14.0407867,21.8951683 L14.0407867,17.9720917 L19,17.9720917 L15.9444447,13.8987163 L19,13.8987163 L15.9444447,9.87164545 L19,9.87164545 L13.5,5 Z" id="rect4152-3-3-5-copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/npark-m.svg b/data/styles/clear/style-clear/symbols/npark-m.svg
index b5801bea0a..f164f87a60 100644
--- a/data/styles/clear/style-clear/symbols/npark-m.svg
+++ b/data/styles/clear/style-clear/symbols/npark-m.svg
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
-    <title>npark-m</title>
+    <title>nparkF-m </title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="npark-m" sketch:type="MSLayerGroup">
+        <g id="nparkF-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#3A7921" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
-            <g id="Shape-Copy-7-+-Shape-Copy-6" transform="translate(5.000000, 5.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
-                <path d="M10.245,1 C10.1,1 9.97,1.017 9.839,1.039 C8.917,1.23 8.226,2.042 8.226,3.018 C8.226,3.079 8.244,3.134 8.249,3.194 L0.062659502,11.9973583 L6.68149996,11.9973583 C9.87249996,11.9973583 12.265,8.935 12.265,5.746 L12.265,3.759 L13.0482533,3.01799989 L12.227,2.624 C12.043,1.697 11.225,1 10.245,1 Z M10.385,2.454 C10.385,2.141 10.637,1.889 10.949,1.889 C11.261,1.889 11.515,2.141 11.515,2.454 C11.515,2.767 11.262,3.018 10.949,3.018 C10.636,3.018 10.385,2.767 10.385,2.454 Z" id="Shape-Copy-7"></path>
-                <path d="M1,8.8817842e-16 C1,8.8817842e-16 6.984,1.703 8.253,2.974 C9.524,4.246 9.524,6.308 8.253,7.579 C6.983,8.849 4.921,8.849 3.65,7.579 C2.379,6.308 1,8.8817842e-16 1,8.8817842e-16 L1,8.8817842e-16 Z" id="Shape-Copy-6"></path>
-            </g>
+            <path d="M11.5,5 L7.5,9 L10,9 L7,12 L9.5,12 L7,15 L11,15 L11,18 L12,18 L12,15 L16,15 L13.5,12 L16,12 L13,9 L15.5,9 L11.5,5 Z" id="rect4152-3-3-5" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/npark-s.svg b/data/styles/clear/style-clear/symbols/npark-s.svg
index 2bd64cdbce..d4513bfa8d 100644
--- a/data/styles/clear/style-clear/symbols/npark-s.svg
+++ b/data/styles/clear/style-clear/symbols/npark-s.svg
@@ -1,17 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
-    <title>npark-s</title>
+    <title>nparkF-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="npark-s" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#3A7921" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <g id="Shape-Copy-9-+-Shape-Copy-8" transform="translate(4.000000, 4.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
-                <path d="M7.29928349,0.7523635 C7.1953392,0.7523635 7.10214778,0.765153679 7.00823949,0.781705676 C6.34729721,0.925407104 5.85194892,1.53632627 5.85194892,2.27063304 C5.85194892,2.31652722 5.86485235,2.35790721 5.86843664,2.40304902 L0,9.02637449 L4.74476304,9.02637449 C7.03225417,9.02637449 8.74733491,6.72236787 8.74733491,4.32308067 L8.74733491,2.82813439 L9.59257984,2.27063304 L8.72009434,1.97420182 C8.58819263,1.27676086 8.00180349,0.7523635 7.29928349,0.7523635 Z M7.39964349,1.84630003 C7.39964349,1.61081025 7.58029149,1.42121465 7.80395092,1.42121465 C8.02761034,1.42121465 8.20969206,1.61081025 8.20969206,1.84630003 C8.20969206,2.0817898 8.0283272,2.27063304 7.80395092,2.27063304 C7.57957463,2.27063304 7.39964349,2.0817898 7.39964349,1.84630003 Z" id="Shape-Copy-9"></path>
-                <path d="M5.91622198,2.23752905 C6.8273474,3.19453542 6.8273474,4.74590896 5.91622198,5.70216296 C5.00581341,6.65766461 3.52765399,6.65766461 2.61652856,5.70216296 C1.70540314,4.74590896 1.03686793,0.383785214 1.03686793,0.0224072896 C1.35044612,0.0224072896 5.00653027,1.28127504 5.91622198,2.23752905 Z" id="Shape-Copy-8"></path>
-            </g>
-        </g>
+        <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+        <circle id="Oval-1-Copy-42" fill="#3A7921" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+        <path d="M8.5,4 L5,7.16404878 L7.04377508,7.16404878 L5,9.13098417 L7.04377508,9.13098417 L5,11.0880935 L5.68400832,11.0880935 L7.99911189,11.0880935 L7.99911189,13.1035326 L8.99568152,13.103533 L8.99568152,11.0880939 L12,11.0880935 L9.9828372,9.13098417 L12,9.13098417 L9.9828372,7.16404878 L12,7.16404878 L8.5,4 Z" id="rect4152-3-3-5-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/office-l.svg b/data/styles/clear/style-clear/symbols/office-l.svg
index 5e3448008a..13d2ffcfc1 100644
--- a/data/styles/clear/style-clear/symbols/office-l.svg
+++ b/data/styles/clear/style-clear/symbols/office-l.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>office-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.519" r="13.5"></circle>
-        <ellipse id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.519" rx="12.5" ry="12.5"></ellipse>
-        <path d="M21,8.019 L17,8.019 L17,6.019 C17,5.466 16.552,5.019 16,5.019 L11,5.019 C10.448,5.019 10,5.466 10,6.019 L10,8.019 L6,8.019 C5.448,8.019 5,8.466 5,9.019 L5,19.019 C5,19.572 5.448,20.019 6,20.019 L21,20.019 C21.552,20.019 22,19.572 22,19.019 L22,9.019 C22,8.466 21.552,8.019 21,8.019 L21,8.019 Z M9,19.019 L8,19.019 L8,9.019 L9,9.019 L9,19.019 Z M16,8.019 L11,8.019 L11,6.019 L16,6.019 L16,8.019 Z M19,19.019 L18,19.019 L18,9.019 L19,9.019 L19,19.019 Z" id="path19" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+        <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+        <path d="M21,8 L17,8 L17,6 C17,5.447 16.552,5 16,5 L11,5 C10.448,5 10,5.447 10,6 L10,8 L6,8 C5.448,8 5,8.447 5,9 L5,19 C5,19.553 5.448,20 6,20 L21,20 C21.552,20 22,19.553 22,19 L22,9 C22,8.447 21.552,8 21,8 L21,8 Z M9,19 L8,19 L8,9 L9,9 L9,19 Z M16,8 L11,8 L11,6 L16,6 L16,8 Z M19,19 L18,19 L18,9 L19,9 L19,19 Z" id="path19" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/office-m.svg b/data/styles/clear/style-clear/symbols/office-m.svg
index 95dcc9bdbc..cd44c60e07 100644
--- a/data/styles/clear/style-clear/symbols/office-m.svg
+++ b/data/styles/clear/style-clear/symbols/office-m.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>office-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.519" rx="11.5" ry="11.5"></ellipse>
-        <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.519" rx="10.5" ry="10.5"></ellipse>
-        <path d="M17,7.019 L14,7.019 L14,6.019 C14,5.466 13.552,5.019 13,5.019 L10,5.019 C9.448,5.019 9,5.466 9,6.019 L9,7.019 L6,7.019 C5.448,7.019 5,7.466 5,8.019 L5,15.019 C5,15.572 5.448,16.019 6,16.019 L17,16.019 C17.552,16.019 18,15.572 18,15.019 L18,8.019 C18,7.466 17.552,7.019 17,7.019 L17,7.019 Z M10,6.019 L13,6.019 L13,7.019 L10,7.019 L10,6.019 Z M8,15.019 L7,15.019 L7,8.019 L8,8.019 L8,15.019 Z M16,15.019 L15,15.019 L15,8.019 L16,8.019 L16,15.019 Z" id="path17" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+        <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+        <path d="M17,7 L14,7 L14,6 C14,5.447 13.552,5 13,5 L10,5 C9.448,5 9,5.447 9,6 L9,7 L6,7 C5.448,7 5,7.447 5,8 L5,15 C5,15.553 5.448,16 6,16 L17,16 C17.552,16 18,15.553 18,15 L18,8 C18,7.447 17.552,7 17,7 L17,7 Z M10,6 L13,6 L13,7 L10,7 L10,6 Z M8,15 L7,15 L7,8 L8,8 L8,15 Z M16,15 L15,15 L15,8 L16,8 L16,15 Z" id="path17" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/office-s.svg b/data/styles/clear/style-clear/symbols/office-s.svg
index ea19b11daf..f7d4f088e1 100644
--- a/data/styles/clear/style-clear/symbols/office-s.svg
+++ b/data/styles/clear/style-clear/symbols/office-s.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>office-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.519" r="8.5"></circle>
-        <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.519" r="7.5"></circle>
-        <path d="M11,6.019 L11,4.519 L10.5,4.019 L6.5,4.019 L6,4.519 L6,6.019 L4.5,6.019 L4,6.519 L4,11.519 L4.5,12.019 L12.5,12.019 L13,11.518 L13,6.519 L12.5,6.019 L11,6.019 Z M7,5.019 L10,5.019 L10,6.019 L7,6.019 L7,5.019 Z M6,7.019 L7,7.019 L7,11.019 L6,11.019 L6,7.019 Z M11,11.019 L10,11.019 L10,7.019 L11,7.019 L11,11.019 Z" id="path17" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+        <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+        <path d="M11,6 L11,4.5 L10.5,4 L6.5,4 L6,4.5 L6,6 L4.5,6 L4,6.5 L4,11.5 L4.5,12 L12.5,12 L13,11.499 L13,6.5 L12.5,6 L11,6 Z M7,5 L10,5 L10,6 L7,6 L7,5 Z M6,7 L7,7 L7,11 L6,11 L6,7 Z M11,11 L10,11 L10,7 L11,7 L11,11 Z" id="path17" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/optician-l.svg b/data/styles/clear/style-clear/symbols/optician-l.svg
index 43984e7bb0..4ab9fd687d 100644
--- a/data/styles/clear/style-clear/symbols/optician-l.svg
+++ b/data/styles/clear/style-clear/symbols/optician-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="optician-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.056 6.057,0 13.5,0 C20.943,0 27,6.056 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15.424,6.265 C15.19,6.119 15,6.223 15,6.5 L15,7.2 C15,7.476 15.192,7.815 15.429,7.957 L20,11 L7,11 L11.571,7.857 C11.807,7.715 12,7.476 12,7.2 L12,6.5 C12,6.224 11.811,6.119 11.576,6.265 L4,11 L4,16 C4,17.104 5.96,18.127 7.999,18.127 C9.948,18.127 11.97,17.192 12.417,14.5 C12.516,13.906 12.598,13.414 12.666,13 L14.334,13 C14.402,13.414 14.484,13.906 14.583,14.5 C15.03,17.192 17.052,18.127 19.001,18.127 C21.04,18.127 23,17.105 23,16 L23,11 L15.424,6.265 L15.424,6.265 Z M10.444,14.172 C10.363,14.655 10.119,16.127 7.999,16.127 C7.061,16.127 6.32,15.823 6,15.612 L6,13 L10.639,13 C10.582,13.341 10.518,13.729 10.444,14.172 L10.444,14.172 Z M21,15.612 C20.68,15.822 19.938,16.127 19.001,16.127 C16.881,16.127 16.637,14.656 16.556,14.172 C16.483,13.729 16.418,13.34 16.362,13 L21,13 L21,15.612 L21,15.612 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/optician-m.svg b/data/styles/clear/style-clear/symbols/optician-m.svg
index 4fbae737d8..5a90a153b1 100644
--- a/data/styles/clear/style-clear/symbols/optician-m.svg
+++ b/data/styles/clear/style-clear/symbols/optician-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="optician-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18.862,9 L13.334,5.353 C13.149,5.237 13,5.32 13,5.539 L13,6.091 C13,6.309 13.151,6.576 13.338,6.689 L16.508,9.001 L5.974,9.001 L6.37,8.792 L9.662,6.311 C9.849,6.199 10.001,6.01 10.001,5.792 L10.001,5.24 C10.001,5.022 9.851,4.939 9.666,5.054 L4,8.791 L4,13.104 C4,14.01 5.548,14.85 7.157,14.85 C8.696,14.85 10.292,14.083 10.645,11.873 C10.697,11.546 10.743,11.26 10.784,11.001 L12.216,11.001 C12.258,11.26 12.303,11.546 12.356,11.873 C12.71,14.083 14.305,14.85 15.844,14.85 C17.452,14.85 19,14.011 19,13.104 L19,9 L18.862,9 L18.862,9 Z M9.164,11.635 C9.097,12.059 8.891,13.349 7.157,13.349 C6.356,13.349 5.73,13.055 5.5,12.875 L5.5,10.5 L9.346,10.5 C9.295,10.819 9.234,11.194 9.164,11.635 L9.164,11.635 Z M17.5,12.875 C17.27,13.055 16.644,13.349 15.844,13.349 C14.111,13.349 13.905,12.059 13.837,11.635 C13.767,11.194 13.706,10.819 13.655,10.5 L17.5,10.5 L17.5,12.875 L17.5,12.875 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/parking-meter-l.svg b/data/styles/clear/style-clear/symbols/parking-meter-l.svg
index e77667e79b..728c73be13 100644
--- a/data/styles/clear/style-clear/symbols/parking-meter-l.svg
+++ b/data/styles/clear/style-clear/symbols/parking-meter-l.svg
@@ -5,9 +5,14 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="beverages-m" sketch:type="MSLayerGroup" transform="translate(-3.000000, 9.000000)">
+            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
+            <path d="M10.41,9.742 L9.571,9.171 L9.215,5.146 L7.785,5.146 L7.429,9.212 L6.599,9.755 C6.269,9.971 6,10.464 6,10.859 L6,17.288 C6,17.683 6.32,18.001 6.715,18.001 L10.286,18.001 C10.68,18.001 11,17.683 11,17.288 L11,10.859 C11,10.464 10.736,9.965 10.41,9.742 L10.41,9.742 Z M16.571,13.001 C17.36,13.001 18,12.361 18,11.572 L17.285,8 L13.713,8 L13,11.572 C13,12.361 13.639,13.001 14.429,13.001 L15,13.001 L15,16.715 L13,17.287 L13,18 L18,18 L18,17.287 L16,16.715 L16,13.001 L16.571,13.001 L16.571,13.001 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
         <g id="parking-meter-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15,14 L13,14 L13,16 L15,16 C15.551,16 16,15.552 16,15 C16,14.448 15.551,14 15,14 L15,14 Z M20,8 L19,8 L19,10 L8,10 L8,8 L7,8 C6.448,8 6,8.447 6,9 L6,20 C6,21.104 6.896,22 8,22 L19,22 C20.104,22 21,21.104 21,20 L21,9 C21,8.447 20.552,8 20,8 L20,8 Z M15,18 L13,18 L13,20 L11,20 L11,12 L15,12 C16.654,12 18,13.346 18,15 C18,16.654 16.654,18 15,18 L15,18 Z M16.65,9 C16.868,8.544 17,8.039 17,7.5 C17,5.567 15.433,4 13.5,4 C11.567,4 10,5.567 10,7.5 C10,8.039 10.132,8.544 10.35,9 L16.65,9 L16.65,9 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/parking-meter-m.svg b/data/styles/clear/style-clear/symbols/parking-meter-m.svg
index bc45161e88..29a4f7f014 100644
--- a/data/styles/clear/style-clear/symbols/parking-meter-m.svg
+++ b/data/styles/clear/style-clear/symbols/parking-meter-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="parking-meter-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M12.464,12 L11,12 L11,13.07 L12.464,13.07 C12.759,13.07 13,12.83 13,12.535 C13,12.24 12.76,12 12.464,12 L12.464,12 Z M17.134,7 L16,7 L16,9 L7,9 L7,7 L5.867,7 C5.388,7 5,7.389 5,7.867 L5,16.267 C5,17.224 5.776,17.999 6.733,17.999 L16.266,17.999 C17.224,17.999 17.999,17.224 17.999,16.267 L17.999,7.867 C18,7.389 17.612,7 17.134,7 L17.134,7 Z M12.464,15.07 L11,15.07 L11,17 L9,17 L9,10 L12.464,10 C13.862,10 15,11.138 15,12.535 C15,13.932 13.862,15.07 12.464,15.07 L12.464,15.07 Z M9.511,8 C9.195,7.581 9,7.065 9,6.5 C9,5.12 10.12,4 11.5,4 C12.881,4 14,5.12 14,6.5 C14,7.065 13.806,7.581 13.489,8 L9.511,8 L9.511,8 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/peak-l.svg b/data/styles/clear/style-clear/symbols/peak-l.svg
index a39190e851..e034cb4507 100644
--- a/data/styles/clear/style-clear/symbols/peak-l.svg
+++ b/data/styles/clear/style-clear/symbols/peak-l.svg
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="15px" height="15px" viewBox="0 0 15 15" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>peak-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <path d="M7.50002,0.999999917 C7.13891,0.999999917 6.97561,1.17289992 6.86807,1.36099992 L1.0903,11.9166999 C1.0267,12.0278999 1,12.1530999 1,12.2777999 C1,12.8194999 1.36111,13.0001999 1.72222,12.9999999 L13.27778,12.9999999 C13.63889,13.0001999 14,12.8194999 14,12.2777999 C14,12.1534999 13.9733,12.0281999 13.9097,11.9166999 L8.13192,1.36099992 C8.02431,1.17289992 7.86109,0.999999917 7.49998,0.999999917 L7.50002,0.999999917 Z" id="peakt-l" fill="#3C3E38" sketch:type="MSShapeGroup"></path>
+        <g id="peak-l" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M13.5,6.99999995 C13.1578947,6.9999312 13.0031988,7.16458745 12.9013158,7.34374995 L7.08552632,16.96875 C7.02524737,17.0748312 7,17.1938375 7,17.3125 C7,17.828125 7.34210526,18.0001375 7.68421053,18 L19.3157895,18 C19.6578947,18.0001375 20,17.828125 20,17.3125 C20,17.1938375 19.9747868,17.0748312 19.9144737,16.96875 L14.0986842,7.34374995 C13.9968012,7.16458745 13.8421053,6.9999312 13.5,6.99999995 L13.5,6.99999995 Z" id="path11349" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/peak-m.svg b/data/styles/clear/style-clear/symbols/peak-m.svg
index 49ce1a927e..49476090cd 100644
--- a/data/styles/clear/style-clear/symbols/peak-m.svg
+++ b/data/styles/clear/style-clear/symbols/peak-m.svg
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="11px" height="10px" viewBox="0 0 11 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>peak-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <path d="M5.5,1 C5.25,1 5.136955,1.1197 5.0625,1.25 L1.0625,8.25 C1.01845,8.327 1,8.4137 1,8.5 C1,8.875 1.25,9.0001 1.5,9 L9.5,9 C9.75,9.0001 10,8.875 10,8.5 C10,8.414 9.98155,8.3272 9.9375,8.25 L5.9375,1.25 C5.86304,1.1197 5.75,1 5.5,1 L5.5,1 Z" id="peakt-m" fill="#3C3E38" sketch:type="MSShapeGroup"></path>
+        <g id="peak-m" sketch:type="MSLayerGroup">
+            <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M11.5,7.00000002 C11.2631579,6.99995002 11.1560607,7.11970001 11.0855263,7.25000001 L7.05921053,14.2499999 C7.01747895,14.3271499 7,14.4136999 7,14.4999999 C7,14.8749999 7.23684211,15.0000999 7.47368421,14.9999999 L15.5263158,14.9999999 C15.7631579,15.0000999 16,14.8749999 16,14.4999999 C16,14.4136999 15.9825447,14.3271499 15.9407895,14.2499999 L11.9144737,7.25000001 C11.8439393,7.11970001 11.7368421,6.99995002 11.5,7.00000002 L11.5,7.00000002 Z" id="path11349-copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/peak-s.svg b/data/styles/clear/style-clear/symbols/peak-s.svg
index 0684e71ffc..787f109822 100644
--- a/data/styles/clear/style-clear/symbols/peak-s.svg
+++ b/data/styles/clear/style-clear/symbols/peak-s.svg
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="9px" height="8px" viewBox="0 0 9 8" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>peak-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <path d="M4.5,1.00000001 C4.31578947,0.999962512 4.23249168,1.08977501 4.17763158,1.18750001 L1.04605263,6.43749996 C1.01359474,6.49536246 1,6.56027496 1,6.62499996 C1,6.90624996 1.18421053,7.00007496 1.36842105,6.99999996 L7.63157895,6.99999996 C7.81578947,7.00007496 8,6.90624996 8,6.62499996 C8,6.56027496 7.98642368,6.49536246 7.95394737,6.43749996 L4.82236842,1.18750001 C4.76750832,1.08977501 4.68421053,0.999962512 4.5,1.00000001 L4.5,1.00000001 Z" id="peakt-s" fill="#3C3E38" sketch:type="MSShapeGroup"></path>
+        <g id="peak-s" sketch:type="MSLayerGroup">
+            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M8.5,5.00000001 C8.31578947,4.99996251 8.23249168,5.08977501 8.17763158,5.18750001 L5.04605263,10.4375 C5.01359474,10.4953625 5,10.560275 5,10.625 C5,10.90625 5.18421053,11.000075 5.36842105,11 L11.6315789,11 C11.8157895,11.000075 12,10.90625 12,10.625 C12,10.560275 11.9864237,10.4953625 11.9539474,10.4375 L8.82236842,5.18750001 C8.76750832,5.08977501 8.68421053,4.99996251 8.5,5.00000001 L8.5,5.00000001 Z" id="path11349-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+        </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/pharmacy-l.svg b/data/styles/clear/style-clear/symbols/pharmacy-l.svg
index 591e1daf50..d6be362bdb 100644
--- a/data/styles/clear/style-clear/symbols/pharmacy-l.svg
+++ b/data/styles/clear/style-clear/symbols/pharmacy-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pharmacy-l" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
-            <circle id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M8.02297041,15.2221062 L19.0047692,15.2221062 C19.8372528,15.2221062 20.5024476,14.4307366 20.5024476,13.4442123 C20.5024476,12.4646326 19.8305064,11.6663185 19.0047692,11.6663185 L8.02297041,11.6663185 C7.19048677,11.6663185 6.525292,12.4576881 6.525292,13.4442123 C6.525292,14.4237921 7.19723321,15.2221062 8.02297041,15.2221062 Z M5.02773961,13.4442123 C5.02773961,11.480405 6.35952442,9.88842468 8.02297041,9.88842468 L19.0047692,9.88842468 C20.6589895,9.88842468 22,11.484401 22,13.4442123 C22,15.4080196 20.6682152,17 19.0047692,17 L8.02297041,17 C6.36875012,17 5.02773961,15.4040237 5.02773961,13.4442123 L5.02773961,13.4442123 Z" id="Shape-Copy-5" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(13.513870, 13.444212) rotate(-45.000000) translate(-13.513870, -13.444212) "></path>
             <path d="M6.32773961,16.4442123 C6.32773961,14.480405 7.91268174,12.8884247 9.88459447,12.8884247 L14.8604603,12.8884247 L14.8604603,20 L9.88459447,20 C7.92019778,20 6.32773961,18.4040237 6.32773961,16.4442123 L6.32773961,16.4442123 Z" id="Rectangle-10-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(10.594100, 16.444212) rotate(-45.000000) translate(-10.594100, -16.444212) "></path>
         </g>
diff --git a/data/styles/clear/style-clear/symbols/pharmacy-m.svg b/data/styles/clear/style-clear/symbols/pharmacy-m.svg
index c3f8f75092..7bb17776bd 100644
--- a/data/styles/clear/style-clear/symbols/pharmacy-m.svg
+++ b/data/styles/clear/style-clear/symbols/pharmacy-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pharmacy-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <g id="Shape-+-Rectangle-10" transform="translate(12.511733, 11.704650) rotate(-45.000000) translate(-12.511733, -11.704650) translate(4.511733, 8.204650)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M1.32352941,3 L1.32352941,3 C1.32352941,3.82646646 1.91738774,4.5 2.6471702,4.5 L12.3528298,4.5 C13.0885747,4.5 13.6764706,3.83232553 13.6764706,3 C13.6764706,2.17353354 13.0826123,1.5 12.3528298,1.5 L2.6471702,1.5 C1.91142527,1.5 1.32352941,2.16767447 1.32352941,3 L1.32352941,3 Z M5.1159077e-13,3 C5.1159077e-13,1.34314575 1.17702484,4.54747351e-13 2.6471702,4.54747351e-13 L12.3528298,4.54747351e-13 C13.8148215,4.54747351e-13 15,1.34651712 15,3 C15,4.65685425 13.8229752,6 12.3528298,6 L2.6471702,6 C1.18517847,6 5.1159077e-13,4.65348288 5.1159077e-13,3 L5.1159077e-13,3 Z" id="Shape"></path>
                 <path d="M9.66338121e-13,3 C9.66338121e-13,1.34314575 1.34821122,1.82205833e-12 3.00214103,1.82200963e-12 L7.54117646,1.82187598e-12 L7.54117646,6 L3.00214103,6 C1.34410432,6 9.66338121e-13,4.65348288 9.66338121e-13,3 L9.66338121e-13,3 Z" id="Rectangle-10"></path>
diff --git a/data/styles/clear/style-clear/symbols/phone-l.svg b/data/styles/clear/style-clear/symbols/phone-l.svg
index a805c8a40d..ac2c99865d 100644
--- a/data/styles/clear/style-clear/symbols/phone-l.svg
+++ b/data/styles/clear/style-clear/symbols/phone-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="phone-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M16,6 C15,6 14.67371,6.3263 14,7 L6,15 C5.5,15.5 5,16 5,17 L5,18.5 C5,19.5 5.5,20 6,20.5 L6.5625,21.0625 L10.0625,17.5625 L9.5,17 C8.99991,16.5 9.5,16 9.5,16 L15,10.5 C15,10.5 15.5,10 16,10.5 L16.5625,11.0625 L20.0625,7.5625 L19.5,7 C19,6.5 18.5,6 17.5,6 L16,6 L16,6 Z M20.4375,7.9375 L16.9375,11.4375 L17.5,12 C17.85356,12.3535 18.64645,12.3536 19,12 L21,10 C21.35359,9.6463 21.35357,8.8535 21,8.5 L20.4375,7.9375 Z M10.4375,17.9375 L6.9375,21.4375 L7.5,22 C7.85362,22.3537 8.6464,22.3534 9,22 L11,20 C11.35372,19.6464 11.35352,18.8534 11,18.5 L10.4375,17.9375 Z" id="path5722-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/phone-m.svg b/data/styles/clear/style-clear/symbols/phone-m.svg
index 8c1e1ff62f..49471edd25 100644
--- a/data/styles/clear/style-clear/symbols/phone-m.svg
+++ b/data/styles/clear/style-clear/symbols/phone-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="phone-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M13.4999986,5.27166656 L4.99999863,13.7716665 L4.99999863,16.2716665 L6.31249862,17.5841665 L9.3124986,14.5841665 L8.4999986,13.7716665 L13.4999986,8.77166653 L14.3124986,9.58416653 L17.3124985,6.58416655 L15.9999985,5.27166656 L13.4999986,5.27166656 L13.4999986,5.27166656 Z M17.6874985,6.95916655 L14.6874986,9.95916652 L14.9999985,10.2716665 L15.9999985,10.2716665 L17.9999985,8.27166654 L17.9999985,7.27166654 L17.6874985,6.95916655 L17.6874985,6.95916655 Z M9.68749859,14.9591665 L6.68749862,17.9591665 L6.99999862,18.2716665 L7.99999861,18.2716665 L9.99999859,16.2716665 L9.99999859,15.2716665 L9.68749859,14.9591665 L9.68749859,14.9591665 Z" id="path5849-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/phone-s.svg b/data/styles/clear/style-clear/symbols/phone-s.svg
index bc08a4348d..e5e917ddbe 100644
--- a/data/styles/clear/style-clear/symbols/phone-s.svg
+++ b/data/styles/clear/style-clear/symbols/phone-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="phone-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M9.82352941,4 L4,9.5 L4,11.5 L5.05882353,12.5 L6.11764706,12.5 L7.17647059,11.5 L7.17647059,10.5 L6.11764706,9.5 L9.82352941,6 L10.8823529,7 L11.9411765,7 L13,6 L13,5 L11.9411765,4 L9.82352941,4 Z" id="path6264-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/picnic-l.svg b/data/styles/clear/style-clear/symbols/picnic-l.svg
index 83a5d36151..21b23e8bcc 100644
--- a/data/styles/clear/style-clear/symbols/picnic-l.svg
+++ b/data/styles/clear/style-clear/symbols/picnic-l.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>picnic-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="picnic-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="picnic-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M7,7 L20,7 L20,9 L7,9 L7,7 Z M5,13 L22,13 L22,15 L5,15 L5,13 Z" id="Rectangle-22-Copy-6" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M9.15878963,8.09961069 L11.1587896,8.09961069 L9,20 L7,20 L9.15878963,8.09961069 Z" id="Rectangle-32" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M15.8444102,7.97958624 L17.8444102,7.97958624 L20,20 L18,20 L15.8444102,7.97958624 Z" id="Rectangle-32-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-clear/symbols/picnic-m.svg b/data/styles/clear/style-clear/symbols/picnic-m.svg
index 9ef7630231..d8609fff63 100644
--- a/data/styles/clear/style-clear/symbols/picnic-m.svg
+++ b/data/styles/clear/style-clear/symbols/picnic-m.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>picnic-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="picnic-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="picnic-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M7.99634865,8 L6,8 L6,6 L17,6 L17,8 L15.016006,8 L15.9188947,12 L19,12 L19,13 L16.1446168,13 L17.036593,16.9516549 L15.036593,16.9516549 L14.1446168,13 L8.88726607,13 L8,17 L6,17 L6.88726607,13 L4,13 L4,12 L7.10908258,12 L7.99634865,8 Z M9.99634865,8 L13.016006,8 L13.9188947,12 L9.10908258,12 L9.99634865,8 Z" id="Rectangle-22" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/picnic-s.svg b/data/styles/clear/style-clear/symbols/picnic-s.svg
index e4d73479c9..6cfd9671dc 100644
--- a/data/styles/clear/style-clear/symbols/picnic-s.svg
+++ b/data/styles/clear/style-clear/symbols/picnic-s.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>picnic-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="picnic-s" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="picnic-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.97313072,6 L5,6 L5,5 L12,5 L12,6 L11.0358761,6 L11.3579373,8.00427246 L13,8.00427246 L13,9 L11.517938,9 L12,12 L11.0196533,12.0109253 L10.5202651,9 L6.5203832,9 L5.9880981,12.0187378 L5.00775144,12.0078125 L5.49106876,9 L4,9 L4,8.00427246 L5.65106955,8.00427246 L5.97313072,6 Z M7.04936432,6 L10.0226889,6 L10.355115,8.00427246 L6.69595689,8.00427246 L7.04936432,6 Z" id="Rectangle-22-Copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/pitch-l.svg b/data/styles/clear/style-clear/symbols/pitch-l.svg
index 90a0e3140e..07931f7537 100644
--- a/data/styles/clear/style-clear/symbols/pitch-l.svg
+++ b/data/styles/clear/style-clear/symbols/pitch-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pitch-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13,4 C11.89543,4 11,4.8954 11,6 C11,7.1046 11.89543,8 13,8 C14.10457,8 15,7.1046 15,6 C15,4.8954 14.10457,4 13,4 L13,4 Z M7.25,8 L7.75,10 C8,11 8.59716,11 9.34375,11 L11,11 C11.59375,12 11.31467,13.4718 11.5,15 L10.59375,15 C9.59375,15 8,16 9,18 L10.5,21 C11.5,23 13,21.5 12.5,20.5 L11,17.5 C10.75,17 11.2643,17 11.5,17 L13.96793,17 C13.96793,17 15.15167,19.6276 16.54603,21.4285 C17.06075,22.0933 17.63089,23 18.34453,23 C18.84453,23 19.70137,22.2273 18.78944,21.139 C17.0817,19.101 16,17 16,16 C16,14.8368 15.79566,12.3873 15.5,11 L17,11 C17.488,11.9781 18.25,13.5 18.25,13.5 C18.80274,14.4574 20,14.3851 20,13.5 C20,13.3785 20,13.1111 19.86048,12.8232 L18.25,9.5 C18.14722,9.2879 17.99658,9 17.25,9 L9.5,9 L8.75,6.5 C8.45,5.5 7,5.5 7,6.5 C7,7 7.17716,7.6071 7.25,8 L7.25,8 Z" id="path10527-1-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/pitch-m.svg b/data/styles/clear/style-clear/symbols/pitch-m.svg
index 5e389544e9..9ae3290094 100644
--- a/data/styles/clear/style-clear/symbols/pitch-m.svg
+++ b/data/styles/clear/style-clear/symbols/pitch-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pitch-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.224255,5 C10.468495,5 9.855835,5.6126 9.855835,6.3684 C9.855835,7.1242 10.468495,7.7368 11.224255,7.7368 C11.980015,7.7368 12.592675,7.1242 12.592675,6.3684 C12.592675,5.6126 11.980015,5 11.224255,5 L11.224255,5 Z M7.290045,7.7368 L7.632155,9.1053 C7.803205,9.7895 8.211785,9.7895 8.722615,9.7895 L9.855835,9.7895 C10.262085,10.4737 10.071135,11.586 10.197945,12.6316 L9.577875,12.6316 C8.893665,12.6316 7.803225,13.3158 8.487415,14.6842 L9.513735,16.7369 C10.197925,18.1053 11.224245,17.079 10.882155,16.3948 L9.855835,14.3421 C9.684785,14 10.036675,14 10.197945,14 L11.886525,14 C11.886525,14 12.696455,15.6926 13.650485,16.9248 C14.002665,17.3796 14.392765,18 14.881045,18 C15.223145,18 15.809405,17.4713 15.185455,16.7267 C14.017005,15.3323 13.276885,13.8947 13.276885,13.2105 C13.276885,12.4147 13.137075,10.7387 12.934785,9.7895 L13.961105,9.7895 C14.294995,10.4587 14.881045,11.5 14.881045,11.5 C15.259235,12.1551 15.881045,12.1056 15.881045,11.5 C15.881045,11.417 15.871045,11.2383 15.785545,11.0369 L14.816325,8.7632 C14.753025,8.6148 14.642935,8.4211 14.132115,8.4211 L8.829485,8.4211 L8.316325,6.7105 C8.111065,6.0263 7.118955,6.0263 7.118955,6.7105 C7.118955,7.0526 7.240165,7.468 7.290005,7.7368 L7.290045,7.7368 Z" id="path10527-1-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/pitch-s.svg b/data/styles/clear/style-clear/symbols/pitch-s.svg
index 3245d19c23..f87f42ba21 100644
--- a/data/styles/clear/style-clear/symbols/pitch-s.svg
+++ b/data/styles/clear/style-clear/symbols/pitch-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pitch-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7.99993334,3.5 C7.44765334,3.5 6.99993334,3.9477 6.99993334,4.5 C6.99993334,5.0523 7.44765334,5.5 7.99993334,5.5 C8.55221334,5.5 8.99993334,5.0523 8.99993334,4.5 C8.99993334,3.9477 8.55221334,3.5 7.99993334,3.5 L7.99993334,3.5 Z M5.40618334,4.7188 C5.18754334,4.7188 4.99993334,4.8517 4.99993334,5.125 C4.99993334,5.3982 5.08503334,5.7541 5.12493334,5.9688 L5.40618334,6.9688 C5.55469334,7.5123 5.87307334,7.5 6.28118334,7.5 L7.18743334,7.5 C7.51198334,8.0467 7.39862334,8.6646 7.49993334,9.5 L6.99993334,9.5 C6.45332334,9.5 5.54710334,9.8131 6.09368334,10.9063 L6.90618334,12.5625 C7.10253334,12.9552 7.30084334,12.9977 7.49993334,13 C7.85502334,13 8.15100334,12.6426 7.99993334,12.2813 L7.37493334,10.7813 C7.25706334,10.4994 7.52734334,10.5 7.65618334,10.5 L8.99993334,10.5 C8.99993334,10.5 9.45651334,11.7032 10.2186833,12.6875 C10.5000333,13.0509 10.7973433,13.5 11.1874333,13.5 C11.4607333,13.5 11.9359033,13.1261 11.4374333,12.5313 C10.5039533,11.4172 9.99993334,10.0466 9.99993334,9.5 C9.99993334,8.8643 9.81778334,8.2583 9.65618334,7.5 L10.4686833,7.5 C10.7354333,8.0347 11.1874333,8.875 11.1874333,8.875 C11.4895733,9.3983 11.9999333,9.3588 11.9999333,8.875 C11.9999333,8.808 12.0059333,8.6608 11.9374333,8.5 L11.1874333,6.7813 C11.1371333,6.6627 11.0642833,6.5 10.6561833,6.5 L6.37493334,6.5 L5.96868334,5.125 C5.88668334,4.8517 5.62482334,4.7188 5.40618334,4.7188 L5.40618334,4.7188 Z" id="path10527-1-3-2-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-l.svg b/data/styles/clear/style-clear/symbols/place-of-worship-l.svg
index e75b9ebbf8..24b4b9c5a9 100644
--- a/data/styles/clear/style-clear/symbols/place-of-worship-l.svg
+++ b/data/styles/clear/style-clear/symbols/place-of-worship-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="place-of-worship-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,5 C13.5,5 11,6 11,7 L11,9 C11,10 9,10 9,11 L9,20 L18,20 L18,11 C18,10 16,10 16,8.8125 L16,7 C16,6 13.5,5 13.5,5 L13.5,5 Z M5,13 L5,20 L7,20 L7,13 C7,12 6,12 6,12 C6,12 5,12 5,13 L5,13 Z M20,13 L20,20 L22,20 L22,13 C22,12 21,12 21,12 C21,12 20,12 20,13 L20,13 Z" id="path8846-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-m.svg b/data/styles/clear/style-clear/symbols/place-of-worship-m.svg
index 59ee665983..311f5f48eb 100644
--- a/data/styles/clear/style-clear/symbols/place-of-worship-m.svg
+++ b/data/styles/clear/style-clear/symbols/place-of-worship-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="place-of-worship-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,5 L10,6.5 L10,8 L8,10 L8,16.5 L15,16.5 L15,10 L13,8 L13,6.5 L11.5,5 Z M5,11 L5,16.5 L6.5,16.5 L6.5,11 L5,11 Z M16.5,11 L16.5,16.5 L18,16.5 L18,11 L16.5,11 Z" id="path9064-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/place-of-worship-s.svg b/data/styles/clear/style-clear/symbols/place-of-worship-s.svg
index 3c94189751..8a573373d0 100644
--- a/data/styles/clear/style-clear/symbols/place-of-worship-s.svg
+++ b/data/styles/clear/style-clear/symbols/place-of-worship-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="place-of-worship-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,4 L7,4.9411 L7,6 L6,7 L6,12 L11,12 L11,7 L10,6 L10,5.0404 L8.5,4 Z M4,8 L4,12 L5,12 L5,8 L4,8 Z M12,8 L12,12 L13,12 L13,8 L12,8 Z" id="path8846-6-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/police-l.svg b/data/styles/clear/style-clear/symbols/police-l.svg
index 9c02a80bc6..ecae1eb9a7 100644
--- a/data/styles/clear/style-clear/symbols/police-l.svg
+++ b/data/styles/clear/style-clear/symbols/police-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="police-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11,4 L10,5 L10,6 L17,6 L17,5 L16,4 L11,4 L11,4 Z M10,7 L10,7.5 C10,9.433 11.56702,11 13.5,11 C15.43298,11 17,9.433 17,7.5 L17,7 L10,7 L10,7 Z M9,12 C7.5,12 7,14.5 7,16 L7,22 L9.6875,22 L16.5,12 L9,12 L9,12 Z M18,12 L11.1875,22 L20,22 L20,16 C20,14.5 19.5,12 18,12 L18,12 Z" id="rect7805-5-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/police-m.svg b/data/styles/clear/style-clear/symbols/police-m.svg
index b94746b236..1c71083197 100644
--- a/data/styles/clear/style-clear/symbols/police-m.svg
+++ b/data/styles/clear/style-clear/symbols/police-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="police-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10,4 L9,4.5 L9,5.5 L14,5.5 L14,4.5 L13,4 L10,4 Z M9,6.5 C8.9667,6.6627 9,6.8274 9,7 C9,8.3807 10.11931,9.5 11.5,9.5 C12.88069,9.5 14,8.3807 14,7 L14,6.5 L9,6.5 Z M9,10.5 C7.91667,10.5 7.01415,12.2917 7,13.375 L7,17.5 L8.53125,17.5 L13,10.5 L9,10.5 Z M14.5,10.5 L10.03125,17.5 L16,17.5 L16,13.375 C16,12.2916 15.58334,10.5 14.5,10.5 L14.5,10.5 Z" id="rect7805-5-4-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/police-s.svg b/data/styles/clear/style-clear/symbols/police-s.svg
index f32d34eaf2..5416197136 100644
--- a/data/styles/clear/style-clear/symbols/police-s.svg
+++ b/data/styles/clear/style-clear/symbols/police-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="police-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7,5 L10,5 L10,4 L7,4 L7,5 Z M7,5.75 C7,6.7165 7.53351,7.5 8.5,7.5 C9.46649,7.5 10,6.7165 10,5.75 L10,5.5 L7,5.5 L7,5.75 Z M6,8 C5.5,8 5,9.5 5,10 L5,13 L6.59375,13 L10,8 L6,8 Z M11,8 L7.59375,13 L12,13 L12,10 C12,9.5 11.5,8 11,8 L11,8 Z" id="path5442-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/postbox-l.svg b/data/styles/clear/style-clear/symbols/postbox-l.svg
index aabb780528..a2245b219f 100644
--- a/data/styles/clear/style-clear/symbols/postbox-l.svg
+++ b/data/styles/clear/style-clear/symbols/postbox-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="postbox-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M19,15.203 L19,17 L8,17 L8,14.95 L5,11.95 L5,21 L22,21 L22,12.203 L19,15.203 L19,15.203 Z M15.904,10.762 L15.88,5.021 L8.99,11.913 L14.84,11.913 L15.904,10.762 L15.904,10.762 Z M16.375,15 L21.713,9.662 L17.076,5.024 L17.076,11.235 L15.335,13.081 C15.316,13.101 15.291,13.111 15.263,13.111 L8.989,13.111 L10.878,15 L16.375,15 L16.375,15 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/postbox-m.svg b/data/styles/clear/style-clear/symbols/postbox-m.svg
index 1639d7ccda..5a5128dea3 100644
--- a/data/styles/clear/style-clear/symbols/postbox-m.svg
+++ b/data/styles/clear/style-clear/symbols/postbox-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="postbox-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M17,10.469 L17,18 L6,18 L6,10.25 L8,12.25 L8,14 L15,14 L15,12.469 L17,10.469 L17,10.469 Z M17.606,7.449 L13.056,12 L10.165,12 L8.124,10 L12.827,10 L13.999,8.619 L13.999,3.963 L17.606,7.449 L17.606,7.449 Z M12.403,9 L8.125,9 L10.623,6.461 L13,3.963 L13,8.215 L12.403,9 L12.403,9 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/pub-l.svg b/data/styles/clear/style-clear/symbols/pub-l.svg
index 38f35aafc6..c4562e047f 100644
--- a/data/styles/clear/style-clear/symbols/pub-l.svg
+++ b/data/styles/clear/style-clear/symbols/pub-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pub-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M6,6 L8,22 C8.0625,22.5 8.5,23 9,23 L18,23 C18.5,23 18.9375,22.5 19,22 L21,6 L6,6 Z M8.25,8 L18.75,8 L18.28125,12 L8.71875,12 L8.25,8 Z" id="path10133-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/pub-m.svg b/data/styles/clear/style-clear/symbols/pub-m.svg
index 02f0f69661..f369f2d1e9 100644
--- a/data/styles/clear/style-clear/symbols/pub-m.svg
+++ b/data/styles/clear/style-clear/symbols/pub-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pub-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6,5 L7.5,18 C7.5577,18.5 8,19 8.5,19 L14.5,19 C15,19 15.44231,18.5 15.5,18 L17,5 L6,5 Z M8,7 L15,7 L14.6,10 L8.4,10 L8,7 Z" id="path10185-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/pub-s.svg b/data/styles/clear/style-clear/symbols/pub-s.svg
index bc2c4d6e6f..bd6a2fba78 100644
--- a/data/styles/clear/style-clear/symbols/pub-s.svg
+++ b/data/styles/clear/style-clear/symbols/pub-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="pub-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5,4.3622 L6,12.8622 C6.0357,13.1479 6.21428,13.3622 6.5,13.3622 L10.5,13.3622 C10.78572,13.3622 10.94996,13.1457 11,12.8622 L12,4.3622 L5,4.3622 Z M6.5,5.3622 L10.5,5.3622 L10.25,7.3622 L6.75,7.3622 L6.5,5.3622 Z" id="path10133-9-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/railway-crossing.svg b/data/styles/clear/style-clear/symbols/railway-crossing.svg
index 0f37d9aa97..ba1ae7eea8 100644
--- a/data/styles/clear/style-clear/symbols/railway-crossing.svg
+++ b/data/styles/clear/style-clear/symbols/railway-crossing.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="10px" viewBox="0 0 17 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>railway-crossing</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
diff --git a/data/styles/clear/style-clear/symbols/recycling-l.svg b/data/styles/clear/style-clear/symbols/recycling-l.svg
index c1487ec6f0..6ee6cf1d77 100644
--- a/data/styles/clear/style-clear/symbols/recycling-l.svg
+++ b/data/styles/clear/style-clear/symbols/recycling-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="recycling-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11.5,5 C11.223,5 11,5.223 11,5.5 L11,7 L8,7 C7.446,7 7,7.446 7,8 C7,8.554 7.446,9 8,9 L19,9 C19.554,9 20,8.554 20,8 C20,7.446 19.554,7 19,7 L16,7 L16,5.5 C16,5.223 15.77701,5 15.5,5 L11.5,5 Z M12,6 L15,6 L15,7 L12,7 L12,6 Z M8,10 C7.446,10 6.92453,10.4212 7.01563,10.9285714 L9,22.0714286 C9.0904,22.5788929 9.446,23 10,23 L17,23 C17.554,23 17.9089,22.5788 18,22.0714286 L19.98437,10.9285714 C20.07477,10.4211071 19.554,10 19,10 L8,10 Z" id="rect5636-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/recycling-m.svg b/data/styles/clear/style-clear/symbols/recycling-m.svg
index ae6d81a231..f3059f9e5b 100644
--- a/data/styles/clear/style-clear/symbols/recycling-m.svg
+++ b/data/styles/clear/style-clear/symbols/recycling-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="recycling-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M9.518,5 C9.31389,5 9.25,5.1643 9.25,5.3684 L9.25,7 L6.73685,7 C6.32863,7 6,7.092 6,7.5 C6,7.9083 6.32863,8 6.73685,8 L16.26316,8 C16.67137,8 17,7.908 17,7.5 C17,7.0918 16.67137,7 16.26316,7 L13.75,7 L13.75,5.3684 C13.75,5.1643 13.58611,5 13.382,5 L9.518,5 Z M10,5.7368 L13,5.7368 L13,7 L10,7 L10,5.7368 Z M6.73685,9 C6.32863,9 5.94851,9.3343 6.01563,9.7369 L7.42105,18.2632 C7.48745,18.6659 7.74968,19 8.1579,19 L14.78947,19 C15.19769,19 15.45919,18.6658 15.52632,18.2632 L16.98437,9.7369 C17.05317,9.3346 16.67137,9 16.26316,9 L6.73685,9 Z" id="path5652-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/recycling-s.svg b/data/styles/clear/style-clear/symbols/recycling-s.svg
index 3deb84be10..a8b13ac6bc 100644
--- a/data/styles/clear/style-clear/symbols/recycling-s.svg
+++ b/data/styles/clear/style-clear/symbols/recycling-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="recycling-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M6.5,4 L6.5,6 L5,6 L5,7 L12,7 L12,6 L10.5,6 L10.5,4 L6.5,4 Z M7,5 L10,5 L10,6 L7.01005,6 L7,5 Z M5,7.5 L6,14 L6.32584,14 L10.58899,14 L11,14 L12,7.5 L5,7.5 Z" id="path5654-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/remains-l.svg b/data/styles/clear/style-clear/symbols/remains-l.svg
index 59b4cd7524..c6c51a1b72 100644
--- a/data/styles/clear/style-clear/symbols/remains-l.svg
+++ b/data/styles/clear/style-clear/symbols/remains-l.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="27px" height="28px" viewBox="0 0 27 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>remains-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="fort-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="fort-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M10,6.01147485 L10,9 L10.9974258,9 L10.9974258,6.01147487 L13,6 L13,9 L14,9 L14.007736,6 L16,6.01147487 L16,9 L17,9 L17.021636,6.01147485 L19.0299747,6.0233339 L19.0299747,10 L8,10 L8,6 L10,6.01147485 Z" id="Shape-Copy-20" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M10.0013914,11 L17,11 L19,21 L8,21 L10.0013914,11 Z" id="Shape-Copy-19" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-clear/symbols/remains-m.svg b/data/styles/clear/style-clear/symbols/remains-m.svg
index 66ecf96aa9..164a552141 100644
--- a/data/styles/clear/style-clear/symbols/remains-m.svg
+++ b/data/styles/clear/style-clear/symbols/remains-m.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="23px" height="24px" viewBox="0 0 23 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>remains-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="fort-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="fort-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M14,9 L14,7 L13,7 L13,8.99999998 L12,8.99999998 L12,7 L11,7 L11,8.99999998 L9.95655274,8.99999998 L9.95655276,7 L9,7 L9,9 L7,8.99108016 L7,6 L16,6 L16,9 L14,9 Z" id="Shape-Copy-16" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(11.500000, 7.500000) rotate(-180.000000) translate(-11.500000, -7.500000) "></path>
             <path d="M14,18 L8.87660587,18 L7,10 L16,10 L14,18 Z" id="Shape-Copy-15" fill="#FFFFFF" sketch:type="MSShapeGroup" transform="translate(11.500000, 14.000000) rotate(-180.000000) translate(-11.500000, -14.000000) "></path>
         </g>
diff --git a/data/styles/clear/style-clear/symbols/remains-s.svg b/data/styles/clear/style-clear/symbols/remains-s.svg
index 3dc4e23e72..c1794c510e 100644
--- a/data/styles/clear/style-clear/symbols/remains-s.svg
+++ b/data/styles/clear/style-clear/symbols/remains-s.svg
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="17px" height="18px" viewBox="0 0 17 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>remains-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="fort-s" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="fort-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7,3.9999999 L7.01171875,4.9749596 L8,4.9749596 L8,3.9999999 L9,3.9999999 L9,4.9749596 L10,4.9749596 L10,4 L12,4 L12,5.9499192 L5,5.9999999 L5,4 L7,3.9999999 Z" id="Shape-Copy-18" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M6.00228357,7 L11,7 L12,13 L5,13 L6.00228357,7 Z" id="Shape-Copy-17" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
diff --git a/data/styles/clear/style-clear/symbols/restaurant-l.svg b/data/styles/clear/style-clear/symbols/restaurant-l.svg
index b8f7aaa543..2db3abf92a 100644
--- a/data/styles/clear/style-clear/symbols/restaurant-l.svg
+++ b/data/styles/clear/style-clear/symbols/restaurant-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="restaurant-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#AB842F" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M8.5,4 C8,4 8,4.5 8,4.5 L8,10.5 C8,11 8.5,11.5 9,12 C9.5,12.5 9.5,13 9.5,13.5 L9.5,15 C9.5,15.5 9,21.5 9,21.5 C8.9617,21.9985 9.5,23 10.5,23 C11.5,23 12.03846,22 12,21.5 C12,21.5 11.5,15.5 11.5,15 L11.5,13.5 C11.5,13 11.5,12.5 12,12 C12.46054,11.539461 13,11 13,10.5 L13,4.5 C13,4.5 13,4 12.5,4 C12,4 12,4.5 12,4.5 L12,9 C12,9 12,9.5 11.5,9.5 C11,9.5 11,9 11,9 L11,4.5 C11,4.5 11,4 10.5,4 C10,4 10,4.5 10,4.5 L10,9 C10,9 10,9.5 9.5,9.5 C9,9.5 9,9 9,9 L9,4.5 C9,4.5 9,4 8.5,4 L8.5,4 Z M19,4 C18,4 16.13246,4.2351 15.5,5.5 C15,6.5 15,9 15,10 L15,15 C15,15.5 15.5,16 16,16 L17,16 L17,22 C17,22.5 17.5,23 18,23 C18.5,23 19,22.5 19,22 L19,4 Z" id="path5304" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/restaurant-m.svg b/data/styles/clear/style-clear/symbols/restaurant-m.svg
index 3cb455e5a6..2d7b34f63a 100644
--- a/data/styles/clear/style-clear/symbols/restaurant-m.svg
+++ b/data/styles/clear/style-clear/symbols/restaurant-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="restaurant-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#AB842F" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M8,5 L7,5 L7,9.5 C7,10.2777 8,10.2222 8,11 L8,18 C8,18.3889 8.5,19 9,19 C9.5,19 10,18.5 10,18 L10,11 C10,10.2222 11,10.2777 11,9.5 L11,5 L10,5 L10,8 L9.5,8 L9.5,5 L8.5,5 L8.5,8 L8,8 L8,5 Z M16,5 C15.22222,5 13.99192,5.5162 13.5,6.5 C13.11111,7.2777 13,9 13,10 L13,13 C13,13.5 13.61111,14 14,14 L14,18 C14,18.5 14.5,19 15,19 C15.5,19 16,18.5 16,18 L16,5 Z" id="rect6396-83" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/restaurant-s.svg b/data/styles/clear/style-clear/symbols/restaurant-s.svg
index c91edba15e..2dfe91a59d 100644
--- a/data/styles/clear/style-clear/symbols/restaurant-s.svg
+++ b/data/styles/clear/style-clear/symbols/restaurant-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="restaurant-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#AB842F" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.5,4 L5,4 L5,7 C5,7.5 6,7.5 6,8 L6,14 L7,14 L7,8 C7,7.5 8,7.5 8,7 L8,4 L7.5,4 L7.5,6 L6.75,6 L6.75,4 L6.25,4 L6.25,6 L5.5,6 L5.5,4 Z M12,4 C11.5,4 10.56623,4.1176 10.25,4.75 C10,5.25 10,6 10,7 L10,9.5 L11,9.5 L11,14 L12,14 L12,4 Z" id="rect6396-8-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/school-l.svg b/data/styles/clear/style-clear/symbols/school-l.svg
index 44ef7a0292..af0870b514 100644
--- a/data/styles/clear/style-clear/symbols/school-l.svg
+++ b/data/styles/clear/style-clear/symbols/school-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="school-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M15.75,4 C14.7805,4 14,4.7805 14,5.75 C14,6.7195 14.7805,7.5 15.75,7.5 C16.7195,7.5 17.5,6.7195 17.5,5.75 C17.5,4.7805 16.7195,4 15.75,4 L15.75,4 Z M7.75,6 C6.7805,6 6,6.7805 6,7.75 C6,8.7195 6.7805,9.5 7.75,9.5 C8.7195,9.5 9.5,8.7195 9.5,7.75 C9.5,6.7805 8.7195,6 7.75,6 L7.75,6 Z M17,8 C16.627322,8 16.013592,8.1345 15.5,8.5 L12.25,10.8125 C11.368196,11.44 12.17732,12.5443 13,12 L15.125,10.59375 C15.125,10.59375 16.526043,13.598 16,15 C15.98243,15.04683 15.96749,15.08933 15.96875,15.125 L13.78125,20.9375 C13.530309,21.606628 14.013036,22.006672 14.5,22 C14.81932,21.9956 15.124779,21.806965 15.28125,21.4375 L18,15 C18,15 18.5,17.9998 20.5,18 C21.70185,18.0001 22.583333,18 23.25,18 C24,18 24,17.25 24,17.25 C24,17.25 24,16.5 23.25,16.5 C22.75,16.5 21.5,16.4998 21,16.5 C19.932813,16.5004 20,14.8975 20,14 C20,12.4998 19,10 19,10 L22,12 C22.906394,12.6043 23.691522,11.5343 22.8125,10.875 L19.5,8.5 C18.896477,8.0701 18.703177,8.0001 18,8 L17,8 L17,8 Z M6.5,10 C6,10 5.763524,10.2365 5.5,10.5 L3.375,12.625 C3.1014,12.8986 3,13.1435 3,13.5 C3,14 3.764327,14.2356 4.1875,13.8125 L6,12 C7,12 7.375,14.5 7,15.5 L5.5,19.5 C5.084539,20.6079 6.644264,20.9486 7,20 L8.5,16 C8.5,16 9,17 10,17 L13,17 C14,17 14,15.5 13,15.5 L10.5,15.5 C10,15.5 10,14.5 10,14 C10,12 9,10 8,10 L6.5,10 Z" id="rect6848-8-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/school-m.svg b/data/styles/clear/style-clear/symbols/school-m.svg
index 1a3eef8fcf..aebcad165f 100644
--- a/data/styles/clear/style-clear/symbols/school-m.svg
+++ b/data/styles/clear/style-clear/symbols/school-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="school-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M12.75,5 C12.05964,5 11.5,5.5596 11.5,6.25 C11.5,6.9404 12.05964,7.5 12.75,7.5 C13.44036,7.5 14,6.9404 14,6.25 C14,5.5596 13.44036,5 12.75,5 L12.75,5 Z M7.0625,6 C6.37214,6 5.8125,6.5596 5.8125,7.25 C5.8125,7.9404 6.37214,8.5 7.0625,8.5 C7.75286,8.5 8.3125,7.9404 8.3125,7.25 C8.3125,6.5596 7.75286,6 7.0625,6 L7.0625,6 Z M13.75,8 C13.47049,8 13.01019,8.1009 12.625,8.375 L10.1875,10.125 C9.52615,10.5956 10.133,11.4082 10.75,11 L12.34375,9.9375 C12.34375,9.9375 12.78038,10.2936 13,11 L12.9688,12.8438 L11.3438,17.1875 C11.15559,17.6894 11.50983,18.005 11.87505,18 C12.11454,18 12.35144,17.8396 12.4688,17.5625 L14.50005,13 C14.50005,13 14.87505,14.9999 16.37505,15 C17.27644,15.0001 18.00005,15 18.50005,15 C19.00005,15 19.00005,14.5 19.00005,14.5 C19.00005,14.5 19.00005,14 18.50005,14 C18.12505,14 16.87505,13.9999 16.50005,14 C16.50005,14 16.00005,14 16.00005,13 C16.00005,12.2963 15.21983,10.5016 15.00005,10 L15.00005,9.5 L17.50005,10.875 C18.17985,11.3283 18.78432,10.5258 18.12505,10.0313 L15.50005,8.5 C14.98309,8.2096 14.41782,8 13.75005,8 L13.75,8 Z M6.625,9 C6.25,9 6.07264,9.1774 5.875,9.375 L4.28125,10.9688 C4.07605,11.174 4,11.3576 4,11.625 C4,12 4.55763,12.1923 4.875,11.875 L6.25,10.5 C6.5648,10.5 7,10.539 7,11 L7,13.125 L5.875,16.125 C5.5634,16.9559 6.7332,17.2115 7,16.5 L8.125,13.5 C8.125,13.5 8.5,14 9.25,14 L11.4375,14 C12.1875,14 12.1875,13 11.4375,13 L9.5,13 C9.5,13 9,13 9,12.5 L9,11.75 C9,10.25 8.5,9 7.75,9 L6.625,9 L6.625,9 Z" id="path17507-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/school-s.svg b/data/styles/clear/style-clear/symbols/school-s.svg
index c5e082eaef..71c7d7e9a6 100644
--- a/data/styles/clear/style-clear/symbols/school-s.svg
+++ b/data/styles/clear/style-clear/symbols/school-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="school-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M10,3.5 C9.44772,3.5 9,3.9477 9,4.5 C9,5.0523 9.44772,5.5 10,5.5 C10.55228,5.5 11,5.0523 11,4.5 C11,3.9477 10.55228,3.5 10,3.5 L10,3.5 Z M6,4.5 C5.44772,4.5 5,4.9477 5,5.5 C5,6.0523 5.44772,6.5 6,6.5 C6.55228,6.5 7,6.0523 7,5.5 C7,4.9477 6.55228,4.5 6,4.5 L6,4.5 Z M10.5,6 L10,6 L8,7 L8,8 L10,7 L10,8 L10,9.5625 L9,13 L10,13 L11,9.5 C11,9.5 11.25,10.9999 12.25,11 C12.85093,11.0001 13.66667,11 14,11 L14,10.25 C13.75,10.25 12.75,10.2499 12.5,10.25 C11.96641,10.2502 12,9.4488 12,9 C12,8.2499 11.5,7 11.5,7 L13,7.9375 C13.4532,8.2396 13.84576,7.7046 13.40625,7.375 L11.75,6.25 C11.44824,6.0351 11.35159,6.0001 11,6 L10.5,6 Z M5.75,7 C5.5,7 5.38176,7.1183 5.25,7.25 L4.1875,8.3125 C4.0507,8.4493 4,8.5718 4,8.75 C4,9 4.38216,9.1178 4.59375,8.9063 L5.5,8 L6,8 L6,9 L5,11.75 C4.79782,12.306 5.57214,12.4743 5.75,12 L6.25463,10.7 L9,10.7 L9,10 L7.5,10 L7.5,8 C7.5,7.5 7,7 6.5,7 L5.75,7 Z" id="path17501-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/shoes-l.svg b/data/styles/clear/style-clear/symbols/shoes-l.svg
index b7bb7d1de8..8583cd3ec8 100644
--- a/data/styles/clear/style-clear/symbols/shoes-l.svg
+++ b/data/styles/clear/style-clear/symbols/shoes-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="shoes-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M6,22 L10,22 L10,19 L11,19 L14,22 L16,22 L22.64,19.473 C22.64,19.473 22.74,17.598 20.285,17.598 C15.234,17.598 13.786,13.727 14.001,12.184 C14.216,10.641 15.001,5 15.001,5 L6.001,7 L7.001,14 L6,22 L6,22 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/shoes-m.svg b/data/styles/clear/style-clear/symbols/shoes-m.svg
index f59464d949..ec211b59bb 100644
--- a/data/styles/clear/style-clear/symbols/shoes-m.svg
+++ b/data/styles/clear/style-clear/symbols/shoes-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="shoes-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M6.086,18 L8.987,18 L8.987,14.903 L9.787,14.903 L12.187,18 L13.787,18 L19,15.978 C19,15.978 19.079,14.478 17.115,14.478 C13.074,14.478 12.015,11.382 12.187,10.148 C12.359,8.914 12.987,4.4 12.987,4.4 L6.086,6 L6.086,18 L6.086,18 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg
index 2a58309d3a..0638879f1f 100644
--- a/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg
+++ b/data/styles/clear/style-clear/symbols/shop-bicycle-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="shop-bicycle-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15.875,5 C15.313,5.076 15.238,6.058 15.781,6.219 L18,7.094 L18,9 L11,9 L11,8 L12.375,8 C12.705,8 13,7.705 13,7.375 C13,7.045 12.705,6.745 12.375,6.75 L8.5,6.75 C8.438,6.74 8.375,6.74 8.312,6.75 C7.985,6.799 7.732,7.142 7.781,7.469 C7.83,7.796 8.173,8.049 8.5,8 L10,8 L10,9 L8.938,12.125 C8.638,12.053 8.323,12 8,12 C5.791,12 4,13.791 4,16 C4,18.209 5.791,20 8,20 C10.209,20 12,18.209 12,16 C12,15.699 11.938,15.406 11.875,15.125 L13,15.125 C13.199,15.115 13.391,15.01 13.5,14.844 L16.875,10 L17,10 L18,10 L18.688,12.031 C16.626,12.191 15,13.896 15,16 C15,18.209 16.791,20 19,20 C21.209,20 23,18.209 23,16 C23,14.172 21.77,12.665 20.094,12.188 L19,9 L19,6.656 C19,6.551 18.957,6.445 18.906,6.344 C18.902,6.334 18.91,6.321 18.906,6.313 C18.891,6.282 18.863,6.25 18.844,6.219 C18.813,6.174 18.789,6.133 18.75,6.094 C18.733,6.078 18.706,6.076 18.688,6.063 C18.67,6.048 18.645,6.045 18.626,6.032 C18.594,6.013 18.568,5.982 18.532,5.97 L18.501,5.939 L18.063,5.783 L16.219,5.033 C16.155,5.009 16.071,5.005 16,5.003 C15.953,5.003 15.922,4.991 15.875,5.003 L15.875,5 L15.875,5 Z M11,10 L15.406,10 L12.687,13.875 L11.375,13.875 C11.065,13.381 10.676,12.975 10.187,12.656 L11,10 L11,10 Z M8,13.5 C9.381,13.5 10.5,14.619 10.5,16 C10.5,17.381 9.381,18.5 8,18.5 C6.619,18.5 5.5,17.381 5.5,16 C5.5,14.619 6.619,13.5 8,13.5 L8,13.5 Z M19,13.5 C20.381,13.5 21.5,14.619 21.5,16 C21.5,17.381 20.381,18.5 19,18.5 C17.619,18.5 16.5,17.381 16.5,16 C16.5,15.827 16.529,15.662 16.562,15.5 C16.795,14.361 17.792,13.5 19,13.5 L19,13.5 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg b/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg
index bb59459b72..13cd39c075 100644
--- a/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg
+++ b/data/styles/clear/style-clear/symbols/shop-bicycle-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="shop-bicycle-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M14,6 L14,7 L15,7.5 L15,9 L10,9 L10,8 L11,8 L11,7.5 L10,7 L8,7 L8,8 L9,8 L9,9 L7.75,11.125 C7.504,11.061 7.266,11 7,11 C5.344,11 4,12.344 4,14 C4,15.656 5.344,17 7,17 C8.656,17 10,15.656 10,14 L11,14 L13.5,10 L15,10 L15.531,11.062 C14.103,11.292 13,12.507 13,14 C13,15.656 14.344,17 16,17 C17.656,17 19,15.656 19,14 C19,12.561 17.978,11.354 16.625,11.062 L16,9.5 L16,7 L15.5,6.5 L14,6 L14,6 Z M9.5,10 L12.5,10 L10.5,13 L9.812,13 C9.6,12.408 9.224,11.885 8.718,11.531 L9.5,10 L9.5,10 Z M7,12.25 C7.967,12.25 8.75,13.033 8.75,14 C8.75,14.967 7.967,15.75 7,15.75 C6.033,15.75 5.25,14.967 5.25,14 C5.25,13.033 6.033,12.25 7,12.25 L7,12.25 Z M16,12.25 C16.967,12.25 17.75,13.033 17.75,14 C17.75,14.967 16.967,15.75 16,15.75 C15.033,15.75 14.25,14.967 14.25,14 C14.25,13.033 15.033,12.25 16,12.25 L16,12.25 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/shop-l.svg b/data/styles/clear/style-clear/symbols/shop-l.svg
index 296813151d..6e854dbb98 100644
--- a/data/styles/clear/style-clear/symbols/shop-l.svg
+++ b/data/styles/clear/style-clear/symbols/shop-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="shop-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M12,4 C11,4 10.11384,5.0065 10,6 L9.65625,9 L8,9 C7.5,9 7,9.5 7,10 L6,20 C6,20.5 6.5,21 7,21 L20,21 C20.5,21 21,20.5 21,20 L20,10 C20,9.5 19.5,9 19,9 L17.34375,9 L17,6 C16.88616,5.0065 16,4 15,4 L12,4 Z M12,5 L15,5 C15.5,5 15.94308,5.5033 16,6 L16.34375,9 L10.65625,9 L11,6 C11.0569,5.5033 11.5,5 12,5 L12,5 Z" id="rect13131-6-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/shop-m.svg b/data/styles/clear/style-clear/symbols/shop-m.svg
index 9833f75f04..9ee99c4035 100644
--- a/data/styles/clear/style-clear/symbols/shop-m.svg
+++ b/data/styles/clear/style-clear/symbols/shop-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="shop-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10.26471,4 C9.5,4 8.64996,4.7502 8.5,5.5 L8,8 L7,8 C6.61765,8 6,8.6177 6,9 L5,17.2353 C5,17.6176 5.5,18 6,18 L17,18 C17.5,18 18,17.6176 18,17.2353 L17,9 C17,8.6177 16.38235,8 16,8 L15,8 L14.5,5.5 C14.35004,4.7502 13.50001,4 12.7353,4 L10.26471,4 Z M10.26471,4.7647 L12.7353,4.7647 C13.11766,4.7647 13.66033,5.1251 13.7353,5.5 L14.2353,8 L8.7647,8 L9.26471,5.5 C9.33971,5.1251 9.88235,4.7647 10.26471,4.7647 L10.26471,4.7647 Z" id="rect13131-6-2-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/shop-s.svg b/data/styles/clear/style-clear/symbols/shop-s.svg
index a0e2c860c8..dda14266b8 100644
--- a/data/styles/clear/style-clear/symbols/shop-s.svg
+++ b/data/styles/clear/style-clear/symbols/shop-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="shop-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M7.17188,3.8622 C6.67188,3.8622 6.24623,4.3678 6.17188,4.8622 L6,6.3622 L5,6.3622 C4.75,6.3622 4.5,6.6122 4.5,6.8622 L4,11.8622 C4,12.1122 4.25,12.3622 4.5,12.3622 L12.5,12.3622 C12.75,12.3622 13,12.1122 13,11.8622 L12.5,6.8622 C12.5,6.6122 12.25,6.3622 12,6.3622 L11,6.3622 L10.82813,4.8622 C10.77123,4.3655 10.32813,3.8622 9.82813,3.8622 L7.17188,3.8622 Z M7.17188,4.3622 L9.82813,4.3622 C10.07813,4.3622 10.29603,4.5821 10.32813,4.8622 L10.5,6.3622 L6.5,6.3622 L6.67188,4.8622 C6.70038,4.6139 6.92188,4.3622 7.17188,4.3622 L7.17188,4.3622 Z" id="rect13131-6-6-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/skiing-l.svg b/data/styles/clear/style-clear/symbols/skiing-l.svg
index 2b78871722..524108988e 100644
--- a/data/styles/clear/style-clear/symbols/skiing-l.svg
+++ b/data/styles/clear/style-clear/symbols/skiing-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="skiing-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M12.0000004,6 C11.0000004,6 10.0000004,6.5 10.0000004,8 C10.0000004,8.5367 10.0436904,8.6282 10.1562504,9.0938 L10.8437504,11.9375 L7.12500038,14.2188 L3.75000038,12.25 C3.63768258,12.184 3.49123818,12.182 3.31250038,12.219 C3.13376248,12.256 2.99962988,12.4677 3.00000038,12.6877 C3.00037088,12.9077 3.09635138,13.0351 3.25000038,13.1252 L17.7500004,21.6252 C18.2055714,21.8882 18.6165844,21.9941 19.0000004,22.0002 C19.2682244,22.0002 19.5317824,21.9652 19.7500004,21.8752 C20.2801524,21.6573 20.6118634,21.2634 20.8437504,21.0315 C20.9599364,20.9152 21.0000004,20.7734 21.0000004,20.6252 C21.0000004,20.4137 20.8712294,20.189 20.5937504,20.1565 C20.4146934,20.1355 20.2692694,20.2005 20.1562504,20.344 C19.9215064,20.6416 19.6284844,20.8648 19.3750004,20.969 C19.1215164,21.0732 18.8411854,21.0915 18.2500004,20.7502 L8.96875038,15.3127 L12.5625004,13.219 C12.8952264,12.991 13.0645144,12.5482 12.9687504,12.1565 L12.5625004,10.5002 L16.1380974,12.605 L16.8125004,15.1757 C16.8896004,15.4635 17.1024014,15.7117 17.3750004,15.832 L19.6562504,16.832 C21.2623304,17.536 21.4911994,16.0061 20.4687504,15.563 L18.5937504,14.7505 L17.0000004,8.501 L13.9375004,6.751 C13.1512284,6.2971 12.5000004,6.001 12.0000004,6.001 L12.0000004,6 Z M20.0000004,8 C18.8954304,8 18.0000004,8.8954 18.0000004,10 C18.0000004,11.1046 18.8954304,12 20.0000004,12 C21.1045704,12 22.0000004,11.1046 22.0000004,10 C22.0000004,8.8954 21.1045704,8 20.0000004,8 L20.0000004,8 Z" id="rect10364-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/skiing-m.svg b/data/styles/clear/style-clear/symbols/skiing-m.svg
index c50125bb6a..7385c3b9c7 100644
--- a/data/styles/clear/style-clear/symbols/skiing-m.svg
+++ b/data/styles/clear/style-clear/symbols/skiing-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="skiing-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M10,6 C9,6 8.5,6.5 8.5,7.5 C8.5,7.8954 8.63581,8.1569 8.71875,8.5 L9.5,10.5 L6.6875,12.46875 L4,11 L4,12 L15,18 L16,18 L17,17 L16.5,16.5 L16,16 L16,17 L15,17 L8,13.1875 L10.46875,11.53125 C10.71392,11.36325 11.07056,11.2887 11,11 L10.46875,9.53125 L13,11 L13.625,12.96875 C13.6818,13.18085 13.83039,13.38015 14.03125,13.46875 L15.71875,14.1875 C16.90217,14.7062 17.06588,13.5765 16.3125,13.25 L14.9375,12.65625 L14,10 L14,8 L11.5,6.59375 C10.92064,6.25935 10.5,6 10,6 L10,6 Z M16.5,7.5 C15.6861,7.5 15,8.1861 15,9 C15,9.814 15.6861,10.5 16.5,10.5 C17.31389,10.5 18,9.814 18,9 C18,8.1861 17.31389,7.5 16.5,7.5 L16.5,7.5 Z" id="rect10364-0-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/skiing-s.svg b/data/styles/clear/style-clear/symbols/skiing-s.svg
index 8a7d49f615..3d193da508 100644
--- a/data/styles/clear/style-clear/symbols/skiing-s.svg
+++ b/data/styles/clear/style-clear/symbols/skiing-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="skiing-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8,5 C7.5,5 7,6 7,6.5 L7,8.5 L5.375,9.2813 L4,8.5 L4,9 L11,13 L11,12.5 L6.3125,9.8125 L8,9.1875 L8,7 L8.5,7 L9,7 L10,8.5 L10,10 L11,11 L12,11 L12,10 L11,10 L11,8.5 L10.5,6 L9,5 L8,5 L8,5 Z M12.5,6.5 C11.94773,6.5 11.5,6.9477 11.5,7.5 C11.5,8.0523 11.94773,8.5 12.5,8.5 C12.68732,8.5 12.85013,8.433 13,8.3438 L13,6.6563 C12.85013,6.5663 12.68732,6.5 12.5,6.5 L12.5,6.5 Z" id="rect10364-5-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/soccer-l.svg b/data/styles/clear/style-clear/symbols/soccer-l.svg
index dd1ee0b293..2a255d649b 100644
--- a/data/styles/clear/style-clear/symbols/soccer-l.svg
+++ b/data/styles/clear/style-clear/symbols/soccer-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="soccer-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M13.5,5 C8.81676,5 5,8.8168 5,13.5 C5,18.1832 8.81676,22 13.5,22 C18.18324,22 22,18.1832 22,13.5 C22,8.8168 18.18324,5 13.5,5 L13.5,5 Z M13.5,6.5 C16.16601,6.5 18.47358,7.9738 19.65625,10.1563 C18.54025,10.8967 17.51446,11.2836 17.5,12 C17.4899,12.4999 17.5,12.6412 17.5,13 C17.5,13.5 17.76049,14.1434 18.5,14.5 L20.25,15.3438 C20.04966,16.0846 19.72761,16.7544 19.3125,17.375 L18,16.5 C17.25,16 16.5,15.6667 16,16 L14.5,17 C13.80662,17.4623 13.87903,18 14,18.5 L14.46875,20.4375 C14.15151,20.4815 13.82962,20.4995 13.5,20.4995 C12.80671,20.4995 12.13146,20.4045 11.5,20.2183 L11.5,18.4995 C11.5,17.4995 11,16.9995 10.5,16.4995 C10,15.9995 9.5,15.4995 8.5,15.4995 L6.78125,15.4995 C6.59519,14.8685 6.5,14.1933 6.5,13.5 C6.5,9.6222 9.62216,6.5 13.5,6.5 L13.5,6.5 Z M10.5,10 L10,12 C9.8581107,12.5676 9.47997,13.1533 10,13.5 L11.5,14.5 C12.5,15.1667 12.94098,14.7795 13.5,14.5 L14.5,14 C15.24536,13.6273 15.5,13.5 15.5,12.5 L15.5,10.5 C15.5,10 15.5082,9.7016 14.5,9.5 L12,9 C10.95274,8.7905 10.755655,8.977 10.5,10 L10.5,10 Z" id="path10911-4-1-7-6-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/soccer-m.svg b/data/styles/clear/style-clear/symbols/soccer-m.svg
index ccd131e1b5..5a3b52d109 100644
--- a/data/styles/clear/style-clear/symbols/soccer-m.svg
+++ b/data/styles/clear/style-clear/symbols/soccer-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="soccer-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,5.3622 C7.91871,5.3622 5,8.281 5,11.8622 C5,15.4434 7.91871,18.3622 11.5,18.3622 C15.08129,18.3622 18,15.4434 18,11.8622 C18,8.281 15.08129,5.3622 11.5,5.3622 L11.5,5.3622 Z M11.5,6.5093 C13.53872,6.5093 15.30332,7.6363 16.20772,9.3053 C15.35429,9.8714 14.56988,10.1673 14.55883,10.7151 C14.55183,11.0976 14.55883,11.2054 14.55883,11.4798 C14.55883,11.8622 14.75801,12.3541 15.32354,12.6268 L16.66176,13.2721 C16.50857,13.8387 16.26227,14.3509 15.94486,14.8254 L14.94117,14.1562 C14.36765,13.7739 13.79413,13.5192 13.41176,13.7739 L12.26471,14.5387 C11.73447,14.8922 11.78985,15.3035 11.88235,15.6857 L12.2408,17.1674 C11.99821,17.2004 11.75205,17.2144 11.5,17.2144 C10.96983,17.2144 10.45347,17.1404 9.9706,16.9994 L9.9706,15.6848 C9.9706,14.9202 9.58824,14.5378 9.20587,14.1555 C8.82354,13.7731 8.44117,13.3908 7.67646,13.3908 L6.36212,13.3908 C6.21985,12.9081 6.14706,12.392 6.14706,11.8617 C6.14706,8.8962 8.5346,6.5087 11.5,6.5087 L11.5,6.5093 Z M9.20587,9.1857 L8.82354,10.7151 C8.71506,11.1493 8.42585,11.5971 8.82354,11.8622 L9.9706,12.6268 C10.73529,13.1367 11.07252,12.8407 11.5,12.6268 L12.26471,12.2446 C12.83469,11.9595 13.0294,11.8622 13.0294,11.0976 L13.0294,9.5682 C13.0294,9.1857 13.0354,8.9576 12.26471,8.8035 L10.35294,8.4209 C9.5521,8.2609 9.40138,8.4029 9.20587,9.1857 L9.20587,9.1857 Z" id="path10911-4-1-7-6-7-3-4-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/soccer-s.svg b/data/styles/clear/style-clear/symbols/soccer-s.svg
index d83a150535..1b19ed6f35 100644
--- a/data/styles/clear/style-clear/symbols/soccer-s.svg
+++ b/data/styles/clear/style-clear/symbols/soccer-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="soccer-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,4 C6.02064,4 4,6.0207 4,8.5 C4,10.9793 6.02064,13 8.5,13 C10.97936,13 13,10.9793 13,8.5 C13,6.0207 10.97936,4 8.5,4 L8.5,4 Z M8.5,4.7941 C9.91142,4.7941 11.13307,5.5744 11.75919,6.7299 C11.16836,7.1218 10.6253,7.3266 10.61765,7.7059 C10.61265,7.9706 10.61765,8.0453 10.61765,8.2353 C10.61765,8.5 10.75555,8.8406 11.14706,9.0294 L12.07353,9.4761 C11.96747,9.8683 11.79696,10.2229 11.57721,10.5515 L10.88235,10.0882 C10.48529,9.8235 10.08824,9.6471 9.82353,9.8235 L9.02941,10.3529 C8.66233,10.5977 8.70066,10.8824 8.76471,11.1471 L9.01286,12.1728 C8.84492,12.1958 8.6745,12.2058 8.5,12.2058 C8.13296,12.2058 7.77548,12.1548 7.44118,12.0569 L7.44118,11.1469 C7.44118,10.6175 7.17647,10.3528 6.91176,10.0881 C6.64706,9.8234 6.38235,9.5587 5.85294,9.5587 L4.94301,9.5587 C4.84451,9.2245 4.79412,8.8672 4.79412,8.5001 C4.79412,6.4471 6.44703,4.7942 8.5,4.7942 L8.5,4.7941 Z M6.91176,6.6471 L6.64706,7.7059 C6.57196,8.0064 6.37174,8.3165 6.64706,8.5 L7.44118,9.0294 C7.97059,9.3824 8.20405,9.1774 8.5,9.0294 L9.02941,8.7647 C9.42401,8.5674 9.55882,8.5 9.55882,7.9706 L9.55882,6.9118 C9.55882,6.6471 9.56282,6.4891 9.02941,6.3824 L7.70588,6.1176 C7.15145,6.0068 7.04711,6.1046 6.91176,6.6471 L6.91176,6.6471 Z" id="path10911-4-1-7-6-7-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/sports-l.svg b/data/styles/clear/style-clear/symbols/sports-l.svg
index 69b91204a2..de824ca65a 100644
--- a/data/styles/clear/style-clear/symbols/sports-l.svg
+++ b/data/styles/clear/style-clear/symbols/sports-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="sports-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,6 L5,12 C5,13.654 6.346,15 8,15 L9,15 C9,16.104 9.842,17.306 10.88,17.684 L12.441,18.469 L12,21.2 L9,22 L9,23 L18,23 L18,22 L15,21.2 L14.56,18.467 L16.121,17.684 C17.159,17.306 18.001,16.105 18.001,15 L19.001,15 C20.655,15 22.001,13.654 22.001,12 L22.001,6 L5,6 L5,6 Z M8,13 C7.448,13 7,12.552 7,12 L7,8 L9,8 L9,13 L8,13 L8,13 Z M20,12 C20,12.552 19.552,13 19,13 L18,13 L18,8 L20,8 L20,12 L20,12 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/sports-m.svg b/data/styles/clear/style-clear/symbols/sports-m.svg
index 47c95859d9..e1a91a8cc9 100644
--- a/data/styles/clear/style-clear/symbols/sports-m.svg
+++ b/data/styles/clear/style-clear/symbols/sports-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="sports-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,6 L5,11.4 C5,12.284 5.717,13 6.6,13 L8.007,13 C8.045,13.828 8.68,14.706 9.462,14.988 L10.662,15.585 L10.301,17.56 L8,18.2 L8,19 L15,19 L15,18.199 L12.7,17.559 L12.338,15.583 L13.538,14.987 C14.321,14.705 14.956,13.827 14.993,12.999 L16.4,12.999 C17.283,12.999 18,12.282 18,11.399 L18,6 L5,6 L5,6 Z M6,11.4 L6,7 L8,7 L8,12 L6.6,12 C6.269,12 6,11.731 6,11.4 L6,11.4 Z M17,11.4 C17,11.731 16.731,12 16.4,12 L15,12 L15,7 L17,7 L17,11.4 L17,11.4 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/star-l.svg b/data/styles/clear/style-clear/symbols/star-l.svg
index fa31334e8a..5ff4cc3f8b 100644
--- a/data/styles/clear/style-clear/symbols/star-l.svg
+++ b/data/styles/clear/style-clear/symbols/star-l.svg
@@ -1,21 +1,19 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="13px" height="13px" viewBox="0 0 13 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>star-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="City-points" sketch:type="MSLayerGroup">
-            <g id="star-l" sketch:type="MSShapeGroup">
-                <g id="Page-1">
-                    <g id="tstar-l">
-                        <g id="Page-1">
-                            <g id="star-l">
-                                <g id="Page-1">
-                                    <g id="cities">
-                                        <path d="M6,9.48581467 L2.29179604,12 L3.42000002,7.51487 L0,4.58359208 L4.4054723,4.32581474 L6,0 L7.5945277,4.32581474 L12,4.58359208 L8.57999998,7.51487 L9.70820396,12 L6,9.48581467 L6,9.48581467 Z" id="Star-1-Copy" fill-opacity="0.65" fill="#EEEEDD"></path>
-                                        <path d="M6,8.90484556 L2.90983003,11 L3.85000002,7.26239167 L1,4.81966007 L4.67122692,4.60484562 L6,1 L7.32877308,4.60484562 L11,4.81966007 L8.14999998,7.26239167 L9.09016997,11 L6,8.90484556 L6,8.90484556 Z" id="Star-1" fill-opacity="0.8" fill="#000003"></path>
-                                    </g>
+        <g id="star-l" sketch:type="MSLayerGroup" transform="translate(0.502392, 0.898800)">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <g id="tstar-l">
+                    <g id="Page-1">
+                        <g id="star-l">
+                            <g id="Page-1">
+                                <g id="cities">
+                                    <path d="M6,9.48581467 L2.29179604,12 L3.42000002,7.51487 L0,4.58359208 L4.4054723,4.32581474 L6,0 L7.5945277,4.32581474 L12,4.58359208 L8.57999998,7.51487 L9.70820396,12 L6,9.48581467 L6,9.48581467 Z" id="Star-1-Copy" fill-opacity="0.65" fill="#EEEEDD"></path>
+                                    <path d="M6,8.90484556 L2.90983003,11 L3.85000002,7.26239167 L1,4.81966007 L4.67122692,4.60484562 L6,1 L7.32877308,4.60484562 L11,4.81966007 L8.14999998,7.26239167 L9.09016997,11 L6,8.90484556 L6,8.90484556 Z" id="Star-1" fill-opacity="0.8" fill="#000003"></path>
                                 </g>
                             </g>
                         </g>
diff --git a/data/styles/clear/style-clear/symbols/star-m.svg b/data/styles/clear/style-clear/symbols/star-m.svg
index 9dc2e31364..9fb4c8f04b 100644
--- a/data/styles/clear/style-clear/symbols/star-m.svg
+++ b/data/styles/clear/style-clear/symbols/star-m.svg
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="11px" height="11px" viewBox="0 0 11 11" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="12px" height="12px" viewBox="0 0 12 12" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>star-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="City-points" sketch:type="MSLayerGroup" transform="translate(-13.000000, -1.000000)">
-            <g id="star-m" transform="translate(13.000000, 1.000000)" sketch:type="MSShapeGroup">
-                <g id="Page-1">
-                    <g id="tstar-m">
-                        <g id="Page-1">
-                            <path d="M5.4457739,8.30008784 L2.2010955,10.5 L3.18827394,6.57551125 L0.1957739,4.01064307 L4.05056223,3.78508789 L5.4457739,0 L6.84098557,3.78508789 L10.6957739,4.01064307 L7.70327386,6.57551125 L8.6904523,10.5 L5.4457739,8.30008784 L5.4457739,8.30008784 Z" id="Star-1-Copy-Copy" fill="#EEEEDD"></path>
-                            <path d="M5.4457739,7.71911873 L2.81912948,9.5 L3.61827393,6.32303292 L1.1957739,4.24671106 L4.31631683,4.06411877 L5.4457739,1 L6.57523097,4.06411877 L9.6957739,4.24671106 L7.27327387,6.32303292 L8.07241832,9.5 L5.4457739,7.71911873 L5.4457739,7.71911873 Z" id="Star-1-Copy" fill="#000003"></path>
-                        </g>
+        <g id="star-m" sketch:type="MSLayerGroup" transform="translate(0.502392, 0.898800)">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <g id="tstar-m">
+                    <g id="Page-1">
+                        <path d="M5.4457739,8.30008784 L2.2010955,10.5 L3.18827394,6.57551125 L0.1957739,4.01064307 L4.05056223,3.78508789 L5.4457739,0 L6.84098557,3.78508789 L10.6957739,4.01064307 L7.70327386,6.57551125 L8.6904523,10.5 L5.4457739,8.30008784 L5.4457739,8.30008784 Z" id="Star-1-Copy-Copy" fill="#EEEEDD"></path>
+                        <path d="M5.4457739,7.71911873 L2.81912948,9.5 L3.61827393,6.32303292 L1.1957739,4.24671106 L4.31631683,4.06411877 L5.4457739,1 L6.57523097,4.06411877 L9.6957739,4.24671106 L7.27327387,6.32303292 L8.07241832,9.5 L5.4457739,7.71911873 L5.4457739,7.71911873 Z" id="Star-1-Copy" fill="#000003"></path>
                     </g>
                 </g>
             </g>
diff --git a/data/styles/clear/style-clear/symbols/star-s.svg b/data/styles/clear/style-clear/symbols/star-s.svg
index b543101514..26a35e9ee8 100644
--- a/data/styles/clear/style-clear/symbols/star-s.svg
+++ b/data/styles/clear/style-clear/symbols/star-s.svg
@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="9px" height="9px" viewBox="0 0 9 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
+<svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
     <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
     <title>star-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="City-points" sketch:type="MSLayerGroup" transform="translate(-26.000000, -2.000000)">
-            <g id="star-s" transform="translate(26.000000, 2.000000)" sketch:type="MSShapeGroup">
-                <g id="Page-1">
-                    <g id="tstar-s">
-                        <g id="Page-1">
-                            <path d="M4.5,7.11333879 L1.71884693,9 L2.56592468,5.63583658 L0,3.43769407 L3.30467574,3.24518807 L4.5,0 L5.69532426,3.24518807 L9,3.43769407 L6.43407532,5.63583658 L7.28115307,9 L4.5,7.11333879 L4.5,7.11333879 Z" id="Star-1-Copy-3" fill="#EEEEDD"></path>
-                            <path d="M4.5,6.53259683 L2.33688095,8 L2.9957192,5.38342846 L1,3.67376205 L3.57030336,3.52403517 L4.5,1 L5.42969664,3.52403517 L8,3.67376205 L6.0042808,5.38342846 L6.66311905,8 L4.5,6.53259683 L4.5,6.53259683 Z" id="Star-1-Copy-3-Copy" fill="#000003"></path>
-                        </g>
+        <g id="star-s" sketch:type="MSLayerGroup" transform="translate(0.502392, 0.898800)">
+            <g id="Page-1" sketch:type="MSShapeGroup">
+                <g id="tstar-s">
+                    <g id="Page-1">
+                        <path d="M4.5,7.11333879 L1.71884693,9 L2.56592468,5.63583658 L0,3.43769407 L3.30467574,3.24518807 L4.5,0 L5.69532426,3.24518807 L9,3.43769407 L6.43407532,5.63583658 L7.28115307,9 L4.5,7.11333879 L4.5,7.11333879 Z" id="Star-1-Copy-3" fill="#EEEEDD"></path>
+                        <path d="M4.5,6.53259683 L2.33688095,8 L2.9957192,5.38342846 L1,3.67376205 L3.57030336,3.52403517 L4.5,1 L5.42969664,3.52403517 L8,3.67376205 L6.0042808,5.38342846 L6.66311905,8 L4.5,6.53259683 L4.5,6.53259683 Z" id="Star-1-Copy-3-Copy" fill="#000003"></path>
                     </g>
                 </g>
             </g>
diff --git a/data/styles/clear/style-clear/symbols/sweets-l.svg b/data/styles/clear/style-clear/symbols/sweets-l.svg
index 5d11399b97..fda7de9d98 100644
--- a/data/styles/clear/style-clear/symbols/sweets-l.svg
+++ b/data/styles/clear/style-clear/symbols/sweets-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="sweets-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M22.143,9.64 L18.27,10.783 C18.755,11.97 18.517,13.381 17.554,14.345 L14.359,17.541 C13.395,18.505 11.982,18.742 10.795,18.257 L9.654,22.13 C9.508,22.624 9.195,22.536 8.956,21.933 L7.857,19.169 L5.093,18.07 C4.49,17.83 4.402,17.517 4.896,17.371 L8.769,16.228 C8.283,15.042 8.52,13.63 9.485,12.666 L12.68,9.47 C13.645,8.506 15.058,8.269 16.244,8.755 L17.385,4.882 C17.531,4.388 17.842,4.476 18.083,5.079 L19.182,7.843 L21.945,8.942 C22.548,9.182 22.637,9.494 22.143,9.64 L22.143,9.64 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/sweets-m.svg b/data/styles/clear/style-clear/symbols/sweets-m.svg
index 706854e026..b2ace25d9a 100644
--- a/data/styles/clear/style-clear/symbols/sweets-m.svg
+++ b/data/styles/clear/style-clear/symbols/sweets-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="sweets-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18.418,8.413 L15.32,9.328 C15.708,10.276 15.517,11.405 14.747,12.176 L12.191,14.734 C11.42,15.505 10.289,15.695 9.339,15.306 L8.426,18.405 C8.31,18.801 8.059,18.73 7.867,18.247 L6.988,16.036 L4.777,15.157 C4.296,14.966 4.223,14.716 4.62,14.598 L7.718,13.684 C7.329,12.736 7.519,11.606 8.29,10.834 L10.847,8.277 C11.618,7.506 12.749,7.316 13.699,7.706 L14.611,4.607 C14.728,4.211 14.977,4.281 15.17,4.764 L16.049,6.975 L18.26,7.854 C18.742,8.047 18.813,8.297 18.418,8.413 L18.418,8.413 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/swimming-l.svg b/data/styles/clear/style-clear/symbols/swimming-l.svg
index b7c1236020..4d9146f909 100644
--- a/data/styles/clear/style-clear/symbols/swimming-l.svg
+++ b/data/styles/clear/style-clear/symbols/swimming-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="swimming-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M16.125,6 C15.96683,6 15.69115,6.093 15.5625,6.1563 L11.5625,8.0938 C11.03008,8.3459 10.83636,9.1208 11.1875,9.5938 L12.40625,11.25 L7.6875,14.9063 C8.81645,15.1353 9.6636,15.8442 10.5,15.8438 C11.5,15.8443 12,14.8438 13.5,14.8438 C15,14.8438 15.5,15.8433 16.5,15.8438 C16.9128,15.844 17.33328,15.6689 17.78125,15.4688 L13.5625,9.3438 L16.59375,7.8125 C17.19573,7.5115 17.15614,6.9953 17.09375,6.6875 C17.03465,6.3957 16.67472,6 16.125,6 L16.125,6 Z M18,9 C16.89543,9 16,9.8954 16,11 C16,12.1046 16.89543,13 18,13 C19.10457,13 20,12.1046 20,11 C20,9.8954 19.10457,9 18,9 L18,9 Z M7,17 C6.30594,17 5.66024,17.4049 5,17.625 L5,19.6563 C5,19.6563 6,19.0005 7,19 C8,18.9995 9,20 10.5,20 C12,20 12.47352,19.0347 13.5,19 C14.5,19.0005 15,20 16.5,20 C18,20 19,19 20,19 C20.70165,19 22,19.6563 22,19.6563 L22,17.625 C21.3584,17.3782 20.65657,17 20,17 C18.5,17 17.5,18.0005 16.5,18 C15.5,17.9995 15,17 13.5,17 C12,17 11.5,18.0005 10.5,18 C9.5,18.0005 8.5,17 7,17 L7,17 Z" id="path4758-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/swimming-m.svg b/data/styles/clear/style-clear/symbols/swimming-m.svg
index 990cf4a3bd..bd947eb836 100644
--- a/data/styles/clear/style-clear/symbols/swimming-m.svg
+++ b/data/styles/clear/style-clear/symbols/swimming-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="swimming-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M13.75,7 C13.63577,7 13.43667,7.048 13.34375,7.094 L10.46875,8.5003 C10.08422,8.6823 9.9339,9.2524 10.1875,9.594 L11.0625,10.7815 L7.34375,12.9378 L9.34375,13.7503 L11.5,12.8753 L13.65625,13.7503 L14.5,12.8753 L11.90625,9.4065 L14.09375,8.2815 C14.52851,8.0641 14.51381,7.6913 14.46875,7.469 C14.42605,7.2583 14.14702,7.0003 13.75,7.0003 L13.75,7 Z M15.5,9.375 C14.67157,9.375 14,10.0466 14,10.875 C14,11.7034 14.67157,12.375 15.5,12.375 C16.32843,12.375 17,11.7034 17,10.875 C17,10.0466 16.32843,9.375 15.5,9.375 L15.5,9.375 Z M11.5,13.875 L9.5,14.875 L7,13.9375 L5,14.875 L5,16.375 L7,15.375 L9.5,16.375 L11.5,15.3125 L13.5,16.375 L15.5,15.3125 L18,16.375 L18,14.875 L15.5,13.875 L13.5,14.875 L11.5,13.875 L11.5,13.875 Z" id="path16388" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/swimming-s.svg b/data/styles/clear/style-clear/symbols/swimming-s.svg
index b9d4c8a347..711165e4a2 100644
--- a/data/styles/clear/style-clear/symbols/swimming-s.svg
+++ b/data/styles/clear/style-clear/symbols/swimming-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="swimming-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M10.5,4.3622 L10,4.666 L7.78125,5.956 C7.51504,6.082 7.41818,6.4694 7.59375,6.706 L8.20312,7.5341 L6,9.3622 L7,9.5966 L8.5,9.1281 L10,9.5966 L11,9.3622 L8.78125,6.581 L11.01562,5.1903 L11.00002,4.3622 L10.5,4.3622 Z M11.5,6.4092 C10.94772,6.4092 10.5,6.8569 10.5,7.4092 C10.5,7.9614 10.94772,8.4092 11.5,8.4092 C12.05228,8.4092 12.5,7.9614 12.5,7.4092 C12.5,6.8569 12.05228,6.4092 11.5,6.4092 L11.5,6.4092 Z M5.5,10.3623 L4,10.8308 L4,11.862 L4.15625,11.815 L5.5,11.3619 L7,11.8617 L8.5,11.3619 L10,11.8617 L11.5,11.3619 L13,11.8619 L13,10.8307 L11.5,10.3622 L10,10.8307 L8.5,10.3622 L7,10.8307 L5.5,10.3622 L5.5,10.3623 Z" id="path8421-9-1-0-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/taxi-l.svg b/data/styles/clear/style-clear/symbols/taxi-l.svg
index 1382493759..c130620c29 100644
--- a/data/styles/clear/style-clear/symbols/taxi-l.svg
+++ b/data/styles/clear/style-clear/symbols/taxi-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="taxi-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M22.199,9.99 C22.089,8.89 21.104,8 20,8 L7,8 C5.896,8 4.911,8.891 4.801,9.99 L4,18 L23,18 L22.199,9.99 L22.199,9.99 Z M21,16 L18,16 L18,13 L15,13 L15,16 L12,16 L12,13 L9,13 L9,16 L6,16 L6,13 L9,13 L9,10 L12,10 L12,12.9 L15,12.9 L15,10 L18,10 L18,13 L21,13 L21,16 L21,16 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/taxi-m.svg b/data/styles/clear/style-clear/symbols/taxi-m.svg
index cfa7cef1ca..0f5d7bc52e 100644
--- a/data/styles/clear/style-clear/symbols/taxi-m.svg
+++ b/data/styles/clear/style-clear/symbols/taxi-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="taxi-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M18.359,8.592 C18.271,7.713 17.483,7 16.599,7 L7.4,7 C6.516,7 5.728,7.713 5.64,8.592 L5,15 L19,15 L18.359,8.592 L18.359,8.592 Z M9,13 L7,13 L7,11 L9,11 L9,13 L9,13 Z M11,11 L9,11 L9,9 L11,9 L11,11 L11,11 Z M13,13 L11,13 L11,11 L13,11 L13,13 L13,13 Z M15,11 L13,11 L13,9 L15,9 L15,11 L15,11 Z M17,13 L15,13 L15,11 L17,11 L17,13 L17,13 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/tennis-l.svg b/data/styles/clear/style-clear/symbols/tennis-l.svg
index a85684ee50..1c7897aa73 100644
--- a/data/styles/clear/style-clear/symbols/tennis-l.svg
+++ b/data/styles/clear/style-clear/symbols/tennis-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tennis-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M11,5 C7.68629,5 5,7.6863 5,11 C5,14.3137 7.68629,17 11,17 L16,17 L20.5,21.5 C20.81628,21.8163 21.00625,22 21.40625,22 C21.53125,22 21.6875,22 21.84375,21.8438 C22.00005,21.6875 22,21.5313 22,21.4063 C22,21.0063 21.78212,20.7821 21.5,20.5 L17,16 L17,11 C17,7.6863 14.31371,5 11,5 L11,5 Z M16,13 L16,16 L13,16 L16,13 Z M6.5,17 C5.67157,17 5,17.6716 5,18.5 C5,19.3284 5.67157,20 6.5,20 C7.32843,20 8,19.3284 8,18.5 C8,17.6716 7.32843,17 6.5,17 L6.5,17 Z" id="path11507" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/tennis-m.svg b/data/styles/clear/style-clear/symbols/tennis-m.svg
index 76d0190bd9..6aee12f4f0 100644
--- a/data/styles/clear/style-clear/symbols/tennis-m.svg
+++ b/data/styles/clear/style-clear/symbols/tennis-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tennis-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M9.5,5 C6.96598,5 5,6.966 5,9.5 C5,12.034 7.14246,13.9984 9.67648,14 L13,14 L17,18 L18,18 L18,17 L14,13 L14,9.6764 C14,7.1424 12.03401,5 9.5,5 L9.5,5 Z M13,10.7058 L13,13 L10.5,13 L13,10.7058 Z M6.14706,14 C5.51355,14 5,14.5135 5,15.147 C5,15.7805 5.51355,16.2941 6.14706,16.2941 C6.78056,16.2941 7.29412,15.7805 7.29412,15.147 C7.29412,14.5135 6.78056,14 6.14706,14 L6.14706,14 Z" id="path11507-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/tennis-s.svg b/data/styles/clear/style-clear/symbols/tennis-s.svg
index 18e2208b9f..ece6db4f0b 100644
--- a/data/styles/clear/style-clear/symbols/tennis-s.svg
+++ b/data/styles/clear/style-clear/symbols/tennis-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tennis-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M4.00003,6.9999 C4.00003,8.6568 5.34317,9.9999 7.00003,9.9999 L9.50003,9.9999 L12.5,13 L13,13 L12.99997,12.5001 L10,9.5 L10,7 C10,5.3431 8.65685,4 7.00001,4 C5.34317,3.9999 4.00003,5.343 4.00003,6.9999 L4.00003,6.9999 Z M9,7.5 L9,9 L7.5,9 L9,7.5 Z M4.75003,10.5 C4.33581,10.5 4.00003,10.8358 4.00003,11.25 C4.00003,11.6642 4.33581,12 4.75003,12 C5.16424,12 5.50003,11.6642 5.50003,11.25 C5.50003,10.8358 5.16424,10.5 4.75003,10.5 L4.75003,10.5 Z" id="path11507-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/theatre-l.svg b/data/styles/clear/style-clear/symbols/theatre-l.svg
index c7be077611..53e952b4f9 100644
--- a/data/styles/clear/style-clear/symbols/theatre-l.svg
+++ b/data/styles/clear/style-clear/symbols/theatre-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="theatre-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M6,5 C5.5286,5 5,5.5 5,6 L5,13 C5,15.216 6,18 10,18 C10.35868,18 10.68618,17.983 11,17.938 L11,15.0005 L7,15.0005 C7,15.0005 7.5,13.0005 10,13.0005 C10.5,13.0005 10.69653,13.0745 11,13.188 L11,11.0005 C11,10.0838 11.36529,9.3179 12,9.0005 C13,8.5005 13.40372,8.7024 14,9.0005 L15,9.5005 L15,6.0005 C15,5.5005 14.4714,5.0005 14,5.0005 C13,5.0005 12,6.0005 10,6.0005 C8,6.0005 7,5.0005 6,5.0005 L6,5 Z M7.75,8.5 C8.44036,8.5 9,9.0596 9,9.75 C9,10.4404 8.44036,11 7.75,11 C7.05964,11 6.5,10.4404 6.5,9.75 C6.5,9.0596 7.05964,8.5 7.75,8.5 L7.75,8.5 Z M13,10 C12.5286,10 12,10.5 12,11 L12,18 C12,20.216 13,23 17,23 C21,23 22,20.216 22,18 L22,11 C22,10.5 21.4714,10 21,10 C20,10 19,11 17,11 C15,11 14,10 13,10 L13,10 Z M14.75,13.5 C15.44036,13.5 16,14.0596 16,14.75 C16,15.4404 15.44036,16 14.75,16 C14.05964,16 13.5,15.4404 13.5,14.75 C13.5,14.0596 14.05964,13.5 14.75,13.5 L14.75,13.5 Z M19.25,13.5 C19.94036,13.5 20.5,14.0596 20.5,14.75 C20.5,15.4404 19.94036,16 19.25,16 C18.55964,16 18,15.4404 18,14.75 C18,14.0596 18.55964,13.5 19.25,13.5 L19.25,13.5 Z M14,19 L20,19 C20,19 19.5,21 17,21 C14.5,21 14,19 14,19 L14,19 Z" id="path6342-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/theatre-m.svg b/data/styles/clear/style-clear/symbols/theatre-m.svg
index bc7d008014..cb70517c0f 100644
--- a/data/styles/clear/style-clear/symbols/theatre-m.svg
+++ b/data/styles/clear/style-clear/symbols/theatre-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="theatre-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M5.78125,5.3622 C5.39236,5.3622 5,5.7546 5,6.1435 L5,11.6435 C5,13.3671 5.76389,15.4247 8.875,15.4247 C9.15397,15.4247 8.75591,15.3977 9,15.3627 L9,13.3627 L6.5,13.3627 C6.5,13.3627 7.0555,11.3627 9,11.3627 L9,9.7065 C9,8.9935 9.10973,8.2525 9.5,7.8622 C9.89026,7.4719 10.38818,6.5542 12,7.3617 L13,7.8622 L13,6.144 C13,5.7551 12.60764,5.3627 12.21875,5.3627 C11.49653,5.3627 10,6.3627 9,6.3627 C8,6.3627 6.50347,5.3627 5.78125,5.3627 L5.78125,5.3622 Z M7,7.3622 C7.55228,7.3622 8,7.8099 8,8.3622 C8,8.9145 7.55228,9.3622 7,9.3622 C6.44772,9.3622 6,8.9145 6,8.3622 C6,7.8099 6.44772,7.3622 7,7.3622 L7,7.3622 Z M10.78125,8.3622 C10.4146,8.3622 10,8.7546 10,9.1435 L10,14.3622 C10,16.0858 10.88889,18.3622 14,18.3622 C17.11111,18.3622 18,16.0858 18,14.3622 L18,9.1435 C18,8.7546 17.5854,8.3622 17.21875,8.3622 C16.49653,8.3622 15,9.3622 14,9.3622 C13,9.3622 11.50347,8.3622 10.78125,8.3622 L10.78125,8.3622 Z M12,10.3622 C12.55228,10.3622 13,10.8099 13,11.3622 C13,11.9145 12.55228,12.3622 12,12.3622 C11.44772,12.3622 11,11.9145 11,11.3622 C11,10.8099 11.44772,10.3622 12,10.3622 L12,10.3622 Z M16,10.3622 C16.55228,10.3622 17,10.8099 17,11.3622 C17,11.9145 16.55228,12.3622 16,12.3622 C15.44772,12.3622 15,11.9145 15,11.3622 C15,10.8099 15.44772,10.3622 16,10.3622 L16,10.3622 Z M11.5,14.3622 L14.0625,14.3622 L16.5,14.3622 C16.5,14.3622 15.94445,16.3622 14,16.3622 C12.05556,16.3622 11.5,14.3622 11.5,14.3622 L11.5,14.3622 Z" id="path6342-3-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/theatre-s.svg b/data/styles/clear/style-clear/symbols/theatre-s.svg
index 32cadbfd3d..f56a79279a 100644
--- a/data/styles/clear/style-clear/symbols/theatre-s.svg
+++ b/data/styles/clear/style-clear/symbols/theatre-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="theatre-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <g id="g6508-copy" transform="translate(4.000000, 4.000000)" fill="#FFFFFF" sketch:type="MSShapeGroup">
                 <path d="M0.5,0.3622 C0.25,0.3622 0,0.6122 0,0.8622 L0,3.8622 C0,4.9702 0.5,6.3622 2.5,6.3622 C2.67934,6.3622 2.84309,6.3522 3,6.3312 L3,4.8624 L1,4.8624 C1,4.8624 1.25,3.8624 2.5,3.8624 C2.75,3.8624 2.84826,3.8994 3,3.9564 L3,2.8624 C3,2.4041 3.20224,2.0508 3.45312,1.7999 C3.70401,1.549 4.04166,1.3624 4.5,1.3624 L5,1.3624 L5,0.8626 C5,0.6126 4.7357,0.3628 4.5,0.3626 C4,0.3622 3.5,0.8622 2.5,0.8622 C1.63337,0.8622 1,0.3622 0.5,0.3622 L0.5,0.3622 Z M1.5,2.3622 C1.77614,2.3622 2,2.5861 2,2.8622 C2,3.1383 1.77614,3.3622 1.5,3.3622 C1.22386,3.3622 1,3.1383 1,2.8622 C1,2.5861 1.22386,2.3622 1.5,2.3622 L1.5,2.3622 Z M4.5,2.3622 C4.2643,2.3622 4,2.6122 4,2.8622 L4,5.8622 C4,6.9702 4.5,8.3622 6.5,8.3622 C8.5,8.3622 9,6.9702 9,5.8622 L9,2.8622 C9,2.6122 8.7357,2.3622 8.5,2.3622 C8,2.3622 7.24536,2.8622 6.5,2.8622 C5.75464,2.8622 5,2.3622 4.5,2.3622 L4.5,2.3622 Z M5.5,4.3622 C5.77614,4.3622 6,4.5861 6,4.8622 C6,5.1383 5.77614,5.3622 5.5,5.3622 C5.22386,5.3622 5,5.1383 5,4.8622 C5,4.5861 5.22386,4.3622 5.5,4.3622 L5.5,4.3622 Z M7.5,4.3622 C7.77614,4.3622 8,4.5861 8,4.8622 C8,5.1383 7.77614,5.3622 7.5,5.3622 C7.22386,5.3622 7,5.1383 7,4.8622 C7,4.5861 7.22386,4.3622 7.5,4.3622 L7.5,4.3622 Z M5,6.3622 L8,6.3622 C8,6.3622 7.75,7.3622 6.5,7.3622 C5.25,7.3622 5,6.3622 5,6.3622 L5,6.3622 Z" id="path6370"></path>
             </g>
diff --git a/data/styles/clear/style-clear/symbols/toilets-l.svg b/data/styles/clear/style-clear/symbols/toilets-l.svg
index db6f79e18a..69e9728815 100644
--- a/data/styles/clear/style-clear/symbols/toilets-l.svg
+++ b/data/styles/clear/style-clear/symbols/toilets-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="toilets-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M9.5,4 C8.11929,4 7,5.11929 7,6.5 C7,7.88071 8.11929,9 9.5,9 C10.88071,9 12,7.88071 12,6.5 C12,5.11929 10.88071,4 9.5,4 L9.5,4 Z M17.5,4 C16.11929,4 15,5.11929 15,6.5 C15,7.88071 16.11929,9 17.5,9 C18.88071,9 20,7.88071 20,6.5 C20,5.11929 18.88071,4 17.5,4 L17.5,4 Z M9,10 C8,10 7,11 7,12 L7,14 L5.5,18.5 C5.5,19 6,19 6.5,19 L8,19 L8,23 L11,23 L11,19 L12.5,19 C13,19 13.5,19 13.5,18.5 L12,14 L12,12 C12,11 11,10 10,10 L9,10 Z M15,10 C14.5,10 14,10.5 14,11 L16,17 L16,19 L16,23 L19,23 L19,19 L19,17 L21,11 C21,10.5 20.5,10 20,10 L15,10 Z" id="path16479-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/toilets-m.svg b/data/styles/clear/style-clear/symbols/toilets-m.svg
index b33de9b886..80120b7cc2 100644
--- a/data/styles/clear/style-clear/symbols/toilets-m.svg
+++ b/data/styles/clear/style-clear/symbols/toilets-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="toilets-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M8.00001,4 C6.89544,4 6.00001,4.8954 6.00001,6 C6.00001,7.1046 6.89544,8 8.00001,8 C9.10458,8 10.00001,7.1046 10.00001,6 C10.00001,4.8954 9.10458,4 8.00001,4 L8.00001,4 Z M15,4 C13.89543,4 13,4.8954 13,6 C13,7.1046 13.89543,8 15,8 C16.10457,8 17,7.1046 17,6 C17,4.8954 16.10457,4 15,4 L15,4 Z M7.50001,9 L6.00001,10.5 L6.00001,13 L4.50001,15.5 L5.00001,16 L7.00001,16 L7.00001,19 L9.00001,19 L9.00001,16 L11.00001,16 L11.50001,15.5 L10.00001,13 L10.00001,10.5 L8.50001,9 L7.50001,9 Z M13,9 L12.00001,10 L14,14.5 L14,19 L16,19 L16,14.5 L18.00001,10 L17,9 L13,9 Z" id="path7660-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/toilets-s.svg b/data/styles/clear/style-clear/symbols/toilets-s.svg
index 48a735be6f..d962c0d239 100644
--- a/data/styles/clear/style-clear/symbols/toilets-s.svg
+++ b/data/styles/clear/style-clear/symbols/toilets-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="toilets-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M6,4 C5.30964,4 4.75,4.55964 4.75,5.25 C4.75,5.94036 5.30964,6.5 6,6.5 C6.69036,6.5 7.25,5.94036 7.25,5.25 C7.25,4.55964 6.69036,4 6,4 L6,4 Z M11,4 C10.30964,4 9.75,4.55964 9.75,5.25 C9.75,5.94036 10.30964,6.5 11,6.5 C11.69036,6.5 12.25,5.94036 12.25,5.25 C12.25,4.55964 11.69036,4 11,4 L11,4 Z M5,7 L5,8.5 L3.5,11 L5,11 L5,13 L7,13 L7,11 L8.5,11 L7,8.5 L7,7 L5,7 L5,7 Z M9,7 L10,10.5 L10,13 L12,13 L12,10.5 L13,7 L9,7 L9,7 Z" id="path7660-7-copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/toll_booth-l.svg b/data/styles/clear/style-clear/symbols/toll_booth-l.svg
index 1d63db7b76..4c9b5f2ad1 100644
--- a/data/styles/clear/style-clear/symbols/toll_booth-l.svg
+++ b/data/styles/clear/style-clear/symbols/toll_booth-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="toll_booth-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,19.961 L7,19.961 L7,12 L5,12 L5,19.961 L5,19.961 Z M5.058,6 L5.058,7.961 L5,7.961 L5,10 L22,10 L22,6 L5.058,6 L5.058,6 Z M20,20 L22,20 L22,12 L20,12 L20,20 L20,20 Z M12,20 L15,20 L15,12 L12,12 L12,20 L12,20 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/toll_booth-m.svg b/data/styles/clear/style-clear/symbols/toll_booth-m.svg
index 24b7d8e3d4..d65854a1bf 100644
--- a/data/styles/clear/style-clear/symbols/toll_booth-m.svg
+++ b/data/styles/clear/style-clear/symbols/toll_booth-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="toll_booth-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,16.961 L7,16.961 L7,11 L5,11 L5,16.961 L5,16.961 Z M5.058,6 L5,9 L18,9 L18,6 L5.058,6 L5.058,6 Z M16,17 L18,17 L18,11 L16,11 L16,17 L16,17 Z M10,17 L13,17 L13,11 L10,11 L10,17 L10,17 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/tomb-l.svg b/data/styles/clear/style-clear/symbols/tomb-l.svg
index dc8c824076..d6f5f0f84f 100644
--- a/data/styles/clear/style-clear/symbols/tomb-l.svg
+++ b/data/styles/clear/style-clear/symbols/tomb-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tomb-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M6,22 L6,10.9641053 C6,7.12442105 9.298,4 13.351,4 L13.65,4 C17.703,4 21.001,7.12442105 21.001,10.9641053 L21.001,22 L6,22 L6,22 Z M19,21 L19,11.351 C19,8.401 16.6,6 13.649,6 L13.35,6 C10.4,6 7.999,8.4 7.999,11.351 L7.999,21 L19,21 L19,21 Z M13.649,8 L13.35,8 C11.498,8 9.999,9.499 9.999,11.351 L9.999,20 L16.999,20 L16.999,11.351 C17,9.499 15.5,8 13.649,8 L13.649,8 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/tomb-m.svg b/data/styles/clear/style-clear/symbols/tomb-m.svg
index a951c1edbb..32496aa502 100644
--- a/data/styles/clear/style-clear/symbols/tomb-m.svg
+++ b/data/styles/clear/style-clear/symbols/tomb-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tomb-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M5,18 L5,9.9276 C5,6.65906667 7.849,4 11.35,4 L11.651,4 C15.152,4 18.001,6.65906667 18.001,9.9276 L18.001,18 L5,18 L5,18 Z M16,17.0666667 L16,9.9276 C16,7.68946667 14.049,5.86666667 11.65,5.86666667 L11.349,5.86666667 C8.951,5.86666667 6.999,7.68853333 6.999,9.9276 L6.999,17.0666667 L16,17.0666667 L16,17.0666667 Z M14,16.1333333 L14,9.9276 C14,8.718 12.946,7.73333333 11.65,7.73333333 L11.349,7.73333333 C10.053,7.73333333 8.999,8.718 8.999,9.9276 L8.999,16.1333333 L14,16.1333333 L14,16.1333333 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/tourism-l.svg b/data/styles/clear/style-clear/symbols/tourism-l.svg
index be2b776f98..73e78f7af4 100644
--- a/data/styles/clear/style-clear/symbols/tourism-l.svg
+++ b/data/styles/clear/style-clear/symbols/tourism-l.svg
@@ -7,8 +7,9 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tourism-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <polygon id="Star-1" fill="#FFFFFF" sketch:type="MSShapeGroup" points="13.5 17.75 8.50382536 20.3766445 9.45800981 14.8133222 5.41601961 10.8733555 11.0019127 10.0616778 13.5 5 15.9980873 10.0616778 21.5839804 10.8733555 17.5419902 14.8133222 18.4961746 20.3766445 "></polygon>
+            <polygon id="Star-1-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup" points="13.5 17.75 8.50382536 20.3766445 9.45800981 14.8133222 5.41601961 10.8733555 11.0019127 10.0616778 13.5 5 15.9980873 10.0616778 21.5839804 10.8733555 17.5419902 14.8133222 18.4961746 20.3766445 "></polygon>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-clear/symbols/tourism-m.svg b/data/styles/clear/style-clear/symbols/tourism-m.svg
index 1ffad3046f..20c7ff4535 100644
--- a/data/styles/clear/style-clear/symbols/tourism-m.svg
+++ b/data/styles/clear/style-clear/symbols/tourism-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tourism-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <polygon id="Star-1-Copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup" points="11.5 14.75 7.67939586 16.7586105 8.40906632 12.5043052 5.31813264 9.49138954 9.58969793 8.87069477 11.5 5 13.4103021 8.87069477 17.6818674 9.49138954 14.5909337 12.5043052 15.3206041 16.7586105 "></polygon>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/tourism-s.svg b/data/styles/clear/style-clear/symbols/tourism-s.svg
index 4f21d28eb9..7a41894707 100644
--- a/data/styles/clear/style-clear/symbols/tourism-s.svg
+++ b/data/styles/clear/style-clear/symbols/tourism-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tourism-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <polygon id="Star-1-Copy-3" fill="#FFFFFF" sketch:type="MSShapeGroup" points="8.5 10.75 5.85496636 12.1405765 6.36012284 9.19528824 4.22024568 7.10942353 7.17748318 6.67971176 8.5 4 9.82251682 6.67971176 12.7797543 7.10942353 10.6398772 9.19528824 11.1450336 12.1405765 "></polygon>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/townhall-l.svg b/data/styles/clear/style-clear/symbols/townhall-l.svg
index 65e36211be..e661febd38 100644
--- a/data/styles/clear/style-clear/symbols/townhall-l.svg
+++ b/data/styles/clear/style-clear/symbols/townhall-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bank-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M21.4018182,7.39104762 L14,4 L6.59818182,7.39104762 C6.23090909,7.52404762 6.005,7.86921429 6.00318182,8.23654762 L6,9 L22,9 L22,8.24107143 C21.995,7.86921429 21.7690909,7.52404762 21.4018182,7.39104762 Z M19.5,18 L19,10 L17,10 L16.5,18 L15.5,18 L14.9090909,10 L13.0909091,10 L12.5,18 L11.5,18 L11,10 L9,10 L8.5,18 L7.00244075,18 C6.44880801,18 6,18.4426603 6,18.9989566 L6,21 L22,21 L22,18.9989566 C22,18.4472481 21.5530501,18 20.9975592,18 L19.5,18 Z" id="Imported-Layers" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/townhall-m.svg b/data/styles/clear/style-clear/symbols/townhall-m.svg
index 4d2eefebd8..146e8e889d 100644
--- a/data/styles/clear/style-clear/symbols/townhall-m.svg
+++ b/data/styles/clear/style-clear/symbols/townhall-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bank-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M11.5,4 C11.5,4 4.505,6.86921429 4.50318182,7.23654762 L4.5,8 L18.5,8 L18.5,7.24107143 C18.495,6.86921429 11.5,4 11.5,4 Z M16.0365553,16 L15.0112953,9 L13.9175005,9 L13.4600668,16 L12.5553169,16 L12,9 L11,9 L10.4870887,16 L9.55106163,16 L9.0292325,9 L7.91749907,9 L7.04839683,16 L6.00019572,16 C5.44780288,16 5,16.4438648 5,17 L5,18 L18,18 L18,17 C18,16.4477153 17.5446112,16 16.9952704,16 L16.0365553,16 Z" id="Imported-Layers-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/townhall-s.svg b/data/styles/clear/style-clear/symbols/townhall-s.svg
index 3fcd9c4e5d..9d2dd1e62f 100644
--- a/data/styles/clear/style-clear/symbols/townhall-s.svg
+++ b/data/styles/clear/style-clear/symbols/townhall-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bank-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,4 C8.5,4 4.0045,5.86921429 4.00286364,6.23654762 L4,7 L13,7 L13,6.24107143 C12.9955,5.86921429 8.5,4 8.5,4 Z M11.5365553,11.5 L9.9600668,11.5 L9.05531693,11.5 L7.98708868,11.5 L7.05106163,11.5 L5.54839683,11.5 L5.25077269,11.5 C4.83613238,11.5 4.5,11.8328986 4.5,12.25 L4.5,13 L12.5,13 L12.5,12.25 C12.5,11.8357864 12.1738216,11.5 11.7408771,11.5 L11.5365553,11.5 Z M6,7.5 L7,7.5 L7,11 L6,11 L6,7.5 Z M8,7.5 L9,7.5 L9,11 L8,11 L8,7.5 Z M10,7.5 L11,7.5 L11,11 L10,11 L10,7.5 Z" id="Imported-Layers-Copy-2" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/toys-l.svg b/data/styles/clear/style-clear/symbols/toys-l.svg
index 3e7ce9107c..a87524e8c4 100644
--- a/data/styles/clear/style-clear/symbols/toys-l.svg
+++ b/data/styles/clear/style-clear/symbols/toys-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="toys-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M20,19.5 C20,20.881 18.881,22 17.5,22 C16.119,22 15,20.881 15,19.5 C15,18.119 16.119,17 17.5,17 C18.881,17 20,18.119 20,19.5 L20,19.5 Z M9.5,17 C8.119,17 7,18.119 7,19.5 C7,20.881 8.119,22 9.5,22 C10.881,22 12,20.881 12,19.5 C12,18.119 10.881,17 9.5,17 L9.5,17 Z M22,13.5 C22,14.328 21.328,15 20.5,15 L18.782,15 C18.372,14.883 17.947,14.8 17.5,14.8 C15.855,14.8 14.354,15.661 13.5,17.071 C12.646,15.662 11.145,14.8 9.5,14.8 C9.053,14.8 8.628,14.883 8.218,15 L6.5,15 C5.672,15 5,14.328 5,13.5 C5,12.672 5.672,12 6.5,12 L10.703,12 C9.784,11.265 9.153,10.188 9.026,8.953 C7.873,8.731 7,7.719 7,6.501 C7,5.12 8.119,4 9.5,4 C10.15,4 10.736,4.255 11.182,4.661 C11.861,4.25 12.649,4 13.5,4 C14.351,4 15.14,4.25 15.818,4.661 C16.263,4.255 16.849,4 17.5,4 C18.881,4 20,5.12 20,6.501 C20,7.726 19.117,8.741 17.954,8.955 C17.828,10.188 17.214,11.266 16.297,12 L20.5,12 C21.328,12 22,12.672 22,13.5 L22,13.5 Z M15.2,10 C15.2,9.327 14.453,8.8 13.5,8.8 C12.547,8.8 11.8,9.327 11.8,10 C11.8,10.673 12.547,11.2 13.5,11.2 C14.453,11.2 15.2,10.673 15.2,10 L15.2,10 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/toys-m.svg b/data/styles/clear/style-clear/symbols/toys-m.svg
index 38636057aa..d925e646f5 100644
--- a/data/styles/clear/style-clear/symbols/toys-m.svg
+++ b/data/styles/clear/style-clear/symbols/toys-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="toys-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M15,15 C13.896,15 13,15.895 13,17 C13,18.104 13.896,19 15,19 C16.104,19 17,18.104 17,17 C17,15.895 16.104,15 15,15 L15,15 Z M8,15 C6.895,15 6,15.895 6,17 C6,18.104 6.895,19 8,19 C9.104,19 10,18.104 10,17 C10,15.895 9.104,15 8,15 L8,15 Z M17.498,11 L14.092,11 C14.569,10.456 14.878,9.765 14.961,8.997 C14.975,8.997 14.986,9.001 15,9.001 C16.104,9.001 17,8.105 17,7.001 C17,5.897 16.104,5 15,5 C14.41,5 13.885,5.261 13.52,5.667 C12.949,5.25 12.254,5 11.5,5 C10.746,5 10.052,5.25 9.48,5.667 C9.114,5.261 8.59,5 8,5 C6.895,5 6,5.896 6,7.001 C6,8.105 6.895,9.001 8,9.001 C8.014,9.001 8.025,8.997 8.039,8.997 C8.122,9.765 8.432,10.456 8.908,11 L5.501,11 C4.673,11 4,11.672 4,12.5 C4,13.293 4.617,13.934 5.395,13.989 C6.097,13.381 7,13 8,13 C9.517,13 10.821,13.857 11.5,15.104 C12.179,13.858 13.483,13 15,13 C16,13 16.903,13.381 17.605,13.989 C18.382,13.933 19,13.293 19,12.5 C19,11.672 18.327,11 17.498,11 L17.498,11 Z M11.5,11.2 C10.547,11.2 9.8,10.673 9.8,10 C9.8,9.327 10.547,8.8 11.5,8.8 C12.453,8.8 13.2,9.327 13.2,10 C13.2,10.673 12.453,11.2 11.5,11.2 L11.5,11.2 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/vending-l.svg b/data/styles/clear/style-clear/symbols/vending-l.svg
index aca1d4ece8..1fce37f5bc 100644
--- a/data/styles/clear/style-clear/symbols/vending-l.svg
+++ b/data/styles/clear/style-clear/symbols/vending-l.svg
@@ -5,9 +5,13 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
+        <g id="beverages-m" sketch:type="MSLayerGroup" transform="translate(-3.000000, -21.000000)">
+            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
+        </g>
         <g id="vending-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.056,27 0,20.943 0,13.5 C0,6.057 6.056,0 13.5,0 C20.944,0 27,6.057 27,13.5 C27,20.943 20.944,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M19,5 L8,5 C7.448,5 7,5.447 7,6 L7,21 C7,21.553 7.448,22 8,22 L19,22 C19.552,22 20,21.553 20,21 L20,6 C20,5.447 19.552,5 19,5 L19,5 Z M16,20 L9,20 L9,18 L16,18 L16,20 L16,20 Z M16,17 L9,17 L9,7 L16,7 L16,17 L16,17 Z M19,9 L17,9 L17,7 L19,7 L19,9 L19,9 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/vending-m.svg b/data/styles/clear/style-clear/symbols/vending-m.svg
index 23b3e1b8d6..b4f92349ff 100644
--- a/data/styles/clear/style-clear/symbols/vending-m.svg
+++ b/data/styles/clear/style-clear/symbols/vending-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="vending-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M16,4 L7,4 C6.448,4 6,4.447 6,5 L6,18 C6,18.553 6.448,19 7,19 L16,19 C16.552,19 17,18.553 17,18 L17,5 C17,4.447 16.552,4 16,4 L16,4 Z M14,17 L8,17 L8,15 L14,15 L14,17 L14,17 Z M14,14 L8,14 L8,6 L14,6 L14,14 L14,14 Z M16,8 L15,8 L15,6 L16,6 L16,8 L16,8 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/volcano-l.svg b/data/styles/clear/style-clear/symbols/volcano-l.svg
index 8e77cd744f..adbd2f86a6 100644
--- a/data/styles/clear/style-clear/symbols/volcano-l.svg
+++ b/data/styles/clear/style-clear/symbols/volcano-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="volcano-l" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="13.5" ry="13.5"></ellipse>
-            <ellipse id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
+            <ellipse id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" rx="12.5" ry="12.5"></ellipse>
             <path d="M13.4999998,11.1570941 C12.902949,11.1570941 11.7512537,10.5975741 11.7512537,10.5975741 L7.08552632,17.96875 C7.02524737,18.0748312 7,18.1938375 7,18.3125 C7,18.828125 7.34210526,19.0001375 7.68421053,19 L19.3157895,19 C19.6578947,19.0001375 20,18.828125 20,18.3125 C20,18.1938375 19.9747868,18.0748312 19.9144737,17.96875 L15.3358539,10.5975741 C15.3358539,10.5975741 14.0978158,11.1570941 13.4999998,11.1570941 Z" id="path11349" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <rect id="Rectangle-35" fill="#FFFFFF" sketch:type="MSShapeGroup" x="12.9130435" y="7.04347826" width="2.34782609" height="2.34782609"></rect>
             <rect id="Rectangle-35-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup" x="15.2608696" y="4.69565217" width="2.34782609" height="2.34782609"></rect>
diff --git a/data/styles/clear/style-clear/symbols/volcano-m.svg b/data/styles/clear/style-clear/symbols/volcano-m.svg
index 541e2531ed..1eb0e32fef 100644
--- a/data/styles/clear/style-clear/symbols/volcano-m.svg
+++ b/data/styles/clear/style-clear/symbols/volcano-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="volcano-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
             <path d="M11.4999999,9.50419125 C10.991401,9.50419125 10.0103272,9.02756313 10.0103272,9.02756313 L6.03581871,15.306713 C5.98446998,15.3970785 5.96296296,15.4984542 5.96296296,15.599537 C5.96296296,16.0387731 6.25438596,16.1853023 6.54580897,16.1851852 L16.454191,16.1851852 C16.745614,16.1853023 17.037037,16.0387731 17.037037,15.599537 C17.037037,15.4984542 17.0155592,15.3970785 16.9641813,15.306713 L13.0638755,9.02756313 C13.0638755,9.02756313 12.0092505,9.50419125 11.4999999,9.50419125 Z" id="path11349" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <rect id="Rectangle-35" fill="#FFFFFF" sketch:type="MSShapeGroup" x="11" y="6" width="2" height="2"></rect>
             <rect id="Rectangle-35-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup" x="13" y="4" width="2" height="2"></rect>
diff --git a/data/styles/clear/style-clear/symbols/volcano-s.svg b/data/styles/clear/style-clear/symbols/volcano-s.svg
index 411fd3a8dd..3a07308a43 100644
--- a/data/styles/clear/style-clear/symbols/volcano-s.svg
+++ b/data/styles/clear/style-clear/symbols/volcano-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="volcano-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#717065" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.87037037"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.87037037"></circle>
             <path d="M8.4999999,7.02483701 C8.12407903,7.02483701 7.39893749,6.67254666 7.39893749,6.67254666 L4.46125731,11.3136574 C4.4233039,11.3804493 4.40740741,11.4553792 4.40740741,11.5300926 C4.40740741,11.8547454 4.62280702,11.9630495 4.83820663,11.962963 L12.1617934,11.962963 C12.377193,11.9630495 12.5925926,11.8547454 12.5925926,11.5300926 C12.5925926,11.4553792 12.5767176,11.3804493 12.5387427,11.3136574 L9.655908,6.67254666 C9.655908,6.67254666 8.87640253,7.02483701 8.4999999,7.02483701 Z" id="path11349" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <rect id="Rectangle-35" fill="#FFFFFF" sketch:type="MSShapeGroup" x="8.13043478" y="4.43478261" width="1.47826087" height="1.47826087"></rect>
             <rect id="Rectangle-35-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup" x="9.60869565" y="2.95652174" width="1.47826087" height="1.47826087"></rect>
diff --git a/data/styles/clear/style-clear/symbols/waterfall-l.svg b/data/styles/clear/style-clear/symbols/waterfall-l.svg
index 73ce94a6a2..031061ba23 100644
--- a/data/styles/clear/style-clear/symbols/waterfall-l.svg
+++ b/data/styles/clear/style-clear/symbols/waterfall-l.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="waterfall-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="waterfall-l" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.981000)">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
             <circle id="Oval-1-Copy-38" fill="#2E89B0" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M5,17.4166667 L5,18.7708667 C5,18.7708667 6,18.3336667 7,18.3333333 C8,18.333 9,19 10.5,19 C12,19 12.47352,18.3564667 13.5,18.3333333 C14.5,18.3336667 15,19 16.5,19 C18,19 19,18.3333333 20,18.3333333 C20.70165,18.3333333 22,18.7708667 22,18.7708667 L22,17.4166667 C21.3584,17.2521333 20.65657,17 20,17 C18.5,17 17.5,17.667 16.5,17.6666667 C15.5,17.6663333 15,17 13.5,17 C12,17 11.5,17.667 10.5,17.6666667 C9.5,17.667 8.5,17 7,17 C6.30594,17 5.66024,17.2699333 5,17.4166667 Z" id="path4758-copy-12" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-clear/symbols/waterfall-m.svg b/data/styles/clear/style-clear/symbols/waterfall-m.svg
index 2b48ffb7d8..d82c11ebd3 100644
--- a/data/styles/clear/style-clear/symbols/waterfall-m.svg
+++ b/data/styles/clear/style-clear/symbols/waterfall-m.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="waterfall-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="waterfall-m" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.981000)">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
             <ellipse id="Oval-1-Copy-40" fill="#2E89B0" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M6.53367864,14 C6.00144614,14 5.50629799,14.2069955 5,14.3195164 L5,15.3579702 C5,15.3579702 5.76683932,15.022708 6.53367864,15.0224524 C7.30051796,15.0221968 8.06735728,15.5336786 9.21761626,15.5336786 C10.3678752,15.5336786 10.730989,15.040192 11.5181342,15.0224524 C12.2849735,15.022708 12.6683932,15.5336786 13.8186522,15.5336786 C14.9689111,15.5336786 15.7357505,15.0224524 16.5025898,15.0224524 C17.0406426,15.0224524 18.0362684,15.3579702 18.0362684,15.3579702 L18.0362684,14.3195164 C17.5442643,14.1933458 17.0060735,14 16.5025898,14 C15.3523308,14 14.5854915,14.5114818 13.8186522,14.5112262 C13.0518129,14.5109706 12.6683932,14 11.5181342,14 C10.3678752,14 9.98445557,14.5114818 9.21761626,14.5112262 C8.45077694,14.5114818 7.68393762,14 6.53367864,14 L6.53367864,14 Z" id="path4758-copy-18" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-clear/symbols/waterfall-s.svg b/data/styles/clear/style-clear/symbols/waterfall-s.svg
index 4777875a85..73e6a7890b 100644
--- a/data/styles/clear/style-clear/symbols/waterfall-s.svg
+++ b/data/styles/clear/style-clear/symbols/waterfall-s.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="waterfall-s" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.019000)">
+        <g id="waterfall-s" sketch:type="MSLayerGroup" transform="translate(0.000000, 0.981000)">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
             <circle id="Oval-1-Copy-42" fill="#2E89B0" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M5.05882353,10 C4.69138,10 4.34953882,10.1368898 4,10.2113019 L4,10.89805 C4,10.89805 4.52941176,10.6763352 5.05882353,10.6761661 C5.58823529,10.6759971 6.11764706,11.0142492 6.91176471,11.0142492 C7.70588235,11.0142492 7.95656941,10.6878976 8.5,10.6761661 C9.02941176,10.6763352 9.29411765,11.0142492 10.0882353,11.0142492 C10.8823529,11.0142492 11.4117647,10.6761661 11.9411765,10.6761661 C12.3126382,10.6761661 13,10.89805 13,10.89805 L13,10.2113019 C12.6603294,10.127863 12.2887724,10 11.9411765,10 C11.1470588,10 10.6176471,10.3382521 10.0882353,10.3380831 C9.55882353,10.337914 9.29411765,10 8.5,10 C7.70588235,10 7.44117647,10.3382521 6.91176471,10.3380831 C6.38235294,10.3382521 5.85294118,10 5.05882353,10 L5.05882353,10 Z" id="path4758-copy-24" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
diff --git a/data/styles/clear/style-clear/symbols/wayside_cross-l.svg b/data/styles/clear/style-clear/symbols/wayside_cross-l.svg
index 3ce0d243a0..4db333b26f 100644
--- a/data/styles/clear/style-clear/symbols/wayside_cross-l.svg
+++ b/data/styles/clear/style-clear/symbols/wayside_cross-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="wayside_cross-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M7,20 L7,22 L20,22 L20,20 L7,20 L7,20 Z M17,8 L15,5 L12,5 L10,8 L10,18 L17,18 L17,8 L17,8 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/wayside_cross-m.svg b/data/styles/clear/style-clear/symbols/wayside_cross-m.svg
index a9f9373b51..cde43f09dc 100644
--- a/data/styles/clear/style-clear/symbols/wayside_cross-m.svg
+++ b/data/styles/clear/style-clear/symbols/wayside_cross-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="wayside_cross-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M7,17 L7,19 L16,19 L16,17 L7,17 L7,17 Z M14,7.72727273 L12,5 L11,5 L9,7.72727273 L9,15 L14,15 L14,7.72727273 L14,7.72727273 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg
index c7bbebb11d..e3446c65bf 100644
--- a/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg
+++ b/data/styles/clear/style-clear/symbols/wayside_shrine-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="wayside_shrine-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M13.546,4.086 L5.338,11.8590886 L6.752,13.1983292 L13.546,6.76448113 L20.338,13.1983292 L21.752,11.8590886 L13.546,4.086 L13.546,4.086 Z M8,14.6692207 L8,22 L11,22 L11,16.776583 C11,15.4771218 12.112,14.4229671 13.484,14.4229671 L13.514,14.4229671 C14.887,14.4229671 15.999,15.4771218 15.999,16.776583 L15.999,22 L18.999,22 L18.999,14.5839791 L13.545,9.41738976 L8,14.6692207 L8,14.6692207 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg b/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg
index 3559e4c4ac..4ac9257dcb 100644
--- a/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg
+++ b/data/styles/clear/style-clear/symbols/wayside_shrine-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="wayside_shrine-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M11.545,4 L4.979,10.565 L6.111,11.696 L11.546,6.262 L16.98,11.696 L18.112,10.565 L11.545,4 L11.545,4 Z M16,12.735 L16,19 L14,19 L14,15.5 C14,14.119 12.881,13 11.5,13 C10.119,13 9,14.119 9,15.5 L9,19 L7,19 L7,12.807 L11.537,8.371 L16,12.735 L16,12.735 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/windmill-l.svg b/data/styles/clear/style-clear/symbols/windmill-l.svg
index e4f52bf50c..df15776d96 100644
--- a/data/styles/clear/style-clear/symbols/windmill-l.svg
+++ b/data/styles/clear/style-clear/symbols/windmill-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="windmill-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M13.9857586,14.8051956 L10.7637586,19.3911956 L10.4847586,22.9851956 L17.4847586,22.9851956 L17.2137586,19.2301956 L13.9857586,14.8051956 L13.9857586,14.8051956 Z M20.6057586,14.9841956 L15.2057586,10.9851956 L20.6047586,6.98419562 C21.0487586,6.65519562 21.0917586,6.07219562 20.7017586,5.68119562 L19.2887586,4.26719562 C18.8977586,3.87619562 18.3157586,3.91919562 17.9867586,4.36419562 L13.9867586,9.76619562 L9.98375862,4.36519562 C9.65475862,3.92019562 9.07175862,3.87819562 8.68175862,4.26719562 L7.26675862,5.68019562 C6.87575862,6.07219562 6.91975862,6.65419562 7.36475862,6.98219562 L12.7677586,10.9831956 L7.36575862,14.9861956 C6.92175862,15.3141956 6.87975862,15.8981956 7.26975862,16.2881956 L8.68175862,17.7021956 C9.07275862,18.0941956 9.65475862,18.0501956 9.98475862,17.6061956 L13.9857586,12.2041956 L17.9857586,17.6031956 C18.3147586,18.0481956 18.8977586,18.0901956 19.2887586,17.7001956 L20.7027586,16.2881956 C21.0927586,15.8971956 21.0487586,15.3141956 20.6057586,14.9841956 L20.6057586,14.9841956 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/windmill-m.svg b/data/styles/clear/style-clear/symbols/windmill-m.svg
index a098d99f39..2f191b24b0 100644
--- a/data/styles/clear/style-clear/symbols/windmill-m.svg
+++ b/data/styles/clear/style-clear/symbols/windmill-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="windmill-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#717065" sketch:type="MSShapeGroup"></path>
+            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#7F7D54" sketch:type="MSShapeGroup"></path>
             <path d="M11.5879177,12.6429177 L9.0109177,16.3119177 L8.7869177,19.1869177 L14.3879177,19.1869177 L14.1699177,16.1829177 L11.5879177,12.6429177 L11.5879177,12.6429177 Z M16.8839177,12.7869177 L12.5639177,9.5879177 L16.8839177,6.3869177 C17.2389177,6.1229177 17.2729177,5.6569177 16.9599177,5.3439177 L15.8299177,4.2129177 C15.5179177,3.9009177 15.0519177,3.9359177 14.7879177,4.2909177 L11.5889177,8.6119177 L8.3859177,4.2909177 C8.1229177,3.9359177 7.6569177,3.9009177 7.3449177,4.2129177 L6.2129177,5.3439177 C5.9009177,5.6559177 5.9359177,6.1229177 6.2909177,6.3849177 L10.6139177,9.5859177 L6.2919177,12.7879177 C5.9369177,13.0509177 5.9029177,13.5169177 6.2159177,13.8299177 L7.3449177,14.9609177 C7.6569177,15.2729177 8.1229177,15.2379177 8.3879177,14.8849177 L11.5879177,10.5629177 L14.7879177,14.8819177 C15.0519177,15.2379177 15.5169177,15.2719177 15.8299177,14.9589177 L16.9619177,13.8299177 C17.2749177,13.5169177 17.2389177,13.0499177 16.8839177,12.7869177 L16.8839177,12.7869177 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/zoo-l.svg b/data/styles/clear/style-clear/symbols/zoo-l.svg
index 7fba902731..6918122e61 100644
--- a/data/styles/clear/style-clear/symbols/zoo-l.svg
+++ b/data/styles/clear/style-clear/symbols/zoo-l.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="zoo-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#8C4D16" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#7F7D54" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
             <path d="M19,4 C17,7 15.215787,9.0052 13,11 C10.883373,12.9055 7,12.2513 7,15 L7,16 C7,17 8,17.9515 8,19 L8,20 C8,21.5 7.5,21.5 7,23 L8,23 L10,20 L10,23 L11,23 L11,21.5 L11,17 L13,17 L13,23 L14,23 L14,20 L14,18.5 L15,20 L16,23 L17,23 L15.46875,16.71875 C16.058246,16.359058 16,15.694118 16,15 L16,12 L20,6.5 L21.4375,6.9453125 C21.737214,7.0381587 22,7 22,6.75 C22,6.25 21.673378,6.1387024 21.5,6 L19,4 Z" id="path10847-43-3-9" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/zoo-m.svg b/data/styles/clear/style-clear/symbols/zoo-m.svg
index 12946f78a4..ace97b8c5c 100644
--- a/data/styles/clear/style-clear/symbols/zoo-m.svg
+++ b/data/styles/clear/style-clear/symbols/zoo-m.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="zoo-m" sketch:type="MSLayerGroup">
             <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
-            <ellipse id="Oval-1-Copy-40" fill="#8C4D16" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#7F7D54" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
             <path d="M15,6 C13.66667,8 13.47719,9.6701 12,11 C10.58891,12.2703 8,11.8342 8,13.6667 L8,14.3333 C8,15 8.66667,15.6343 8.66667,16.3333 L8.66667,17 C8.66667,18 8.33333,18 8,19 L8.66667,19 L10,17 L10,19 L11,19 L11,15 L12,15 L12,19 L13,19 L13,16 L14,19 L14.66667,19 L13.64583,14.8125 C14.03883,14.5727 14,14.1294 14,13.6667 L14,11.6667 L15.5,8 L17,8.5 C17,8.453 16.99948,8.038 17,8 C17,8 16.75649,7.7565 16.66667,7.6667 L15,6 Z" id="path10847-43-3-9-9" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/symbols/zoo-s.svg b/data/styles/clear/style-clear/symbols/zoo-s.svg
index bfa613f509..f542531f04 100644
--- a/data/styles/clear/style-clear/symbols/zoo-s.svg
+++ b/data/styles/clear/style-clear/symbols/zoo-s.svg
@@ -7,7 +7,7 @@
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="zoo-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#8C4D16" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#7F7D54" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M10.5,4 C9.5,5.5 9.60789,7.0026 8.5,8 C7.44168,8.9528 5,8.6257 5,10 L5,10.5 C5,11 5.5,11.4758 5.5,12 L5.5,12.5 C5.5,13.25 5.25,13.25 5,14 L5.5,14 L6.5,12.5 L6.5,14 L7,14 L7,11 L8,11 L8,14 L8.5,14 L8.5,11.5 L9.5,11.5 L10,14 L10.5,14 L10,10 L10,8.5 L11,5 L12,5 L12,4 L10.5,4 Z" id="path10518" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-clear/xhdpi/route_from.png b/data/styles/clear/style-clear/xhdpi/route_from.png
index be419ee49d..3e2de72ae2 100644
--- a/data/styles/clear/style-clear/xhdpi/route_from.png
+++ b/data/styles/clear/style-clear/xhdpi/route_from.png
diff --git a/data/styles/clear/style-clear/xhdpi/route_to.png b/data/styles/clear/style-clear/xhdpi/route_to.png
index 7226f77951..71ac6ff4ec 100644
--- a/data/styles/clear/style-clear/xhdpi/route_to.png
+++ b/data/styles/clear/style-clear/xhdpi/route_to.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route_from.png b/data/styles/clear/style-clear/xxhdpi/route_from.png
index 347cf712fb..3464497403 100644
--- a/data/styles/clear/style-clear/xxhdpi/route_from.png
+++ b/data/styles/clear/style-clear/xxhdpi/route_from.png
diff --git a/data/styles/clear/style-clear/xxhdpi/route_to.png b/data/styles/clear/style-clear/xxhdpi/route_to.png
index 452f859594..449b7be1b7 100644
--- a/data/styles/clear/style-clear/xxhdpi/route_to.png
+++ b/data/styles/clear/style-clear/xxhdpi/route_to.png
diff --git a/data/styles/clear/style-night/6plus/route_from.png b/data/styles/clear/style-night/6plus/route_from.png
index f073e4df01..130060ea78 100644
--- a/data/styles/clear/style-night/6plus/route_from.png
+++ b/data/styles/clear/style-night/6plus/route_from.png
diff --git a/data/styles/clear/style-night/6plus/route_to.png b/data/styles/clear/style-night/6plus/route_to.png
index 41d23aafad..4c3f8b727b 100644
--- a/data/styles/clear/style-night/6plus/route_to.png
+++ b/data/styles/clear/style-night/6plus/route_to.png
diff --git a/data/styles/clear/style-night/colors.mapcss b/data/styles/clear/style-night/colors.mapcss
index bbb9a932c1..dd239b8a69 100644
--- a/data/styles/clear/style-night/colors.mapcss
+++ b/data/styles/clear/style-night/colors.mapcss
@@ -96,7 +96,6 @@
 @glacier: #111111;
 @water: #002222;
 @river: #062026;
-@wetland: #001919;
 @forest: #1B2500;
 @park: #1B2500;
 @beach: #28281A;
@@ -126,7 +125,7 @@
 
 /* LABELS COLORS */
 @label_extra_dark: #EEEEEE;
-@label_dark: #B2B2B2;
+@label_dark: #888888;
 @label_medium: #777777;
 @label_light: #666666;
 @label_extra_light: #555555;
@@ -154,10 +153,13 @@
 @primary_road_label: #909090;
 @secondary_road_label: #707070;
 @road_label_halo: #000000;
-@shield: #FFFFFF;
+@shield: #909090;
 @shield_halo: #000000;
 /* blue - #2E89B0; #498F46; #598DBE; */
 
+@label_dark: #333333;
+@label_light: #444444;
+@dark:  #333333;
 
 /* NATURAL LABELS */
 @water_label: #004466;
diff --git a/data/styles/clear/style-night/hdpi/route_from.png b/data/styles/clear/style-night/hdpi/route_from.png
index 793fa6b817..b457b0f2a5 100644
--- a/data/styles/clear/style-night/hdpi/route_from.png
+++ b/data/styles/clear/style-night/hdpi/route_from.png
diff --git a/data/styles/clear/style-night/hdpi/route_to.png b/data/styles/clear/style-night/hdpi/route_to.png
index 718f6d1b0e..4b0ecaab94 100644
--- a/data/styles/clear/style-night/hdpi/route_to.png
+++ b/data/styles/clear/style-night/hdpi/route_to.png
diff --git a/data/styles/clear/style-night/ldpi/route_from.png b/data/styles/clear/style-night/ldpi/route_from.png
index 541626a1d5..e305504f3b 100644
--- a/data/styles/clear/style-night/ldpi/route_from.png
+++ b/data/styles/clear/style-night/ldpi/route_from.png
diff --git a/data/styles/clear/style-night/ldpi/route_to.png b/data/styles/clear/style-night/ldpi/route_to.png
index da6017cf44..4c87d967b2 100644
--- a/data/styles/clear/style-night/ldpi/route_to.png
+++ b/data/styles/clear/style-night/ldpi/route_to.png
diff --git a/data/styles/clear/style-night/mdpi/route_from.png b/data/styles/clear/style-night/mdpi/route_from.png
index 8d22b8243d..c3d31ff777 100644
--- a/data/styles/clear/style-night/mdpi/route_from.png
+++ b/data/styles/clear/style-night/mdpi/route_from.png
diff --git a/data/styles/clear/style-night/mdpi/route_to.png b/data/styles/clear/style-night/mdpi/route_to.png
index 581bb0e408..47d548989f 100644
--- a/data/styles/clear/style-night/mdpi/route_to.png
+++ b/data/styles/clear/style-night/mdpi/route_to.png
diff --git a/data/styles/clear/style-night/symbols/airport-l.svg b/data/styles/clear/style-night/symbols/airport-l.svg
index 718fe1ad17..cc8b0b1319 100644
--- a/data/styles/clear/style-night/symbols/airport-l.svg
+++ b/data/styles/clear/style-night/symbols/airport-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="28px" height="28px" viewBox="0 0 28 28" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>airport-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="airport-l" sketch:type="MSLayerGroup" transform="translate(0.840271, 0.634843)">
-            <ellipse id="Oval-1-Copy-45" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.3823814" cy="13.3804134" rx="13.3823814" ry="13.3804134"></ellipse>
-            <ellipse id="Oval-1-Copy-44" fill="#133655" sketch:type="MSShapeGroup" cx="13.3823814" cy="13.3804134" rx="12.3910939" ry="12.3892717"></ellipse>
-            <g id="g6678" transform="translate(4.956438, 3.964567)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
+            <ellipse id="Oval-1-Copy-45" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.3823814" cy="13.3804134" rx="13.3823814" ry="13.3804134"></ellipse>
+            <ellipse id="Oval-1-Copy-44" fill="#21405C" sketch:type="MSShapeGroup" cx="13.3823814" cy="13.3804134" rx="12.3910939" ry="12.3892717"></ellipse>
+            <g id="g6678" transform="translate(4.956438, 3.964567)" fill="#FFFFFF" opacity="0.41" sketch:type="MSShapeGroup">
                 <g id="g14771">
                     <path d="M16.8518877,10.7659797 L16.8518877,11.2615506 L9.91287512,10.2704089 L9.91287512,14.2347776 L11.8954501,16.2172593 C11.8954501,16.7128301 11.3998064,17.208401 10.9041626,17.208401 L5.94772507,17.208401 C5.45208132,17.208401 4.95643756,16.7128301 4.95643756,16.2172593 L6.93901258,14.2347776 L6.93901258,10.2702106 L0,11.2613524 L0,10.7659797 C0,10.2704089 0.303009927,10.1337304 0.495643756,10.0226234 L6.93901258,6.3056437 L6.93901258,4.32336024 C6.93901258,3.3322185 7.43465634,0.358793307 8.42594385,0.358793307 C9.41723136,0.358793307 9.91287512,3.3322185 9.91287512,4.32336024 L9.91287512,6.3056437 L16.3562439,10.0226234 C16.6322283,10.1818008 16.8518877,10.2615877 16.8518877,10.7659797 L16.8518877,10.7659797 Z" id="path7712"></path>
                 </g>
diff --git a/data/styles/clear/style-night/symbols/airport-m.svg b/data/styles/clear/style-night/symbols/airport-m.svg
index 25e8808be8..2f37d0397c 100644
--- a/data/styles/clear/style-night/symbols/airport-m.svg
+++ b/data/styles/clear/style-night/symbols/airport-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>airport-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="airport-m" sketch:type="MSLayerGroup" transform="translate(0.526621, 0.617126)">
-            <ellipse id="Oval-1-Copy-47" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.3998064" cy="11.3981299" rx="11.3998064" ry="11.3981299"></ellipse>
-            <ellipse id="Oval-1-Copy-46" fill="#133655" sketch:type="MSShapeGroup" cx="11.3998064" cy="11.3981299" rx="10.4085189" ry="10.4069882"></ellipse>
-            <path d="M18.338819,12.2526923 L18.338819,13.2438341 L12.8867377,12.2526923 L12.8867377,15.2261175 L14.8693127,16.4374909 L14.8693127,17.208401 L8.92158761,17.208401 L8.92158761,16.4374909 L10.9041626,15.2261175 L10.9041626,12.2526923 L5.45208132,13.2438341 L5.45208132,12.2526923 L10.9041626,9.27926713 L10.9041626,6.30584193 C10.9041626,5.535031 11.1244465,4.32355846 11.8954501,4.32355846 C12.6664438,4.32355846 12.8867377,5.535031 12.8867377,6.30584193 L12.8867377,9.27926713 L18.338819,12.2526923 Z" id="path7712-0" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <ellipse id="Oval-1-Copy-47" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.3998064" cy="11.3981299" rx="11.3998064" ry="11.3981299"></ellipse>
+            <ellipse id="Oval-1-Copy-46" fill="#21405C" sketch:type="MSShapeGroup" cx="11.3998064" cy="11.3981299" rx="10.4085189" ry="10.4069882"></ellipse>
+            <path d="M18.338819,12.2526923 L18.338819,13.2438341 L12.8867377,12.2526923 L12.8867377,15.2261175 L14.8693127,16.4374909 L14.8693127,17.208401 L8.92158761,17.208401 L8.92158761,16.4374909 L10.9041626,15.2261175 L10.9041626,12.2526923 L5.45208132,13.2438341 L5.45208132,12.2526923 L10.9041626,9.27926713 L10.9041626,6.30584193 C10.9041626,5.535031 11.1244465,4.32355846 11.8954501,4.32355846 C12.6664438,4.32355846 12.8867377,5.535031 12.8867377,6.30584193 L12.8867377,9.27926713 L18.338819,12.2526923 Z" id="path7712-0" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/airport-s.svg b/data/styles/clear/style-night/symbols/airport-s.svg
index f233700059..a2918652ad 100644
--- a/data/styles/clear/style-night/symbols/airport-s.svg
+++ b/data/styles/clear/style-night/symbols/airport-s.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>airport-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="airport-s" sketch:type="MSLayerGroup" transform="translate(0.239109, 0.590551)">
-            <ellipse id="Oval-1-Copy-51" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.42594385" cy="8.42470472" rx="8.42594385" ry="8.42470472"></ellipse>
-            <ellipse id="Oval-1-Copy-50" fill="#133655" sketch:type="MSShapeGroup" cx="8.42594385" cy="8.42470472" rx="7.43465634" ry="7.43356299"></ellipse>
-            <path d="M12.8867377,8.71292874 L12.8867377,9.27926713 L9.91287512,9.27926692 L9.91287512,10.7659797 L10.9041626,11.8122289 L10.9041626,12.2526923 L6.93901258,12.2526923 L6.93901258,11.8122289 L7.9303001,10.7659797 L7.9303001,9.27926692 L4.95643756,9.27926713 L4.95643756,8.71292874 L7.9303001,7.29698366 L7.9303001,5.3147002 C7.9303001,4.87423681 8.47917438,4.03223664 8.91970255,4.03223664 C9.36027037,4.03223664 9.91287512,4.87423681 9.91287512,5.3147002 L9.91287512,7.29698366 L12.8867377,8.71292874 Z" id="path7712-0-5" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <ellipse id="Oval-1-Copy-51" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.42594385" cy="8.42470472" rx="8.42594385" ry="8.42470472"></ellipse>
+            <ellipse id="Oval-1-Copy-50" fill="#21405C" sketch:type="MSShapeGroup" cx="8.42594385" cy="8.42470472" rx="7.43465634" ry="7.43356299"></ellipse>
+            <path d="M12.8867377,8.71292874 L12.8867377,9.27926713 L9.91287512,9.27926692 L9.91287512,10.7659797 L10.9041626,11.8122289 L10.9041626,12.2526923 L6.93901258,12.2526923 L6.93901258,11.8122289 L7.9303001,10.7659797 L7.9303001,9.27926692 L4.95643756,9.27926713 L4.95643756,8.71292874 L7.9303001,7.29698366 L7.9303001,5.3147002 C7.9303001,4.87423681 8.47917438,4.03223664 8.91970255,4.03223664 C9.36027037,4.03223664 9.91287512,4.87423681 9.91287512,5.3147002 L9.91287512,7.29698366 L12.8867377,8.71292874 Z" id="path7712-0-5" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/alcohol-l.svg b/data/styles/clear/style-night/symbols/alcohol-l.svg
index e98117cca8..673935cb3e 100644
--- a/data/styles/clear/style-night/symbols/alcohol-l.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-l.svg
@@ -6,9 +6,9 @@
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="alcohol-l" sketch:type="MSLayerGroup">
-            <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
-            <path d="M12.174,10.437 L11,9.637 L10.502,4 L8.498,4 L8,9.695 L6.838,10.453 C6.375,10.756 6,11.447 6,12 L6,21 C6,21.553 6.447,22 7,22 L12,22 C12.553,22 13,21.553 13,21 L13,12 C13,11.447 12.63,10.748 12.174,10.437 L12.174,10.437 Z M20,16 C21.104,16 22,15.104 22,14 L21,9 L16,9 L15,14 C15,15.104 15.896,16 17,16 L18,16 L18,20.2 L16,21 L16,22 L21,22 L21,21 L19,20.2 L19,16 L20,16 L20,16 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#3D3D37" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M9,4 C8.44599,4 8.5,4.6273 8.5,5 L8.5,7.5 C8.5,8 8.00236,8.7488 7.5,9 C6.5,9.5 6,10 6,11 L6,20 C6,20.554 6.44599,21 7,21 L12,21 C12.55401,21 13,20.554 13,20 L13,11 C13,10 12.5,9.5 11.5,9 C11.00136,8.7507 10.5,8 10.5,7.5 L10.5,5 C10.5,4.5 10.554,4 10,4 L9,4 Z M15,11 L15,14 C15,15 16,16 17,16 L18,16 L18,18.5 C18,19 17,20 16,20 C15,20 15,21 15,21 L22,21 C22,21 22,20 21,20 C20,20 19,19 19,18.5 L19,16 L20,16 C21,16 22,15 22,14 L22,11 L15,11 Z" id="rect7216-copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/alcohol-m.svg b/data/styles/clear/style-night/symbols/alcohol-m.svg
index 85d68ee0c8..a7cd7f3a12 100644
--- a/data/styles/clear/style-night/symbols/alcohol-m.svg
+++ b/data/styles/clear/style-night/symbols/alcohol-m.svg
@@ -6,9 +6,9 @@
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="alcohol-m" sketch:type="MSLayerGroup">
-            <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
-            <path d="M10.41,9.742 L9.571,9.171 L9.215,5.146 L7.785,5.146 L7.429,9.212 L6.599,9.755 C6.269,9.971 6,10.464 6,10.859 L6,17.288 C6,17.683 6.32,18.001 6.715,18.001 L10.286,18.001 C10.68,18.001 11,17.683 11,17.288 L11,10.859 C11,10.464 10.736,9.965 10.41,9.742 L10.41,9.742 Z M16.571,13.001 C17.36,13.001 18,12.361 18,11.572 L17.285,8 L13.713,8 L13,11.572 C13,12.361 13.639,13.001 14.429,13.001 L15,13.001 L15,16.715 L13,17.287 L13,18 L18,18 L18,17.287 L16,16.715 L16,13.001 L16.571,13.001 L16.571,13.001 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <ellipse id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="11.5" ry="11.5"></ellipse>
+            <ellipse id="Oval-1-Copy-40" fill="#3D3D37" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" rx="10.5" ry="10.5"></ellipse>
+            <path d="M8.5,4 L8,4.5 L8,7.5 L6,10 L6,18 L12,18 L12,10 L10,7.5 L10,4.5 L9.5,4 L8.5,4 L8.5,4 Z M13,10 L13,13 C13,13 13,14 14,14 L15,14 L15,17 L13.5,17.5 L13,18 L18,18 L17.5,17.5 L16,17 L16,14 L17,14 C18,14 18,13 18,13 L18,10 L13,10 L13,10 Z" id="path5792-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bus-l.svg b/data/styles/clear/style-night/symbols/bus-l.svg
index 8ecd6f662c..48c5d580e0 100644
--- a/data/styles/clear/style-night/symbols/bus-l.svg
+++ b/data/styles/clear/style-night/symbols/bus-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>bus-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bus-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M24.1791951,7 L7.99456145,7 C6.90234375,7 6,7.89111747 6,8.99036657 L6,14.6514969 L5.87738037,14.7172421 C5.39522648,14.9757597 5,15.6350152 5,16.1868445 L5,20.0008247 C5,20.5439162 5.44881738,21 6.00246167,21 L15.0354444,21 C15.012086,20.8366985 15,20.6697607 15,20.5 C15,18.5670034 16.5670034,17 18.5,17 C20.4329966,17 22,18.5670034 22,20.5 C22,20.6697607 21.987914,20.8366985 21.9645556,21 L23.5009155,21 C24.9767568,19.0351697 25.8870676,16.6212813 25.9901828,14 L25.0029293,14 C24.4490268,14 24,13.5562834 24,13.0001925 L24,9.99980749 C24,9.44762906 24.4378814,9 25.0029293,9 L25.1655114,9 C24.8956127,8.30079625 24.5646621,7.63195111 24.1791951,7 Z M15,9.99980749 C15,9.44762906 15.4378814,9 16.0029293,9 L20.9970707,9 C21.5509732,9 22,9.44371665 22,9.99980749 L22,13.0001925 C22,13.5523709 21.5621186,14 20.9970707,14 L16.0029293,14 C15.4490268,14 15,13.5562834 15,13.0001925 L15,9.99980749 Z M8,9.99539757 C8,9.44565467 8.44371665,9 8.99980749,9 L12.0001925,9 C12.5523709,9 13,9.4556644 13,9.99539757 L13,19 L8,19 L8,9.99539757 Z M18.5,23 C19.8807119,23 21,21.8807119 21,20.5 C21,19.1192881 19.8807119,18 18.5,18 C17.1192881,18 16,19.1192881 16,20.5 C16,21.8807119 17.1192881,23 18.5,23 Z" id="Mask" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#21405C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M24.1791951,7 L7.99456145,7 C6.90234375,7 6,7.89111747 6,8.99036657 L6,14.6514969 L5.87738037,14.7172421 C5.39522648,14.9757597 5,15.6350152 5,16.1868445 L5,20.0008247 C5,20.5439162 5.44881738,21 6.00246167,21 L15.0354444,21 L15.0354444,21 C15.012086,20.8366985 15,20.6697607 15,20.5 C15,18.5670034 16.5670034,17 18.5,17 C20.4329966,17 22,18.5670034 22,20.5 C22,20.6697607 21.987914,20.8366985 21.9645556,21 L23.5009155,21 C24.9767568,19.0351697 25.8870676,16.6212813 25.9901828,14 L25.0029293,14 C24.4490268,14 24,13.5562834 24,13.0001925 L24,9.99980749 C24,9.44762906 24.4378814,9 25.0029293,9 L25.1655114,9 C24.8956127,8.30079625 24.5646621,7.63195111 24.1791951,7 Z M15,9.99980749 C15,9.44762906 15.4378814,9 16.0029293,9 L20.9970707,9 C21.5509732,9 22,9.44371665 22,9.99980749 L22,13.0001925 C22,13.5523709 21.5621186,14 20.9970707,14 L16.0029293,14 C15.4490268,14 15,13.5562834 15,13.0001925 L15,9.99980749 Z M8,9.99539757 C8,9.44565467 8.44371665,9 8.99980749,9 L12.0001925,9 C12.5523709,9 13,9.4556644 13,9.99539757 L13,19 L8,19 L8,9.99539757 Z M18.5,23 C19.8807119,23 21,21.8807119 21,20.5 C21,19.1192881 19.8807119,18 18.5,18 C17.1192881,18 16,19.1192881 16,20.5 C16,21.8807119 17.1192881,23 18.5,23 Z" id="Mask" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bus-m.svg b/data/styles/clear/style-night/symbols/bus-m.svg
index a340187418..0d730504c4 100644
--- a/data/styles/clear/style-night/symbols/bus-m.svg
+++ b/data/styles/clear/style-night/symbols/bus-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>bus-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bus-m" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M20.4460025,6 L6.99079514,6 C5.89821238,6 5,6.89112225 5,7.99037724 L5,10.9638276 L4.87738037,11.0295729 C4.39522648,11.2880905 4,11.9516483 4,12.5087848 L4,15.9912152 C4,16.5499119 4.44715386,17 4.99874609,17 L12.0354444,17 C12.012086,16.8366985 12,16.6697607 12,16.5 C12,14.5670034 13.5670034,13 15.5,13 C17.4329966,13 19,14.5670034 19,16.5 C19,16.6697607 18.987914,16.8366985 18.9645556,17 L20.4460025,17 C21.3495828,15.533412 21.9026157,13.8278132 21.9883049,12 L21.0029293,12 C20.4490268,12 20,11.5566468 20,10.9906311 L20,9.0093689 C20,8.45190985 20.4378814,8 21.0029293,8 L21.40253,8 C21.1536409,7.29582798 20.8317689,6.62613174 20.4460025,6 L20.4460025,6 Z M13,9.0093689 C13,8.45190985 13.4437166,8 13.9998075,8 L17.0001925,8 C17.5523709,8 18,8.44335318 18,9.0093689 L18,10.9906311 C18,11.5480902 17.5562834,12 17.0001925,12 L13.9998075,12 C13.4476291,12 13,11.5566468 13,10.9906311 L13,9.0093689 L13,9.0093689 Z M7,8.99703014 C7,8.4463856 7.44335318,8 8.0093689,8 L9.9906311,8 C10.5480902,8 11,8.45303631 11,8.99703014 L11,16 L7,16 L7,8.99703014 L7,8.99703014 Z M15.5,19 C16.8807119,19 18,17.8807119 18,16.5 C18,15.1192881 16.8807119,14 15.5,14 C14.1192881,14 13,15.1192881 13,16.5 C13,17.8807119 14.1192881,19 15.5,19 L15.5,19 Z" id="Mask" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#21405C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <path d="M20.4460025,6 L6.99079514,6 C5.89821238,6 5,6.89112225 5,7.99037724 L5,10.9638276 L4.87738037,11.0295729 C4.39522648,11.2880905 4,11.9516483 4,12.5087848 L4,15.9912152 C4,16.5499119 4.44715386,17 4.99874609,17 L12.0354444,17 C12.012086,16.8366985 12,16.6697607 12,16.5 C12,14.5670034 13.5670034,13 15.5,13 C17.4329966,13 19,14.5670034 19,16.5 C19,16.6697607 18.987914,16.8366985 18.9645556,17 L20.4460025,17 C21.3495828,15.533412 21.9026157,13.8278132 21.9883049,12 L21.0029293,12 C20.4490268,12 20,11.5566468 20,10.9906311 L20,9.0093689 C20,8.45190985 20.4378814,8 21.0029293,8 L21.40253,8 C21.1536409,7.29582798 20.8317689,6.62613174 20.4460025,6 L20.4460025,6 Z M13,9.0093689 C13,8.45190985 13.4437166,8 13.9998075,8 L17.0001925,8 C17.5523709,8 18,8.44335318 18,9.0093689 L18,10.9906311 C18,11.5480902 17.5562834,12 17.0001925,12 L13.9998075,12 C13.4476291,12 13,11.5566468 13,10.9906311 L13,9.0093689 L13,9.0093689 Z M7,8.99703014 C7,8.4463856 7.44335318,8 8.0093689,8 L9.9906311,8 C10.5480902,8 11,8.45303631 11,8.99703014 L11,16 L7,16 L7,8.99703014 L7,8.99703014 Z M15.5,19 C16.8807119,19 18,17.8807119 18,16.5 C18,15.1192881 16.8807119,14 15.5,14 C14.1192881,14 13,15.1192881 13,16.5 C13,17.8807119 14.1192881,19 15.5,19 L15.5,19 Z" id="Mask" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/bus-s.svg b/data/styles/clear/style-night/symbols/bus-s.svg
index 0c3452952b..737eedcfa8 100644
--- a/data/styles/clear/style-night/symbols/bus-s.svg
+++ b/data/styles/clear/style-night/symbols/bus-s.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>bus-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="bus-s" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M14.5005493,13 L13.9499909,13 C13.9827849,12.838445 14,12.6712329 14,12.5 C14,11.1192881 12.8807119,10 11.5,10 C10.1192881,10 9,11.1192881 9,12.5 C9,12.6712329 9.01721513,12.838445 9.05000906,13 L4,13 L4,7.65149687 L4,5.99668948 C4,4.89394833 4.89821238,4 5.99079514,4 L14.5005493,4 C14.9532572,4.60270312 15.3172777,5.27582819 15.5732357,6 L15.0093689,6 C14.4433532,6 14,6.44724809 14,6.99895656 L14,8.00104344 C14,8.55733967 14.4519098,9 15.0093689,9 L15.9835977,9 C15.8851642,10.495487 15.3483904,11.8712446 14.5005493,13 Z M9,6.99895656 C9,6.44724809 9.44335318,6 10.0093689,6 L11.9906311,6 C12.5480902,6 13,6.44266033 13,6.99895656 L13,8.00104344 C13,8.55275191 12.5566468,9 11.9906311,9 L10.0093689,9 C9.45190985,9 9,8.55733967 9,8.00104344 L9,6.99895656 Z M5,6.49100518 C5,6.21983051 5.2157526,6 5.49538898,6 L7.50461102,6 C7.7782068,6 8,6.22788048 8,6.49100518 L8,12 L5,12 L5,6.49100518 Z M11.5,14 C12.3284271,14 13,13.3284271 13,12.5 C13,11.6715729 12.3284271,11 11.5,11 C10.6715729,11 10,11.6715729 10,12.5 C10,13.3284271 10.6715729,14 11.5,14 Z" id="Mask" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#21405C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M14.5005493,13 L13.9499909,13 C13.9827849,12.838445 14,12.6712329 14,12.5 C14,11.1192881 12.8807119,10 11.5,10 C10.1192881,10 9,11.1192881 9,12.5 C9,12.6712329 9.01721513,12.838445 9.05000906,13 L4,13 L4,7.65149687 L4,5.99668948 C4,4.89394833 4.89821238,4 5.99079514,4 L14.5005493,4 C14.9532572,4.60270312 15.3172777,5.27582819 15.5732357,6 L15.0093689,6 C14.4433532,6 14,6.44724809 14,6.99895656 L14,8.00104344 C14,8.55733967 14.4519098,9 15.0093689,9 L15.9835977,9 C15.8851642,10.495487 15.3483904,11.8712446 14.5005493,13 Z M9,6.99895656 C9,6.44724809 9.44335318,6 10.0093689,6 L11.9906311,6 C12.5480902,6 13,6.44266033 13,6.99895656 L13,8.00104344 C13,8.55275191 12.5566468,9 11.9906311,9 L10.0093689,9 C9.45190985,9 9,8.55733967 9,8.00104344 L9,6.99895656 Z M5,6.49100518 C5,6.21983051 5.2157526,6 5.49538898,6 L7.50461102,6 C7.7782068,6 8,6.22788048 8,6.49100518 L8,12 L5,12 L5,6.49100518 Z M11.5,14 C12.3284271,14 13,13.3284271 13,12.5 C13,11.6715729 12.3284271,11 11.5,11 C10.6715729,11 10,11.6715729 10,12.5 C10,13.3284271 10.6715729,14 11.5,14 Z" id="Mask" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cable-car-l.svg b/data/styles/clear/style-night/symbols/cable-car-l.svg
index 21ad36b33e..3c203a4943 100644
--- a/data/styles/clear/style-night/symbols/cable-car-l.svg
+++ b/data/styles/clear/style-night/symbols/cable-car-l.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>cable-car-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cable-car-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup"></path>
-            <path d="M11.0029293,10 C10.4490268,10 9.63214111,10.2452393 9.16433275,10.5571115 L7.83566725,11.4428885 C7.37414097,11.7505727 7,12.4556644 7,12.9953976 L7,22 C7,22.5 7.5,23 8,23 L10.5,23 L14,23 L16.5,23 L19,23 C19.5,23 20,22.5 20,22 L20,12.9953976 C20,12.4456547 19.6321411,11.7547607 19.1643327,11.4428885 L17.8356673,10.5571115 C17.374141,10.2494273 16.5621186,10 15.9970707,10 L11.0029293,10 Z M10.1052949,12.4473525 C10.5994269,12.2002865 11.4437166,12 11.9998075,12 L15.0001925,12 C15.5523709,12 16.4047298,12.2023649 16.8947051,12.4473525 L17.1052949,12.5526475 C17.5994269,12.7997135 18,13.4433532 18,14.0093689 L18,15.9906311 C18,16.5480902 17.5536886,17 17.0024554,17 L9.99754465,17 C9.44661595,17 9,16.5566468 9,15.9906311 L9,14.0093689 C9,13.4519098 9.40472984,12.7976351 9.89470506,12.5526475 L10.1052949,12.4473525 Z M13,12 L14,12 L14,17 L13,17 L13,12 Z" id="path24859-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M14.357121,5.91071975 L15.4619459,7.99771849 L13.6126744,8 L12.7108116,6.32229711 L6,8 L6,6 L18,3 L18,5 L14.357121,5.91071975 Z M13.6126744,8 L15.4619459,8.00228151 L13.875,11 L12,11 L13.6126744,8 Z" id="Path-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#21405C" sketch:type="MSShapeGroup"></path>
+            <path d="M11.0029293,10 C10.4490268,10 9.63214111,10.2452393 9.16433275,10.5571115 L7.83566725,11.4428885 C7.37414097,11.7505727 7,12.4556644 7,12.9953976 L7,22 C7,22.5 7.5,23 8,23 L10.5,23 L14,23 L16.5,23 L19,23 C19.5,23 20,22.5 20,22 L20,12.9953976 C20,12.4456547 19.6321411,11.7547607 19.1643327,11.4428885 L17.8356673,10.5571115 C17.374141,10.2494273 16.5621186,10 15.9970707,10 L11.0029293,10 Z M10.1052949,12.4473525 C10.5994269,12.2002865 11.4437166,12 11.9998075,12 L15.0001925,12 C15.5523709,12 16.4047298,12.2023649 16.8947051,12.4473525 L17.1052949,12.5526475 C17.5994269,12.7997135 18,13.4433532 18,14.0093689 L18,15.9906311 C18,16.5480902 17.5536886,17 17.0024554,17 L9.99754465,17 C9.44661595,17 9,16.5566468 9,15.9906311 L9,14.0093689 C9,13.4519098 9.40472984,12.7976351 9.89470506,12.5526475 L10.1052949,12.4473525 Z M13,12 L14,12 L14,17 L13,17 L13,12 Z" id="path24859-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M14.357121,5.91071975 L15.4619459,7.99771849 L13.6126744,8 L12.7108116,6.32229711 L6,8 L6,6 L18,3 L18,5 L14.357121,5.91071975 Z M13.6126744,8 L15.4619459,8.00228151 L13.875,11 L12,11 L13.6126744,8 Z" id="Path-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cable-car-m.svg b/data/styles/clear/style-night/symbols/cable-car-m.svg
index 1660f9bde1..220dd8336f 100644
--- a/data/styles/clear/style-night/symbols/cable-car-m.svg
+++ b/data/styles/clear/style-night/symbols/cable-car-m.svg
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>cable-car-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cable-car-m" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M8.98774308,8 C8.43572034,8 7.63187106,8.2689333 7.18898655,8.60317655 L6.79423602,8.90109328 C6.35283296,9.2342185 5.99727577,9.96088415 6.00001573,10.5118661 L6.03723909,17.9971534 C6.05254779,18.4985767 6.55085089,19 7.04915399,19 L16.0186098,19 C16.5169129,19 17.0077475,18.6699559 16.9999073,17.9971534 L16.962684,10.5118661 C16.9599166,9.95538605 16.6013269,9.23533654 16.1584424,8.90109328 L15.7636918,8.60317655 C15.3222888,8.27005134 14.5174531,8 13.9649353,8 L8.98774308,8 Z M8.37871804,10.7399976 C8.75450397,10.3375159 9.49939393,10.0112401 10.0630702,10.0112401 L13.0162029,10.0112401 C13.5706589,10.0112401 14.3214957,10.3477925 14.6836581,10.7522459 L15.0066949,11.1130049 L15.0066949,13.9754866 C15.0066949,14.5238178 14.5596871,14.9683281 14.0071693,14.9683281 L9.02997709,14.9683281 C8.47795435,14.9683281 8.0304515,14.5260735 8.0304515,13.9754866 L8.0304515,11.1130049 L8.37871804,10.7399976 Z" id="path24869" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M11.7,5 L13.2,5 L11.5,8 L10,8 L11.7,5 Z" id="Rectangle-58" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <rect id="Rectangle" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="11.0002578" y="10.00631" width="1.00005155" height="5.0157749"></rect>
-            <path d="M6,5.60000004 L17,3 L17,4.19999999 L6,6.80000003 L6,5.60000004 Z" id="Rectangle-56" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#21405C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <path d="M8.98774308,8 C8.43572034,8 7.63187106,8.2689333 7.18898655,8.60317655 L6.79423602,8.90109328 C6.35283296,9.2342185 5.99727577,9.96088415 6.00001573,10.5118661 L6.03723909,17.9971534 C6.05254779,18.4985767 6.55085089,19 7.04915399,19 L16.0186098,19 C16.5169129,19 17.0077475,18.6699559 16.9999073,17.9971534 L16.962684,10.5118661 C16.9599166,9.95538605 16.6013269,9.23533654 16.1584424,8.90109328 L15.7636918,8.60317655 C15.3222888,8.27005134 14.5174531,8 13.9649353,8 L8.98774308,8 Z M8.37871804,10.7399976 C8.75450397,10.3375159 9.49939393,10.0112401 10.0630702,10.0112401 L13.0162029,10.0112401 C13.5706589,10.0112401 14.3214957,10.3477925 14.6836581,10.7522459 L15.0066949,11.1130049 L15.0066949,13.9754866 C15.0066949,14.5238178 14.5596871,14.9683281 14.0071693,14.9683281 L9.02997709,14.9683281 C8.47795435,14.9683281 8.0304515,14.5260735 8.0304515,13.9754866 L8.0304515,11.1130049 L8.37871804,10.7399976 Z" id="path24869" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M11.7,5 L13.2,5 L11.5,8 L10,8 L11.7,5 Z" id="Rectangle-58" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <rect id="Rectangle" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="11.0002578" y="10.00631" width="1.00005155" height="5.0157749"></rect>
+            <path d="M6,5.60000004 L17,3 L17,4.19999999 L6,6.80000003 L6,5.60000004 Z" id="Rectangle-56" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/cable-car-s.svg b/data/styles/clear/style-night/symbols/cable-car-s.svg
index adad49e726..68d66891ce 100644
--- a/data/styles/clear/style-night/symbols/cable-car-s.svg
+++ b/data/styles/clear/style-night/symbols/cable-car-s.svg
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>cable-car-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="cable-car-s" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.69730425,6.61157772 L5.80269575,6.53127943 C5.35937913,6.86904447 5,7.59491021 5,8.15276589 L5,12.4285714 C5,12.7142857 5.25,13 5.5,13 L6.75,13 L9,13 L10.25,13 L11.5,13 C11.75,13 12,12.7142857 12,12.4285714 L12,8.15276589 C12,7.59500869 11.6368918,6.86620331 11.1973042,6.53127943 L11.3026958,6.61157772 C10.8593791,6.27381267 10.0566468,6 9.4906311,6 L7.5093689,6 C6.95190985,6 6.13689184,6.27665383 5.69730425,6.61157772 Z M7,7.14285714 L10,7.14285714 L11,7.71428571 L11,9.42857143 L6,9.42857143 L6,7.71428571 L7,7.14285714 L7,7.14285714 Z" id="path24879" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <rect id="Rectangle-58" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="8" y="7" width="1" height="3"></rect>
-            <path d="M9.93798452,4.29457364 L12,4 L12,3 L5,4.00000001 L5,5.00000001 L8.52713179,4.49612404 L7.7,6 L9,6 L9.93798452,4.29457364 Z" id="Rectangle-56-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#21405C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M5.69730425,6.61157772 L5.80269575,6.53127943 C5.35937913,6.86904447 5,7.59491021 5,8.15276589 L5,12.4285714 C5,12.7142857 5.25,13 5.5,13 L6.75,13 L9,13 L10.25,13 L11.5,13 C11.75,13 12,12.7142857 12,12.4285714 L12,8.15276589 C12,7.59500869 11.6368918,6.86620331 11.1973042,6.53127943 L11.3026958,6.61157772 C10.8593791,6.27381267 10.0566468,6 9.4906311,6 L7.5093689,6 C6.95190985,6 6.13689184,6.27665383 5.69730425,6.61157772 Z M7,7.14285714 L10,7.14285714 L11,7.71428571 L11,9.42857143 L6,9.42857143 L6,7.71428571 L7,7.14285714 L7,7.14285714 Z" id="path24879" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <rect id="Rectangle-58" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="8" y="7" width="1" height="3"></rect>
+            <path d="M9.93798452,4.29457364 L12,4 L12,3 L5,4.00000001 L5,5.00000001 L8.52713179,4.49612404 L7.7,6 L9,6 L9.93798452,4.29457364 Z" id="Rectangle-56-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/funicular-l.svg b/data/styles/clear/style-night/symbols/funicular-l.svg
index c8fd5151e7..f09568f3da 100644
--- a/data/styles/clear/style-night/symbols/funicular-l.svg
+++ b/data/styles/clear/style-night/symbols/funicular-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>funicular-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="funicular-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup"></path>
-            <path d="M5,10.9953976 C5,10.4456547 5.43731068,9.89710337 5.9750526,9.77057586 L21.0249474,6.22942414 C21.5634541,6.10271669 22,6.4556644 22,6.99539757 L22,15.0046024 C22,15.5543453 21.5626893,16.1028966 21.0249474,16.2294241 L5.9750526,19.7705759 C5.43654592,19.8972833 5,19.5443356 5,19.0046024 L5,10.9953976 Z M7,12.1904785 C7,11.9195947 7.2157526,11.6496577 7.49538898,11.5844092 L9.50461102,11.1155908 C9.7782068,11.0517517 10,11.2150574 10,11.4904785 L10,14.5095215 C10,14.7804053 9.7842474,15.0503423 9.50461102,15.1155908 L7.49538898,15.5844092 C7.2217932,15.6482482 7,15.4849426 7,15.2095215 L7,12.1904785 Z M17,9.19047851 C17,8.91959471 17.2157526,8.64965772 17.495389,8.58440923 L19.504611,8.11559076 C19.7782068,8.05175175 20,8.21505737 20,8.49047852 L20,11.5095215 C20,11.7804053 19.7842474,12.0503423 19.504611,12.1155908 L17.495389,12.5844092 C17.2217932,12.6482482 17,12.4849426 17,12.2095215 L17,9.19047851 Z M12,10.6904785 C12,10.4195947 12.2157526,10.1496577 12.495389,10.0844092 L14.504611,9.61559076 C14.7782068,9.55175175 15,9.71505737 15,9.99047852 L15,13.0095215 C15,13.2804053 14.7842474,13.5503423 14.504611,13.6155908 L12.495389,14.0844092 C12.2217932,14.1482482 12,13.9849426 12,13.7095215 L12,10.6904785 Z" id="Rectangle-41" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#21405C" sketch:type="MSShapeGroup"></path>
+            <path d="M5,10.9953976 C5,10.4456547 5.43731068,9.89710337 5.9750526,9.77057586 L21.0249474,6.22942414 C21.5634541,6.10271669 22,6.4556644 22,6.99539757 L22,15.0046024 C22,15.5543453 21.5626893,16.1028966 21.0249474,16.2294241 L5.9750526,19.7705759 C5.43654592,19.8972833 5,19.5443356 5,19.0046024 L5,10.9953976 Z M7,12.1904785 C7,11.9195947 7.2157526,11.6496577 7.49538898,11.5844092 L9.50461102,11.1155908 C9.7782068,11.0517517 10,11.2150574 10,11.4904785 L10,14.5095215 C10,14.7804053 9.7842474,15.0503423 9.50461102,15.1155908 L7.49538898,15.5844092 C7.2217932,15.6482482 7,15.4849426 7,15.2095215 L7,12.1904785 Z M17,9.19047851 C17,8.91959471 17.2157526,8.64965772 17.495389,8.58440923 L19.504611,8.11559076 C19.7782068,8.05175175 20,8.21505737 20,8.49047852 L20,11.5095215 C20,11.7804053 19.7842474,12.0503423 19.504611,12.1155908 L17.495389,12.5844092 C17.2217932,12.6482482 17,12.4849426 17,12.2095215 L17,9.19047851 Z M12,10.6904785 C12,10.4195947 12.2157526,10.1496577 12.495389,10.0844092 L14.504611,9.61559076 C14.7782068,9.55175175 15,9.71505737 15,9.99047852 L15,13.0095215 C15,13.2804053 14.7842474,13.5503423 14.504611,13.6155908 L12.495389,14.0844092 C12.2217932,14.1482482 12,13.9849426 12,13.7095215 L12,10.6904785 Z" id="Rectangle-41" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/funicular-m.svg b/data/styles/clear/style-night/symbols/funicular-m.svg
index 79756c072b..ea9607b837 100644
--- a/data/styles/clear/style-night/symbols/funicular-m.svg
+++ b/data/styles/clear/style-night/symbols/funicular-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>funicular-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="funicular-m" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M4,9.21764909 C4,8.6679062 4.43274403,8.12416288 4.98419189,7.99916803 L18.0158081,5.04533502 C18.5593623,4.9221294 19,5.27791592 19,5.81764909 L19,13.826854 C19,14.3765968 18.567256,14.9203402 18.0158081,15.045335 L4.98419189,17.999168 C4.44063772,18.1223736 4,17.7665871 4,17.226854 L4,9.21764909 Z M5.7,9.91273003 C5.7,9.64184623 5.9157526,9.37190924 6.19538898,9.30666075 L8.20461102,8.83784228 C8.4782068,8.77400327 8.7,8.93730889 8.7,9.21273004 L8.7,12.231773 C8.7,12.5026568 8.4842474,12.7725938 8.20461102,12.8378423 L6.19538898,13.3066608 C5.9217932,13.3704998 5.7,13.2071941 5.7,12.931773 L5.7,9.91273003 Z M14.6,7.71273003 C14.6,7.44184623 14.8157526,7.17190924 15.095389,7.10666075 L17.104611,6.63784228 C17.3782068,6.57400327 17.6,6.73730889 17.6,7.01273004 L17.6,10.031773 C17.6,10.3026568 17.3842474,10.5725938 17.104611,10.6378423 L15.095389,11.1066608 C14.8217932,11.1704998 14.6,11.0071941 14.6,10.731773 L14.6,7.71273003 Z M10.2,8.91273003 C10.2,8.64184623 10.4197113,8.36732369 10.6877228,8.30032082 L12.5122772,7.84418221 C12.7816391,7.77684175 13,7.93730889 13,8.21273004 L13,11.231773 C13,11.5026568 12.7802887,11.7771793 12.5122772,11.8441822 L10.6877228,12.3003208 C10.4183609,12.3676613 10.2,12.2071941 10.2,11.931773 L10.2,8.91273003 Z" id="Rectangle-41-Copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#21405C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <path d="M4,9.21764909 C4,8.6679062 4.43274403,8.12416288 4.98419189,7.99916803 L18.0158081,5.04533502 C18.5593623,4.9221294 19,5.27791592 19,5.81764909 L19,13.826854 C19,14.3765968 18.567256,14.9203402 18.0158081,15.045335 L4.98419189,17.999168 C4.44063772,18.1223736 4,17.7665871 4,17.226854 L4,9.21764909 Z M5.7,9.91273003 C5.7,9.64184623 5.9157526,9.37190924 6.19538898,9.30666075 L8.20461102,8.83784228 C8.4782068,8.77400327 8.7,8.93730889 8.7,9.21273004 L8.7,12.231773 C8.7,12.5026568 8.4842474,12.7725938 8.20461102,12.8378423 L6.19538898,13.3066608 C5.9217932,13.3704998 5.7,13.2071941 5.7,12.931773 L5.7,9.91273003 Z M14.6,7.71273003 C14.6,7.44184623 14.8157526,7.17190924 15.095389,7.10666075 L17.104611,6.63784228 C17.3782068,6.57400327 17.6,6.73730889 17.6,7.01273004 L17.6,10.031773 C17.6,10.3026568 17.3842474,10.5725938 17.104611,10.6378423 L15.095389,11.1066608 C14.8217932,11.1704998 14.6,11.0071941 14.6,10.731773 L14.6,7.71273003 Z M10.2,8.91273003 C10.2,8.64184623 10.4197113,8.36732369 10.6877228,8.30032082 L12.5122772,7.84418221 C12.7816391,7.77684175 13,7.93730889 13,8.21273004 L13,11.231773 C13,11.5026568 12.7802887,11.7771793 12.5122772,11.8441822 L10.6877228,12.3003208 C10.4183609,12.3676613 10.2,12.2071941 10.2,11.931773 L10.2,8.91273003 Z" id="Rectangle-41-Copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/funicular-s.svg b/data/styles/clear/style-night/symbols/funicular-s.svg
index 2d52fffc1e..e704a03843 100644
--- a/data/styles/clear/style-night/symbols/funicular-s.svg
+++ b/data/styles/clear/style-night/symbols/funicular-s.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>funicular-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="funicular-s" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <path d="M8.5,16 C12.6421356,16 16,12.6421356 16,8.5 C16,4.35786438 12.6421356,1 8.5,1 C4.35786438,1 1,4.35786438 1,8.5 C1,12.6421356 4.35786438,16 8.5,16 Z" id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup"></path>
-            <path d="M3,7.99077797 C3,7.44358641 3.4296875,6.85820312 3.95884204,6.68358213 L12.041158,4.01641787 C12.5707118,3.8416651 13,4.15097518 13,4.69077796 L13,8.70922203 C13,9.25641359 12.5703125,9.84179687 12.041158,10.0164179 L3.95884204,12.6835821 C3.4292882,12.8583349 3,12.5490248 3,12.009222 L3,7.99077797 Z M4,8 L6,7.3 L6,9.3 L4,10 L4,8 Z M7,6.89999998 L9,6.19999999 L9,8.19999999 L7,8.89999998 L7,6.89999998 Z M10,5.99999998 L12,5.29999999 L12,7.29999999 L10,7.99999998 L10,5.99999998 Z" id="Rectangle-49" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <path d="M8.5,16 C12.6421356,16 16,12.6421356 16,8.5 C16,4.35786438 12.6421356,1 8.5,1 C4.35786438,1 1,4.35786438 1,8.5 C1,12.6421356 4.35786438,16 8.5,16 Z" id="Oval-1-Copy-42" fill="#21405C" sketch:type="MSShapeGroup"></path>
+            <path d="M3,7.99077797 C3,7.44358641 3.4296875,6.85820312 3.95884204,6.68358213 L12.041158,4.01641787 C12.5707118,3.8416651 13,4.15097518 13,4.69077796 L13,8.70922203 C13,9.25641359 12.5703125,9.84179687 12.041158,10.0164179 L3.95884204,12.6835821 C3.4292882,12.8583349 3,12.5490248 3,12.009222 L3,7.99077797 Z M4,8 L6,7.3 L6,9.3 L4,10 L4,8 Z M7,6.89999998 L9,6.19999999 L9,8.19999999 L7,8.89999998 L7,6.89999998 Z M10,5.99999998 L12,5.29999999 L12,7.29999999 L10,7.99999998 L10,5.99999998 Z" id="Rectangle-49" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/helipad-l.svg b/data/styles/clear/style-night/symbols/helipad-l.svg
index c8b63a5b77..8cd9475338 100644
--- a/data/styles/clear/style-night/symbols/helipad-l.svg
+++ b/data/styles/clear/style-night/symbols/helipad-l.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>helipad-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="helipad-l" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,24 C19.2989899,24 24,19.2989899 24,13.5 C24,7.70101013 19.2989899,3 13.5,3 C7.70101013,3 3,7.70101013 3,13.5 C3,19.2989899 7.70101013,24 13.5,24 Z" id="Oval-1-Copy-48" fill="#133655" sketch:type="MSShapeGroup"></path>
+            <path d="M13.5,24 C19.2989899,24 24,19.2989899 24,13.5 C24,7.70101013 19.2989899,3 13.5,3 C7.70101013,3 3,7.70101013 3,13.5 C3,19.2989899 7.70101013,24 13.5,24 Z" id="Oval-1-Copy-48" fill="#21405C" sketch:type="MSShapeGroup"></path>
             <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z M13.5,24 C19.2989899,24 24,19.2989899 24,13.5 C24,7.70101013 19.2989899,3 13.5,3 C7.70101013,3 3,7.70101013 3,13.5 C3,19.2989899 7.70101013,24 13.5,24 Z" id="Oval-1-Copy-49" fill="#F8E81C" sketch:type="MSShapeGroup"></path>
-            <path d="M9,7 L11,7 L11,19 L9,19 L9,7 Z M16,7 L18,7 L18,19 L16,19 L16,7 Z M11,12 L16,12 L16,14 L11,14 L11,12 Z" id="Rectangle-53" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M9,7 L11,7 L11,19 L9,19 L9,7 Z M16,7 L18,7 L18,19 L16,19 L16,7 Z M11,12 L16,12 L16,14 L11,14 L11,12 Z" id="Rectangle-53" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/helipad-m.svg b/data/styles/clear/style-night/symbols/helipad-m.svg
index 6daff4b676..623336f06f 100644
--- a/data/styles/clear/style-night/symbols/helipad-m.svg
+++ b/data/styles/clear/style-night/symbols/helipad-m.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>helipad-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="helipad-m" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#21405C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="8.5"></circle>
             <path d="M11.5,22 C17.2989899,22 22,17.2989899 22,11.5 C22,5.70101013 17.2989899,1 11.5,1 C5.70101013,1 1,5.70101013 1,11.5 C1,17.2989899 5.70101013,22 11.5,22 Z M11.5,20 C16.1944204,20 20,16.1944204 20,11.5 C20,6.80557963 16.1944204,3 11.5,3 C6.80557963,3 3,6.80557963 3,11.5 C3,16.1944204 6.80557963,20 11.5,20 Z" id="Oval-1-Copy-53" fill="#F8E81C" sketch:type="MSShapeGroup"></path>
-            <path d="M10,11 L10,7 L8,7 L8,17 L10,17 L10,13 L13,13 L13,11 L10,11 Z M13,7 L15,7 L15,17 L13,17 L13,7 Z" id="Rectangle-53-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M10,11 L10,7 L8,7 L8,17 L10,17 L10,13 L13,13 L13,11 L10,11 Z M13,7 L15,7 L15,17 L13,17 L13,7 Z" id="Rectangle-53-Copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/helipad-s.svg b/data/styles/clear/style-night/symbols/helipad-s.svg
index 9ac9af900b..15f22196c1 100644
--- a/data/styles/clear/style-night/symbols/helipad-s.svg
+++ b/data/styles/clear/style-night/symbols/helipad-s.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>helipad-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="helipad-s" sketch:type="MSLayerGroup">
             <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#21405C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
             <path d="M8.5,17 C13.1944204,17 17,13.1944204 17,8.5 C17,3.80557963 13.1944204,0 8.5,0 C3.80557963,0 0,3.80557963 0,8.5 C0,13.1944204 3.80557963,17 8.5,17 Z M8.5,15.8666667 C12.5684977,15.8666667 15.8666667,12.5684977 15.8666667,8.5 C15.8666667,4.43150234 12.5684977,1.13333333 8.5,1.13333333 C4.43150234,1.13333333 1.13333333,4.43150234 1.13333333,8.5 C1.13333333,12.5684977 4.43150234,15.8666667 8.5,15.8666667 Z" id="Oval-1-Copy-54" fill="#F8E81C" sketch:type="MSShapeGroup"></path>
-            <path d="M6,5 L7,5 L7,12 L6,12 L6,5 Z M10,5 L11,5 L11,12 L10,12 L10,5 Z M7,8 L10,8 L10,9 L7,9 L7,8 Z" id="Rectangle-53-Copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M6,5 L7,5 L7,12 L6,12 L6,5 Z M10,5 L11,5 L11,12 L10,12 L10,5 Z M7,8 L10,8 L10,9 L7,9 L7,8 Z" id="Rectangle-53-Copy-3" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/jewelry-l.svg b/data/styles/clear/style-night/symbols/jewelry-l.svg
index 285fc08b0b..9517cbde45 100644
--- a/data/styles/clear/style-night/symbols/jewelry-l.svg
+++ b/data/styles/clear/style-night/symbols/jewelry-l.svg
@@ -5,10 +5,10 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="jewelry-l" sketch:type="MSLayerGroup">
+        <g id="beauty-l" sketch:type="MSLayerGroup">
             <path d="M13.5,27 C6.057,27 0,20.943 0,13.5 C0,6.057 6.057,0 13.5,0 C20.943,0 27,6.057 27,13.5 C27,20.943 20.943,27 13.5,27 L13.5,27 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M26,13.5 C26,20.403 20.403,26 13.5,26 C6.597,26 1,20.403 1,13.5 C1,6.597 6.597,1 13.5,1 C20.403,1 26,6.597 26,13.5 L26,13.5 Z" id="Shape" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
-            <path d="M14.674,8.102 L17,5 L17,4 L10,4 L10,5 L12.326,8.102 C8.747,8.668 6,11.765 6,15.5 C6,19.636 9.364,23 13.5,23 C17.636,23 21,19.636 21,15.5 C21,11.765 18.253,8.668 14.674,8.102 L14.674,8.102 Z M13.5,21 C10.463,21 8,18.537 8,15.5 C8,12.463 10.463,10 13.5,10 C16.537,10 19,12.463 19,15.5 C19,18.537 16.537,21 13.5,21 L13.5,21 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M14,8 L14,21 C14,21.552 14.448,22 15,22 L18,22 C18.553,22 19,21.552 19,21 L19,8 L14,8 L14,8 Z M11,9 L12,9 L12,8 L11,8 L11,7 L12,7 L12,6 L11,6 L11,5 L12,5 L12,4 L9,4 L9,5 L10,5 L10,6 L9,6 L9,7 L10,7 L10,8 L9,8 L9,9 L10,9 L10,15 L8,15 L8,21 C8,21.552 8.447,22 9,22 L12,22 C12.552,22 13,21.552 13,21 L13,15 L11,15 L11,9 L11,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/jewelry-m.svg b/data/styles/clear/style-night/symbols/jewelry-m.svg
index 258a1e109f..3b1968046d 100644
--- a/data/styles/clear/style-night/symbols/jewelry-m.svg
+++ b/data/styles/clear/style-night/symbols/jewelry-m.svg
@@ -5,10 +5,10 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="jewelry-m" sketch:type="MSLayerGroup">
+        <g id="beauty-m" sketch:type="MSLayerGroup">
             <path d="M11.5,23 C5.159,23 0,17.841 0,11.5 C0,5.159 5.159,0 11.5,0 C17.841,0 23,5.159 23,11.5 C23,17.841 17.841,23 11.5,23 L11.5,23 Z" id="Shape" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
             <path d="M22,11.5 C22,17.299 17.299,22 11.5,22 C5.701,22 1,17.299 1,11.5 C1,5.701 5.701,1 11.5,1 C17.299,1 22,5.701 22,11.5 L22,11.5 Z" id="Shape" fill="#3D3D37" sketch:type="MSShapeGroup"></path>
-            <path d="M12.489,8.094 L15,6 L15,5 L8,5 L8,6 L10.395,8.111 C7.887,8.623 6,10.84 6,13.5 C6,16.538 8.463,19 11.5,19 C14.537,19 17,16.538 17,13.5 C17,10.801 15.054,8.561 12.489,8.094 L12.489,8.094 Z M11.5,17.29 C9.41,17.29 7.71,15.59 7.71,13.5 C7.71,11.41 9.41,9.71 11.5,9.71 C13.59,9.71 15.29,11.41 15.29,13.5 C15.29,15.59 13.59,17.29 11.5,17.29 L11.5,17.29 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M12,9 L12,18 C12,18.552 12.448,19 13,19 L16,19 C16.553,19 17,18.552 17,18 L17,9 L12,9 L12,9 Z M9,9 L10,9 L10,8 L9,8 L9,7 L10,7 L10,6 L9,6 L9,5 L10,5 L10,4 L7,4 L7,5 L8,5 L8,6 L7,6 L7,7 L8,7 L8,8 L7,8 L7,9 L8,9 L8,13 L6,13 L6,18 C6,18.552 6.447,19 7,19 L10,19 C10.552,19 11,18.552 11,18 L11,13 L9,13 L9,9 L9,9 Z" id="Shape" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/lift_gate-l.svg b/data/styles/clear/style-night/symbols/lift_gate-l.svg
index 34d6393d3b..3af68da257 100644
--- a/data/styles/clear/style-night/symbols/lift_gate-l.svg
+++ b/data/styles/clear/style-night/symbols/lift_gate-l.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="lift_gate-l" sketch:type="MSLayerGroup" transform="translate(3.000000, 7.000000)" fill="#FFFFFF" opacity="0.7">
+        <g id="lift_gate-l" sketch:type="MSLayerGroup" transform="translate(4.000000, 7.000000)" fill="#FFFFFF" opacity="0.7">
             <path d="M18.487,1.198 C18.343,0.664 17.796,0.348 17.261,0.491 L7.999,2.972 L7.999,2.809 C7.116,2.297 6.093,1.999 4.999,1.999 C3.905,1.999 2.882,2.297 1.999,2.809 L1.999,4.58 L0.84,4.891 L1.358,6.823 L2,6.651 L2,14 L8,14 L8,5.043 L17.779,2.423 C18.313,2.28 18.63,1.732 18.487,1.198 L18.487,1.198 Z M4,7.201 C3.338,7.201 2.8,6.662 2.8,6 C2.8,5.338 3.338,4.8 4,4.8 C4.662,4.8 5.2,5.338 5.2,6 C5.2,6.662 4.662,7.201 4,7.201 L4,7.201 Z" id="Shape" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/lift_gate-m.svg b/data/styles/clear/style-night/symbols/lift_gate-m.svg
index b11df894eb..26624e2f1e 100644
--- a/data/styles/clear/style-night/symbols/lift_gate-m.svg
+++ b/data/styles/clear/style-night/symbols/lift_gate-m.svg
@@ -5,7 +5,7 @@
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="POI" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
-        <g id="lift_gate-m" sketch:type="MSLayerGroup" transform="translate(4.000000, 7.000000)" fill="#FFFFFF" opacity="0.7">
+        <g id="lift_gate-m" sketch:type="MSLayerGroup" transform="translate(5.000000, 7.000000)" fill="#FFFFFF" opacity="0.7">
             <path d="M14.273,0.758 C14.158,0.33 13.719,0.078 13.293,0.193 L5.883,2.178 L5.883,2.047 C5.176,1.638 4.359,1.4 3.483,1.4 C2.608,1.4 1.79,1.638 1.084,2.047 L1.084,3.465 L0.157,3.713 L0.571,5.258 L1.084,5.121 L1.084,11 L5.884,11 L5.884,3.834 L13.708,1.738 C14.134,1.623 14.387,1.186 14.273,0.758 L14.273,0.758 Z M4,6 L2,6 L2,4 L4,4 L4,6 L4,6 Z" id="Shape" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/ship-l.svg b/data/styles/clear/style-night/symbols/ship-l.svg
index babbc6eee6..f555ac2be9 100644
--- a/data/styles/clear/style-night/symbols/ship-l.svg
+++ b/data/styles/clear/style-night/symbols/ship-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>ship-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="ship-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <path d="M11,4.3622 C10.446,4.3622 10,4.8082 10,5.3622 L8,5.3622 C7.446,5.3622 7,5.8082 7,6.3622 L7,12.4247 L5,13.3622 L7,17.3622 L7,19.3622 C8.5,19.3622 9.5,20.3627 10.5,20.3622 C11.5,20.3627 12,19.3622 13.5,19.3622 C15,19.3622 15.5,20.3617 16.5,20.3622 C17.5,20.3627 18.5,19.3622 20,19.3622 L20,17.3622 L22,13.3622 L20,12.4247 L20,6.3622 C20,5.8082 19.554,5.3622 19,5.3622 L17,5.3622 C17,4.8082 16.554,4.3622 16,4.3622 L11,4.3622 L11,4.3622 Z M9,7.3622 L18,7.3622 L18,11.4872 L13.5,9.3622 L9,11.4872 L9,7.3622 L9,7.3622 Z M7,21.3622 C6.30594,21.3622 5.66024,21.7671 5,21.9872 L5,24.01845 C5,24.01845 6,23.3627 7,23.3622 C8,23.3617 9,24.3622 10.5,24.3622 C12,24.3622 12.47352,23.3969 13.5,23.3622 C14.5,23.3627 15,24.3622 16.5,24.3622 C18,24.3622 19,23.3622 20,23.3622 C20.70165,23.3622 22,24.01845 22,24.01845 L22,21.9872 C21.3584,21.7404 20.65657,21.3622 20,21.3622 C18.5,21.3622 17.5,22.3627 16.5,22.3622 C15.5,22.3617 15,21.3622 13.5,21.3622 C12,21.3622 11.5,22.3627 10.5,22.3622 C9.5,22.3627 8.5,21.3622 7,21.3622 L7,21.3622 Z" id="path8421-9-1-0-1-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#21405C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <path d="M11,4.3622 C10.446,4.3622 10,4.8082 10,5.3622 L8,5.3622 C7.446,5.3622 7,5.8082 7,6.3622 L7,12.4247 L5,13.3622 L7,17.3622 L7,19.3622 C8.5,19.3622 9.5,20.3627 10.5,20.3622 C11.5,20.3627 12,19.3622 13.5,19.3622 C15,19.3622 15.5,20.3617 16.5,20.3622 C17.5,20.3627 18.5,19.3622 20,19.3622 L20,17.3622 L22,13.3622 L20,12.4247 L20,6.3622 C20,5.8082 19.554,5.3622 19,5.3622 L17,5.3622 C17,4.8082 16.554,4.3622 16,4.3622 L11,4.3622 L11,4.3622 Z M9,7.3622 L18,7.3622 L18,11.4872 L13.5,9.3622 L9,11.4872 L9,7.3622 L9,7.3622 Z M7,21.3622 C6.30594,21.3622 5.66024,21.7671 5,21.9872 L5,24.01845 C5,24.01845 6,23.3627 7,23.3622 C8,23.3617 9,24.3622 10.5,24.3622 C12,24.3622 12.47352,23.3969 13.5,23.3622 C14.5,23.3627 15,24.3622 16.5,24.3622 C18,24.3622 19,23.3622 20,23.3622 C20.70165,23.3622 22,24.01845 22,24.01845 L22,21.9872 C21.3584,21.7404 20.65657,21.3622 20,21.3622 C18.5,21.3622 17.5,22.3627 16.5,22.3622 C15.5,22.3617 15,21.3622 13.5,21.3622 C12,21.3622 11.5,22.3627 10.5,22.3622 C9.5,22.3627 8.5,21.3622 7,21.3622 L7,21.3622 Z" id="path8421-9-1-0-1-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/ship-m.svg b/data/styles/clear/style-night/symbols/ship-m.svg
index 45afb7f81b..25adb7c81d 100644
--- a/data/styles/clear/style-night/symbols/ship-m.svg
+++ b/data/styles/clear/style-night/symbols/ship-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>ship-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="ship-m" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M10,4 C9.5,4 9,4.5 9,5 L7.82354,5 C7.3673,5 6.9706,5.5438 6.9706,6 L7,9.5 L5,10.5 L7,14 L7,15.5 L9.5,16.5 L11.5,15.5 L13.5,16.5 L16,15.5 L16,14 L18,10.5 L16,9.5 L16,6 C16,5.5438 15.63271,5 15.17647,5 L14,5 C14,4.5 13.5,4 13,4 L10,4 Z M8,6 L15,6 L15,9.0441 L11.5,7 L8,9.0441 L8,6 Z M7,17 L5,18 L5,19.5 L7,18.5 L9.5,19.5 L11.5,18.5 L13.5,19.5 L16,18.6466 L18,19.5 L18,18 L16,17 L13.5,18 L11.5,17 L9.5,18 L7,17 Z" id="path30964-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#21405C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <path d="M10,4 C9.5,4 9,4.5 9,5 L7.82354,5 C7.3673,5 6.9706,5.5438 6.9706,6 L7,9.5 L5,10.5 L7,14 L7,15.5 L9.5,16.5 L11.5,15.5 L13.5,16.5 L16,15.5 L16,14 L18,10.5 L16,9.5 L16,6 C16,5.5438 15.63271,5 15.17647,5 L14,5 C14,4.5 13.5,4 13,4 L10,4 Z M8,6 L15,6 L15,9.0441 L11.5,7 L8,9.0441 L8,6 Z M7,17 L5,18 L5,19.5 L7,18.5 L9.5,19.5 L11.5,18.5 L13.5,19.5 L16,18.6466 L18,19.5 L18,18 L16,17 L13.5,18 L11.5,17 L9.5,18 L7,17 Z" id="path30964-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/ship-s.svg b/data/styles/clear/style-night/symbols/ship-s.svg
index c5d45adf59..816d04b505 100644
--- a/data/styles/clear/style-night/symbols/ship-s.svg
+++ b/data/styles/clear/style-night/symbols/ship-s.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>ship-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="ship-s" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M5.5,3.5 C5.223,3.5 5,3.723 5,4 L5,7.5 L4,8 L5,10 L5,11 L7,11.5 L8.5,11 L10,11.5 L12,11 L12,10 L13,8 L12,7.5313 L12,4 C12,3.723 11.777,3.5 11.5,3.5 L10.5,3.5 L6.5,3.5 L5.5,3.5 Z M6,4.5 L11,4.5 L11,7.0625 L8.5,5.5 L6,7 L6,4.5 Z M5.5,11.9995 L4,12.4683 L4,13.4995 L4.15625,13.4375 L5.5,13 L7,13.5 L8.5,13 L10,13.5 L11.5,13 L13,13.5 L13,12.4688 L11.5,12 L10,12.4688 L8.5,12 L7,12.4688 L5.5,11.9995 Z" id="path30937-copy" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#21405C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M5.5,3.5 C5.223,3.5 5,3.723 5,4 L5,7.5 L4,8 L5,10 L5,11 L7,11.5 L8.5,11 L10,11.5 L12,11 L12,10 L13,8 L12,7.5313 L12,4 C12,3.723 11.777,3.5 11.5,3.5 L10.5,3.5 L6.5,3.5 L5.5,3.5 Z M6,4.5 L11,4.5 L11,7.0625 L8.5,5.5 L6,7 L6,4.5 Z M5.5,11.9995 L4,12.4683 L4,13.4995 L4.15625,13.4375 L5.5,13 L7,13.5 L8.5,13 L10,13.5 L11.5,13 L13,13.5 L13,12.4688 L11.5,12 L10,12.4688 L8.5,12 L7,12.4688 L5.5,11.9995 Z" id="path30937-copy" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/subway-l.svg b/data/styles/clear/style-night/symbols/subway-l.svg
index c831327a8d..dc3d113b57 100644
--- a/data/styles/clear/style-night/symbols/subway-l.svg
+++ b/data/styles/clear/style-night/symbols/subway-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>subway-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <g id="g24855" transform="translate(7.000000, 6.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#21405C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <g id="g24855" transform="translate(7.000000, 6.000000)" fill="#FFFFFF" opacity="0.41" sketch:type="MSShapeGroup">
                 <path d="M3,0.3622 L0,2.3622 L0,13.3622 C0,13.8622 0.5,14.3622 1,14.3622 L3.5,14.3622 L7,14.3622 L9.5,14.3622 L12,14.3622 C12.5,14.3622 13,13.8622 13,13.3622 L13,2.3622 L10,0.3622 L3,0.3622 Z M4,2.3622 L9,2.3622 L11,3.3622 L11,6.3622 L2,6.3622 L2,3.3622 L4,2.3622 Z M3,10.3622 C3.554,10.3622 4,10.8082 4,11.3622 C4,11.9162 3.554,12.3622 3,12.3622 C2.446,12.3622 2,11.9162 2,11.3622 C2,10.8082 2.446,10.3622 3,10.3622 L3,10.3622 Z M10,10.3622 C10.554,10.3622 11,10.8082 11,11.3622 C11,11.9162 10.554,12.3622 10,12.3622 C9.446,12.3622 9,11.9162 9,11.3622 C9,10.8082 9.446,10.3622 10,10.3622 L10,10.3622 Z" id="path24859"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/subway-m.svg b/data/styles/clear/style-night/symbols/subway-m.svg
index ea56180643..6a1fc62b19 100644
--- a/data/styles/clear/style-night/symbols/subway-m.svg
+++ b/data/styles/clear/style-night/symbols/subway-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>subway-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-m" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M7.95762217,5.03583644 L5.95762217,6.53583644 L6,16.0049207 C6.01536083,16.5049207 6.51536083,17.0049207 7.01536083,17.0049207 L16.0153608,17.0049207 C16.5153608,17.0049207 17.0078669,16.6758134 17,16.0049207 L16.9576222,6.53583644 L14.9576222,5.03583644 L7.95762217,5.03583644 Z M9.57605219,7.04136763 L13.5760522,7.04136763 L15,8.14000509 L15,11.9843851 L8,11.9843851 L8,8.14000509 L9.57605219,7.04136763 Z M9,14.6122 C9,15.026414 8.66421,15.3622 8.25,15.3622 C7.83579,15.3622 7.5,15.026414 7.5,14.6122 C7.5,14.197986 7.83579,13.8622 8.25,13.8622 C8.66421,13.8622 9,14.197986 9,14.6122 Z M14.75,13.8622 C15.16421,13.8622 15.5,14.197986 15.5,14.6122 C15.5,15.026414 15.16421,15.3622 14.75,15.3622 C14.33579,15.3622 14,15.026414 14,14.6122 C14,14.197986 14.33579,13.8622 14.75,13.8622 L14.75,13.8622 Z" id="path24869" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#21405C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <path d="M7.95762217,5.03583644 L5.95762217,6.53583644 L6,16.0049207 C6.01536083,16.5049207 6.51536083,17.0049207 7.01536083,17.0049207 L16.0153608,17.0049207 C16.5153608,17.0049207 17.0078669,16.6758134 17,16.0049207 L16.9576222,6.53583644 L14.9576222,5.03583644 L7.95762217,5.03583644 Z M9.57605219,7.04136763 L13.5760522,7.04136763 L15,8.14000509 L15,11.9843851 L8,11.9843851 L8,8.14000509 L9.57605219,7.04136763 Z M9,14.6122 C9,15.026414 8.66421,15.3622 8.25,15.3622 C7.83579,15.3622 7.5,15.026414 7.5,14.6122 C7.5,14.197986 7.83579,13.8622 8.25,13.8622 C8.66421,13.8622 9,14.197986 9,14.6122 Z M14.75,13.8622 C15.16421,13.8622 15.5,14.197986 15.5,14.6122 C15.5,15.026414 15.16421,15.3622 14.75,15.3622 C14.33579,15.3622 14,15.026414 14,14.6122 C14,14.197986 14.33579,13.8622 14.75,13.8622 L14.75,13.8622 Z" id="path24869" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/subway-s.svg b/data/styles/clear/style-night/symbols/subway-s.svg
index 0d1750893a..afa9f89041 100644
--- a/data/styles/clear/style-night/symbols/subway-s.svg
+++ b/data/styles/clear/style-night/symbols/subway-s.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>subway-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-s" sketch:type="MSLayerGroup">
             <g id="g24875" sketch:type="MSShapeGroup">
-                <circle id="Oval-1-Copy-43" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-                <circle id="Oval-1-Copy-42" fill="#133655" cx="8.5" cy="8.5" r="7.5"></circle>
-                <path d="M6.5,4 L5,5.14285714 L5,11.4285714 C5,11.7142857 5.25,12 5.5,12 L6.75,12 L9,12 L10.25,12 L11.5,12 C11.75,12 12,11.7142857 12,11.4285714 L12,5.14285714 L10.5,4 L6.5,4 Z M7,5.14285714 L10,5.14285714 L11,5.71428571 L11,7.42857143 L6,7.42857143 L6,5.71428571 L7,5.14285714 Z M6.5,9.71428571 C6.777,9.71428571 7,9.96914286 7,10.2857143 C7,10.6022857 6.777,10.8571429 6.5,10.8571429 C6.223,10.8571429 6,10.6022857 6,10.2857143 C6,9.96914286 6.223,9.71428571 6.5,9.71428571 L6.5,9.71428571 Z M10.5,9.71428571 C10.777,9.71428571 11,9.96914286 11,10.2857143 C11,10.6022857 10.777,10.8571429 10.5,10.8571429 C10.223,10.8571429 10,10.6022857 10,10.2857143 C10,9.96914286 10.223,9.71428571 10.5,9.71428571 L10.5,9.71428571 Z" id="path24879" opacity="0.7" fill="#FFFFFF"></path>
+                <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#21405C" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M6.5,4 L5,5.14285714 L5,11.4285714 C5,11.7142857 5.25,12 5.5,12 L6.75,12 L9,12 L10.25,12 L11.5,12 C11.75,12 12,11.7142857 12,11.4285714 L12,5.14285714 L10.5,4 L6.5,4 Z M7,5.14285714 L10,5.14285714 L11,5.71428571 L11,7.42857143 L6,7.42857143 L6,5.71428571 L7,5.14285714 Z M6.5,9.71428571 C6.777,9.71428571 7,9.96914286 7,10.2857143 C7,10.6022857 6.777,10.8571429 6.5,10.8571429 C6.223,10.8571429 6,10.6022857 6,10.2857143 C6,9.96914286 6.223,9.71428571 6.5,9.71428571 L6.5,9.71428571 Z M10.5,9.71428571 C10.777,9.71428571 11,9.96914286 11,10.2857143 C11,10.6022857 10.777,10.8571429 10.5,10.8571429 C10.223,10.8571429 10,10.6022857 10,10.2857143 C10,9.96914286 10.223,9.71428571 10.5,9.71428571 L10.5,9.71428571 Z" id="path24879" opacity="0.41" fill="#FFFFFF"></path>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/symbols/subway-xs copy.svg b/data/styles/clear/style-night/symbols/subway-xs copy.svg
index 342867b7ce..8261622717 100644
--- a/data/styles/clear/style-night/symbols/subway-xs copy.svg
+++ b/data/styles/clear/style-night/symbols/subway-xs copy.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="9px" height="9px" viewBox="0 0 9 9" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>subway-xs copy</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-xs-copy" sketch:type="MSLayerGroup">
-            <ellipse id="Oval-139-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="4.4607938" cy="4.4601378" rx="4.4607938" ry="4.4601378"></ellipse>
-            <ellipse id="Oval-139" fill="#133655" sketch:type="MSShapeGroup" cx="4.4607938" cy="4.4601378" rx="3.46950629" ry="3.46899606"></ellipse>
-            <rect id="Rectangle-307" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="2.97386254" y="2.9734252" width="2.97386254" height="2.9734252"></rect>
+            <ellipse id="Oval-139-Copy" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="4.4607938" cy="4.4601378" rx="4.4607938" ry="4.4601378"></ellipse>
+            <ellipse id="Oval-139" fill="#21405C" sketch:type="MSShapeGroup" cx="4.4607938" cy="4.4601378" rx="3.46950629" ry="3.46899606"></ellipse>
+            <rect id="Rectangle-307" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="2.97386254" y="2.9734252" width="2.97386254" height="2.9734252"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/subway-xs.svg b/data/styles/clear/style-night/symbols/subway-xs.svg
index 7daff5776c..f22249b194 100644
--- a/data/styles/clear/style-night/symbols/subway-xs.svg
+++ b/data/styles/clear/style-night/symbols/subway-xs.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="10px" height="10px" viewBox="0 0 10 10" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>subway-xs</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="subway-xs" sketch:type="MSLayerGroup" transform="translate(0.012585, 0.000000)">
-            <circle id="Oval-139-Copy" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="5" cy="5" r="5"></circle>
-            <circle id="Oval-139" fill="#133655" sketch:type="MSShapeGroup" cx="5" cy="5" r="4"></circle>
-            <rect id="Rectangle-307" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup" x="3" y="3" width="4" height="4" rx="1"></rect>
+            <circle id="Oval-139-Copy" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="5" cy="5" r="5"></circle>
+            <circle id="Oval-139" fill="#21405C" sketch:type="MSShapeGroup" cx="5" cy="5" r="4"></circle>
+            <rect id="Rectangle-307" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup" x="3" y="3" width="4" height="4" rx="1"></rect>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/train-l.svg b/data/styles/clear/style-night/symbols/train-l.svg
index d98ba33112..47b7219ec7 100644
--- a/data/styles/clear/style-night/symbols/train-l.svg
+++ b/data/styles/clear/style-night/symbols/train-l.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>train-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="train-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup"></path>
-            <path d="M10.4631148,22 L12,19 L10.125,19 L7.00000001,25 L8.875,25.1 L9.4385246,24 L17.5614754,24 L18.125,25.1 L20,25 L16.875,19 L15,19 L16.5368852,22 L10.4631148,22 Z" id="Rectangle-22-Copy-3" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <g id="g24855" transform="translate(7.000000, 5.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <path d="M13.5,26 C20.4035594,26 26,20.4035594 26,13.5 C26,6.59644063 20.4035594,1 13.5,1 C6.59644063,1 1,6.59644063 1,13.5 C1,20.4035594 6.59644063,26 13.5,26 Z" id="Oval-1-Copy-38" fill="#21405C" sketch:type="MSShapeGroup"></path>
+            <path d="M10.4631148,22 L12,19 L10.125,19 L7.00000001,25 L8.875,25.1 L9.4385246,24 L17.5614754,24 L18.125,25.1 L20,25 L16.875,19 L15,19 L16.5368852,22 L10.4631148,22 Z" id="Rectangle-22-Copy-3" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <g id="g24855" transform="translate(7.000000, 5.000000)" fill="#FFFFFF" opacity="0.41" sketch:type="MSShapeGroup">
                 <path d="M4.00292933,0 C3.44902676,0 2.63214111,0.245239258 2.16433275,0.557111502 L0.835667253,1.4428885 C0.374140973,1.75057268 0,2.44483697 0,2.9955775 L0,13 C0,13.5 0.5,14 1,14 L3.5,14 L7,14 L9.5,14 L12,14 C12.5,14 13,13.5 13,13 L13,2.9955775 C13,2.44573523 12.6321411,1.75476074 12.1643327,1.4428885 L10.8356673,0.557111502 C10.374141,0.249427315 9.56211865,0 8.99707067,0 L4.00292933,0 Z M3.10529494,2.44735253 C3.5994269,2.20028655 4.44371665,2 4.99980749,2 L8.00019251,2 C8.55237094,2 9.40472984,2.20236492 9.89470506,2.44735253 L10.1052949,2.55264747 C10.5994269,2.79971345 11,3.44335318 11,4.0093689 L11,5.9906311 C11,6.54809015 10.5536886,7 10.0024554,7 L2.99754465,7 C2.44661595,7 2,6.55664682 2,5.9906311 L2,4.0093689 C2,3.45190985 2.40472984,2.79763508 2.89470506,2.55264747 L3.10529494,2.44735253 Z M3,10 C3.554,10 4,10.446 4,11 C4,11.554 3.554,12 3,12 C2.446,12 2,11.554 2,11 C2,10.446 2.446,10 3,10 L3,10 Z M10,10 C10.554,10 11,10.446 11,11 C11,11.554 10.554,12 10,12 C9.446,12 9,11.554 9,11 C9,10.446 9.446,10 10,10 L10,10 Z" id="path24859"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/train-m.svg b/data/styles/clear/style-night/symbols/train-m.svg
index 97ec5e4a29..83adfd6e4b 100644
--- a/data/styles/clear/style-night/symbols/train-m.svg
+++ b/data/styles/clear/style-night/symbols/train-m.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>train-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="train-m" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M8.9881561,3.03459562 C8.43616181,3.03459562 7.623115,3.30963415 7.18949229,3.63587515 L6.79476211,3.93285492 C6.35338181,4.26493243 5.9976093,4.99070765 6.0000121,5.52928925 L6.0378042,14.0003074 C6.05311212,14.5001537 6.55138953,15 7.04966694,15 L16.0186604,15 C16.5169378,15 17.0077471,14.6709939 16.9999073,14.0003074 L16.9621152,5.52928925 C16.9596632,4.97968043 16.5921085,4.25909592 16.1584858,3.93285492 L15.7637556,3.63587515 C15.3223753,3.30379764 14.5068586,3.03459562 13.9650918,3.03459562 L8.9881561,3.03459562 Z M8.37916245,5.76597573 C8.75492901,5.3647599 9.49978057,5.03951021 10.0634277,5.03951021 L13.0164082,5.03951021 C13.5708357,5.03951021 14.3216338,5.37500414 14.6946598,5.79030102 L15.0067977,6.1378099 L15.0067977,8.97125292 C15.0067977,9.52892524 14.5490904,9.98100797 14.0073236,9.98100797 L9.03038793,9.98100797 C8.47839364,9.98100797 8.03091386,9.54014429 8.03091386,8.97125292 L8.03091386,6.1378099 L8.37916245,5.76597573 Z M9.02746869,12.6080149 C9.02746869,13.0221016 8.69283554,13.3577844 8.28005257,13.3577844 C7.86726959,13.3577844 7.53263645,13.0221016 7.53263645,12.6080149 C7.53263645,12.1939283 7.86726959,11.8582455 8.28005257,11.8582455 C8.69283554,11.8582455 9.02746869,12.1939283 9.02746869,12.6080149 Z M14.757659,11.8582455 C15.1704419,11.8582455 15.5050751,12.1939283 15.5050751,12.6080149 C15.5050751,13.0221016 15.1704419,13.3577844 14.757659,13.3577844 C14.344876,13.3577844 14.0102428,13.0221016 14.0102428,12.6080149 C14.0102428,12.1939283 14.344876,11.8582455 14.757659,11.8582455 L14.757659,11.8582455 Z" id="path24869" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M8.95833334,17 L10,15 L8.12500001,15 L5.00000001,21 L6.875,21 L7.91666667,19 L15.0833333,19 L16.125,21 L18,21 L14.875,15 L13,15 L14.0416667,17 L8.95833334,17 Z" id="Rectangle-22-Copy-2" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#21405C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <path d="M8.9881561,3.03459562 C8.43616181,3.03459562 7.623115,3.30963415 7.18949229,3.63587515 L6.79476211,3.93285492 C6.35338181,4.26493243 5.9976093,4.99070765 6.0000121,5.52928925 L6.0378042,14.0003074 C6.05311212,14.5001537 6.55138953,15 7.04966694,15 L16.0186604,15 C16.5169378,15 17.0077471,14.6709939 16.9999073,14.0003074 L16.9621152,5.52928925 C16.9596632,4.97968043 16.5921085,4.25909592 16.1584858,3.93285492 L15.7637556,3.63587515 C15.3223753,3.30379764 14.5068586,3.03459562 13.9650918,3.03459562 L8.9881561,3.03459562 Z M8.37916245,5.76597573 C8.75492901,5.3647599 9.49978057,5.03951021 10.0634277,5.03951021 L13.0164082,5.03951021 C13.5708357,5.03951021 14.3216338,5.37500414 14.6946598,5.79030102 L15.0067977,6.1378099 L15.0067977,8.97125292 C15.0067977,9.52892524 14.5490904,9.98100797 14.0073236,9.98100797 L9.03038793,9.98100797 C8.47839364,9.98100797 8.03091386,9.54014429 8.03091386,8.97125292 L8.03091386,6.1378099 L8.37916245,5.76597573 Z M9.02746869,12.6080149 C9.02746869,13.0221016 8.69283554,13.3577844 8.28005257,13.3577844 C7.86726959,13.3577844 7.53263645,13.0221016 7.53263645,12.6080149 C7.53263645,12.1939283 7.86726959,11.8582455 8.28005257,11.8582455 C8.69283554,11.8582455 9.02746869,12.1939283 9.02746869,12.6080149 Z M14.757659,11.8582455 C15.1704419,11.8582455 15.5050751,12.1939283 15.5050751,12.6080149 C15.5050751,13.0221016 15.1704419,13.3577844 14.757659,13.3577844 C14.344876,13.3577844 14.0102428,13.0221016 14.0102428,12.6080149 C14.0102428,12.1939283 14.344876,11.8582455 14.757659,11.8582455 L14.757659,11.8582455 Z" id="path24869" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M8.95833334,17 L10,15 L8.12500001,15 L5.00000001,21 L6.875,21 L7.91666667,19 L15.0833333,19 L16.125,21 L18,21 L14.875,15 L13,15 L14.0416667,17 L8.95833334,17 Z" id="Rectangle-22-Copy-2" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/train-s.svg b/data/styles/clear/style-night/symbols/train-s.svg
index b60832d12b..dd87c6399e 100644
--- a/data/styles/clear/style-night/symbols/train-s.svg
+++ b/data/styles/clear/style-night/symbols/train-s.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>train-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="train-s" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-43" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
-            <circle id="Oval-1-Copy-42" fill="#133655" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
-            <path d="M6.86363637,13 L8.00000001,11 L6.50000001,11 L4,15.4 L5.5,15.4 L6.29545455,14 L10.7045454,14 L11.5,15.4 L13,15.4 L10.5,11 L8.99999999,11 L10.1363636,13 L6.86363637,13 Z" id="Rectangle-22" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
-            <path d="M7.5093689,3 C6.95190985,3 6.13689184,3.27665383 5.69730425,3.61157772 L5.80269575,3.53127943 C5.35937913,3.86904447 5,4.59491021 5,5.15276589 L5,10.4285714 C5,10.7142857 5.25,11 5.5,11 L6.75,11 L9,11 L10.25,11 L11.5,11 C11.75,11 12,10.7142857 12,10.4285714 L12,5.15276589 C12,4.59500869 11.6368918,3.86620331 11.1973042,3.53127943 L11.3026958,3.61157772 C10.8593791,3.27381267 10.0566468,3 9.4906311,3 L7.5093689,3 L7.5093689,3 Z M7,4.14285714 L10,4.14285714 L11,4.71428571 L11,6.42857143 L6,6.42857143 L6,4.71428571 L7,4.14285714 L7,4.14285714 Z M6.5,8.71428571 C6.777,8.71428571 7,8.96914286 7,9.28571429 C7,9.60228571 6.777,9.85714286 6.5,9.85714286 C6.223,9.85714286 6,9.60228571 6,9.28571429 C6,8.96914286 6.223,8.71428571 6.5,8.71428571 L6.5,8.71428571 L6.5,8.71428571 Z M10.5,8.71428571 C10.777,8.71428571 11,8.96914286 11,9.28571429 C11,9.60228571 10.777,9.85714286 10.5,9.85714286 C10.223,9.85714286 10,9.60228571 10,9.28571429 C10,8.96914286 10.223,8.71428571 10.5,8.71428571 L10.5,8.71428571 L10.5,8.71428571 Z" id="path24879" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="8.5"></circle>
+            <circle id="Oval-1-Copy-42" fill="#21405C" sketch:type="MSShapeGroup" cx="8.5" cy="8.5" r="7.5"></circle>
+            <path d="M6.86363637,13 L8.00000001,11 L6.50000001,11 L4,15.4 L5.5,15.4 L6.29545455,14 L10.7045454,14 L11.5,15.4 L13,15.4 L10.5,11 L8.99999999,11 L10.1363636,13 L6.86363637,13 Z" id="Rectangle-22" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <path d="M7.5093689,3 C6.95190985,3 6.13689184,3.27665383 5.69730425,3.61157772 L5.80269575,3.53127943 C5.35937913,3.86904447 5,4.59491021 5,5.15276589 L5,10.4285714 C5,10.7142857 5.25,11 5.5,11 L6.75,11 L9,11 L10.25,11 L11.5,11 C11.75,11 12,10.7142857 12,10.4285714 L12,5.15276589 C12,4.59500869 11.6368918,3.86620331 11.1973042,3.53127943 L11.3026958,3.61157772 C10.8593791,3.27381267 10.0566468,3 9.4906311,3 L7.5093689,3 L7.5093689,3 Z M7,4.14285714 L10,4.14285714 L11,4.71428571 L11,6.42857143 L6,6.42857143 L6,4.71428571 L7,4.14285714 L7,4.14285714 Z M6.5,8.71428571 C6.777,8.71428571 7,8.96914286 7,9.28571429 C7,9.60228571 6.777,9.85714286 6.5,9.85714286 C6.223,9.85714286 6,9.60228571 6,9.28571429 C6,8.96914286 6.223,8.71428571 6.5,8.71428571 L6.5,8.71428571 L6.5,8.71428571 Z M10.5,8.71428571 C10.777,8.71428571 11,8.96914286 11,9.28571429 C11,9.60228571 10.777,9.85714286 10.5,9.85714286 C10.223,9.85714286 10,9.60228571 10,9.28571429 C10,8.96914286 10.223,8.71428571 10.5,8.71428571 L10.5,8.71428571 L10.5,8.71428571 Z" id="path24879" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tram-l.svg b/data/styles/clear/style-night/symbols/tram-l.svg
index 3e0f01b831..9aced6aef2 100644
--- a/data/styles/clear/style-night/symbols/tram-l.svg
+++ b/data/styles/clear/style-night/symbols/tram-l.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="27px" height="27px" viewBox="0 0 27 27" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>tram-l</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tram-l" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-39" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
-            <circle id="Oval-1-Copy-38" fill="#133655" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
-            <g id="g24855" transform="translate(7.000000, 4.000000)" fill="#FFFFFF" opacity="0.7" sketch:type="MSShapeGroup">
+            <circle id="Oval-1-Copy-39" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="13.5"></circle>
+            <circle id="Oval-1-Copy-38" fill="#21405C" sketch:type="MSShapeGroup" cx="13.5" cy="13.5" r="12.5"></circle>
+            <g id="g24855" transform="translate(7.000000, 4.000000)" fill="#FFFFFF" opacity="0.41" sketch:type="MSShapeGroup">
                 <path d="M4.00292933,4 C3.44902676,4 2.63214111,4.24523926 2.16433275,4.5571115 L0.835667253,5.4428885 C0.374140973,5.75057268 0,6.44483697 0,6.9955775 L0,17 C0,17.5 0.5,18 1,18 L3.5,18 L7,18 L9.5,18 L12,18 C12.5,18 13,17.5 13,17 L13,6.9955775 C13,6.44573523 12.6321411,5.75476074 12.1643327,5.4428885 L10.8356673,4.5571115 C10.374141,4.24942732 9.56211865,4 8.99707067,4 L4.00292933,4 Z M3.10529494,6.44735253 C3.5994269,6.20028655 4.44371665,6 4.99980749,6 L8.00019251,6 C8.55237094,6 9.40472984,6.20236492 9.89470506,6.44735253 L10.1052949,6.55264747 C10.5994269,6.79971345 11,7.44335318 11,8.0093689 L11,9.9906311 C11,10.5480902 10.5536886,11 10.0024554,11 L2.99754465,11 C2.44661595,11 2,10.5566468 2,9.9906311 L2,8.0093689 C2,7.45190985 2.40472984,6.79763508 2.89470506,6.55264747 L3.10529494,6.44735253 Z M3,14 C3.554,14 4,14.446 4,15 C4,15.554 3.554,16 3,16 C2.446,16 2,15.554 2,15 C2,14.446 2.446,14 3,14 L3,14 Z M10,14 C10.554,14 11,14.446 11,15 C11,15.554 10.554,16 10,16 C9.446,16 9,15.554 9,15 C9,14.446 9.446,14 10,14 Z M1,1 C1,0.44771525 1.44483697,0 1.9955775,0 L11.0044225,0 C11.5542648,0 12,0.443864822 12,1 C12,1.55228475 11.555163,2 11.0044225,2 L1.9955775,2 C1.44573523,2 1,1.55613518 1,1 Z M8,2 L9,2 L9,4 L8,4 L8,2 Z M4,2 L5,2 L5,4 L4,4 L4,2 Z" id="path24859"></path>
             </g>
         </g>
diff --git a/data/styles/clear/style-night/symbols/tram-m.svg b/data/styles/clear/style-night/symbols/tram-m.svg
index b15fb76e9c..d192c6b2f9 100644
--- a/data/styles/clear/style-night/symbols/tram-m.svg
+++ b/data/styles/clear/style-night/symbols/tram-m.svg
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="23px" height="23px" viewBox="0 0 23 23" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>tram-m</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tram-m" sketch:type="MSLayerGroup">
-            <circle id="Oval-1-Copy-41" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
-            <circle id="Oval-1-Copy-40" fill="#133655" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
-            <path d="M13.9862193,7.0347299 L13.9862193,4.9993851 L12.9896645,4.9993851 L12.9896645,7.03459562 L9.98621931,7.03459562 L9.98621931,4.9993851 L8.98966449,4.9993851 L8.98966449,7.03459562 L8.9881561,7.03459562 C8.43616181,7.03459562 7.623115,7.30963415 7.18949229,7.63587515 L6.79476211,7.93285492 C6.35338181,8.26493243 5.9976093,8.99070765 6.0000121,9.52928925 L6.0378042,18.0003074 C6.05311212,18.5001537 6.55138953,19 7.04966694,19 L16.0186604,19 C16.5169378,19 17.0077471,18.6709939 16.9999073,18.0003074 L16.9621152,9.52928925 C16.9596632,8.97968043 16.5921085,8.25909592 16.1584858,7.93285492 L15.7637556,7.63587515 C15.328076,7.30808666 14.5278622,7.04155999 13.9862193,7.0347299 Z M8.37916245,9.76597573 C8.75492901,9.3647599 9.49978057,9.03951021 10.0634277,9.03951021 L13.0164082,9.03951021 C13.5708357,9.03951021 14.3216338,9.37500414 14.6946598,9.79030102 L15.0067977,10.1378099 L15.0067977,12.9712529 C15.0067977,13.5289252 14.5490904,13.981008 14.0073236,13.981008 L9.03038793,13.981008 C8.47839364,13.981008 8.03091386,13.5401443 8.03091386,12.9712529 L8.03091386,10.1378099 L8.37916245,9.76597573 Z M9.02746869,16.6080149 C9.02746869,17.0221016 8.69283554,17.3577844 8.28005257,17.3577844 C7.86726959,17.3577844 7.53263645,17.0221016 7.53263645,16.6080149 C7.53263645,16.1939283 7.86726959,15.8582455 8.28005257,15.8582455 C8.69283554,15.8582455 9.02746869,16.1939283 9.02746869,16.6080149 Z M14.757659,15.8582455 C15.1704419,15.8582455 15.5050751,16.1939283 15.5050751,16.6080149 C15.5050751,17.0221016 15.1704419,17.3577844 14.757659,17.3577844 C14.344876,17.3577844 14.0102428,17.0221016 14.0102428,16.6080149 C14.0102428,16.1939283 14.344876,15.8582455 14.757659,15.8582455 Z M7.03435903,3.99969255 C7.03435903,3.4475776 7.49146335,3 8.02846697,3 L15.0092446,3 C15.5582752,3 16.0033525,3.44372836 16.0033525,3.99969255 C16.0033525,4.5518075 15.5462482,4.9993851 15.0092446,4.9993851 L8.02846697,4.9993851 C7.47943632,4.9993851 7.03435903,4.55565675 7.03435903,3.99969255 Z" id="path24869" opacity="0.7" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
+            <circle id="Oval-1-Copy-41" opacity="0" fill="#FFFFFF" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="11.5"></circle>
+            <circle id="Oval-1-Copy-40" fill="#21405C" sketch:type="MSShapeGroup" cx="11.5" cy="11.5" r="10.5"></circle>
+            <path d="M13.9862193,7.0347299 L13.9862193,4.9993851 L12.9896645,4.9993851 L12.9896645,7.03459562 L9.98621931,7.03459562 L9.98621931,4.9993851 L8.98966449,4.9993851 L8.98966449,7.03459562 L8.9881561,7.03459562 C8.43616181,7.03459562 7.623115,7.30963415 7.18949229,7.63587515 L6.79476211,7.93285492 C6.35338181,8.26493243 5.9976093,8.99070765 6.0000121,9.52928925 L6.0378042,18.0003074 C6.05311212,18.5001537 6.55138953,19 7.04966694,19 L16.0186604,19 C16.5169378,19 17.0077471,18.6709939 16.9999073,18.0003074 L16.9621152,9.52928925 C16.9596632,8.97968043 16.5921085,8.25909592 16.1584858,7.93285492 L15.7637556,7.63587515 C15.328076,7.30808666 14.5278622,7.04155999 13.9862193,7.0347299 Z M8.37916245,9.76597573 C8.75492901,9.3647599 9.49978057,9.03951021 10.0634277,9.03951021 L13.0164082,9.03951021 C13.5708357,9.03951021 14.3216338,9.37500414 14.6946598,9.79030102 L15.0067977,10.1378099 L15.0067977,12.9712529 C15.0067977,13.5289252 14.5490904,13.981008 14.0073236,13.981008 L9.03038793,13.981008 C8.47839364,13.981008 8.03091386,13.5401443 8.03091386,12.9712529 L8.03091386,10.1378099 L8.37916245,9.76597573 Z M9.02746869,16.6080149 C9.02746869,17.0221016 8.69283554,17.3577844 8.28005257,17.3577844 C7.86726959,17.3577844 7.53263645,17.0221016 7.53263645,16.6080149 C7.53263645,16.1939283 7.86726959,15.8582455 8.28005257,15.8582455 C8.69283554,15.8582455 9.02746869,16.1939283 9.02746869,16.6080149 Z M14.757659,15.8582455 C15.1704419,15.8582455 15.5050751,16.1939283 15.5050751,16.6080149 C15.5050751,17.0221016 15.1704419,17.3577844 14.757659,17.3577844 C14.344876,17.3577844 14.0102428,17.0221016 14.0102428,16.6080149 C14.0102428,16.1939283 14.344876,15.8582455 14.757659,15.8582455 Z M7.03435903,3.99969255 C7.03435903,3.4475776 7.49146335,3 8.02846697,3 L15.0092446,3 C15.5582752,3 16.0033525,3.44372836 16.0033525,3.99969255 C16.0033525,4.5518075 15.5462482,4.9993851 15.0092446,4.9993851 L8.02846697,4.9993851 C7.47943632,4.9993851 7.03435903,4.55565675 7.03435903,3.99969255 Z" id="path24869" opacity="0.41" fill="#FFFFFF" sketch:type="MSShapeGroup"></path>
         </g>
     </g>
 </svg>
\ No newline at end of file
diff --git a/data/styles/clear/style-night/symbols/tram-s.svg b/data/styles/clear/style-night/symbols/tram-s.svg
index 3c52086c28..03add3b251 100644
--- a/data/styles/clear/style-night/symbols/tram-s.svg
+++ b/data/styles/clear/style-night/symbols/tram-s.svg
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="17px" height="17px" viewBox="0 0 17 17" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns">
-    <!-- Generator: Sketch 3.4.2 (15857) - http://www.bohemiancoding.com/sketch -->
+    <!-- Generator: Sketch 3.3.3 (12072) - http://www.bohemiancoding.com/sketch -->
     <title>tram-s</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
     <g id="Transport" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" sketch:type="MSPage">
         <g id="tram-s" sketch:type="MSLayerGroup">
             <g id="g24875" sketch:type="MSShapeGroup">
-                <circle id="Oval-1-Copy-43" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
-                <circle id="Oval-1-Copy-42" fill="#133655" cx="8.5" cy="8.5" r="7.5"></circle>
-                <path d="M10,6.0579843 C10.4717603,6.15576112 10.9815405,6.366888 11.3026958,6.61157772 L11.1973042,6.53127943 C11.6368918,6.86620331 12,7.59500869 12,8.15276589 L12,13.4285714 C12,13.7142857 11.75,14 11.5,14 L10.25,14 L9,14 L6.75,14 L5.5,14 C5.25,14 5,13.7142857 5,13.4285714 L5,8.15276589 C5,7.59491021 5.35937913,6.86904447 5.80269575,6.53127943 L5.69730425,6.61157772 C6.01506149,6.36947696 6.52898734,6.15782327 7,6.05910079 L7,5 L8,5 L8,6 L9,6 L9,5 L10,5 L10,6.0579843 Z M7,7.14285714 L10,7.14285714 L11,7.71428571 L11,9.42857143 L6,9.42857143 L6,7.71428571 L7,7.14285714 Z M6.5,11.7142857 C6.777,11.7142857 7,11.9691429 7,12.2857143 C7,12.6022857 6.777,12.8571429 6.5,12.8571429 C6.223,12.8571429 6,12.6022857 6,12.2857143 C6,11.9691429 6.223,11.7142857 6.5,11.7142857 L6.5,11.7142857 Z M10.5,11.7142857 C10.777,11.7142857 11,11.9691429 11,12.2857143 C11,12.6022857 10.777,12.8571429 10.5,12.8571429 C10.223,12.8571429 10,12.6022857 10,12.2857143 C10,11.9691429 10.223,11.7142857 10.5,11.7142857 Z M5,4.5 C5,4.22385763 5.23290253,4 5.50342274,4 L11.4965773,4 C11.77461,4 12,4.23193359 12,4.5 C12,4.77614237 11.7670975,5 11.4965773,5 L5.50342274,5 C5.22539004,5 5,4.76806641 5,4.5 Z" id="path24879" opacity="0.7" fill="#FFFFFF"></path>
+                <circle id="Oval-1-Copy-43" opacity="0" fill="#FFFFFF" cx="8.5" cy="8.5" r="8.5"></circle>
+                <circle id="Oval-1-Copy-42" fill="#21405C" cx="8.5" cy="8.5" r="7.5"></circle>
+                <path d="M10,6.0579843 C10.4717603,6.15576112 10.9815405,6.366888 11.3026958,6.61157772 L11.1973042,6.53127943 C11.6368918,6.86620331 12,7.59500869 12,8.15276589 L12,13.4285714 C12,13.7142857 11.75,14 11.5,14 L10.25,14 L9,14 L6.75,14 L5.5,14 C5.25,14 5,13.7142857 5,13.4285714 L5,8.15276589 C5,7.59491021 5.35937913,6.86904447 5.80269575,6.53127943 L5.69730425,6.61157772 C6.01506149,6.36947696 6.52898734,6.15782327 7,6.05910079 L7,6.05910079 L7,5 L8,5 L8,6 L9,6 L9,5 L10,5 L10,6.0579843 Z M7,7.14285714 L10,7.14285714 L11,7.71428571 L11,9.42857143 L6,9.42857143 L6,7.71428571 L7,7.14285714 Z M6.5,11.7142857 C6.777,11.7142857 7,11.9691429 7,12.2857143 C7,12.6022857 6.777,12.8571429 6.5,12.8571429 C6.223,12.8571429 6,12.6022857 6,12.2857143 C6,11.9691429 6.223,11.7142857 6.5,11.7142857 L6.5,11.7142857 Z M10.5,11.7142857 C10.777,11.7142857 11,11.9691429 11,12.2857143 C11,12.6022857 10.777,12.8571429 10.5,12.8571429 C10.223,12.8571429 10,12.6022857 10,12.2857143 C10,11.9691429 10.223,11.7142857 10.5,11.7142857 Z M5,4.5 C5,4.22385763 5.23290253,4 5.50342274,4 L11.4965773,4 C11.77461,4 12,4.23193359 12,4.5 C12,4.77614237 11.7670975,5 11.4965773,5 L5.50342274,5 C5.22539004,5 5,4.76806641 5,4.5 Z" id="path24879" opacity="0.41" fill="#FFFFFF"></path>
             </g>
         </g>
     </g>
diff --git a/data/styles/clear/style-night/xhdpi/route_from.png b/data/styles/clear/style-night/xhdpi/route_from.png
index be419ee49d..3e2de72ae2 100644
--- a/data/styles/clear/style-night/xhdpi/route_from.png
+++ b/data/styles/clear/style-night/xhdpi/route_from.png
diff --git a/data/styles/clear/style-night/xhdpi/route_to.png b/data/styles/clear/style-night/xhdpi/route_to.png
index 7226f77951..71ac6ff4ec 100644
--- a/data/styles/clear/style-night/xhdpi/route_to.png
+++ b/data/styles/clear/style-night/xhdpi/route_to.png
diff --git a/data/styles/clear/style-night/xxhdpi/route_from.png b/data/styles/clear/style-night/xxhdpi/route_from.png
index 347cf712fb..3464497403 100644
--- a/data/styles/clear/style-night/xxhdpi/route_from.png
+++ b/data/styles/clear/style-night/xxhdpi/route_from.png
diff --git a/data/styles/clear/style-night/xxhdpi/route_to.png b/data/styles/clear/style-night/xxhdpi/route_to.png
index 452f859594..449b7be1b7 100644
--- a/data/styles/clear/style-night/xxhdpi/route_to.png
+++ b/data/styles/clear/style-night/xxhdpi/route_to.png