diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 54f2b42e8e..144fa40bdf 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 8f7c5c852f..9ce9490d7c 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -26518,13 +26518,14 @@ cont {
       priority: 16644
       min_distance: 20
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26533,13 +26534,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26548,13 +26550,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26563,13 +26566,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26578,13 +26582,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
 }
@@ -36575,13 +36580,10 @@ cont {
       color: 12372094
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -36873,13 +36875,10 @@ cont {
       color: 12372094
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -37171,13 +37170,10 @@ cont {
       color: 12372094
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -37469,13 +37465,10 @@ cont {
       color: 12372094
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -39252,13 +39245,6 @@ cont {
       color: 16575614
       priority: -15991
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-      }
-      priority: 15009
-    }
   }
   element {
     scale: 16
@@ -39748,14 +39734,6 @@ cont {
       color: 11190117
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39889,14 +39867,6 @@ cont {
       color: 11190117
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39905,14 +39875,6 @@ cont {
       color: 11190117
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39937,14 +39899,6 @@ cont {
       color: 11190117
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -40586,14 +40540,6 @@ cont {
       color: 12372094
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -40851,14 +40797,6 @@ cont {
       color: 12372094
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -41116,14 +41054,6 @@ cont {
       color: 12372094
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -41381,14 +41311,6 @@ cont {
       color: 12372094
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -78724,20 +78646,9 @@ cont {
   name: "railway-subway_entrance"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16913
     }
   }
   element {
@@ -78820,20 +78731,9 @@ cont {
   name: "railway-subway_entrance-adana"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-adana-s"
+      priority: 16913
     }
   }
   element {
@@ -78916,20 +78816,9 @@ cont {
   name: "railway-subway_entrance-algiers"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-algeria-s"
+      priority: 16913
     }
   }
   element {
@@ -79012,20 +78901,9 @@ cont {
   name: "railway-subway_entrance-almaty"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-almaty-s"
+      priority: 16913
     }
   }
   element {
@@ -79108,20 +78986,9 @@ cont {
   name: "railway-subway_entrance-amsterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-amsterdam-s"
+      priority: 16913
     }
   }
   element {
@@ -79204,20 +79071,9 @@ cont {
   name: "railway-subway_entrance-ankara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ankara-s"
+      priority: 16913
     }
   }
   element {
@@ -79300,20 +79156,9 @@ cont {
   name: "railway-subway_entrance-athens"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-athens-s"
+      priority: 16913
     }
   }
   element {
@@ -79396,20 +79241,9 @@ cont {
   name: "railway-subway_entrance-baku"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-baku-s"
+      priority: 16913
     }
   }
   element {
@@ -79492,20 +79326,9 @@ cont {
   name: "railway-subway_entrance-bangkok"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bangkok-s"
+      priority: 16913
     }
   }
   element {
@@ -79588,20 +79411,9 @@ cont {
   name: "railway-subway_entrance-barcelona"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-barcelona-s"
+      priority: 16913
     }
   }
   element {
@@ -79684,20 +79496,9 @@ cont {
   name: "railway-subway_entrance-beijing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-beijing-s"
+      priority: 16913
     }
   }
   element {
@@ -79780,20 +79581,9 @@ cont {
   name: "railway-subway_entrance-bengalore"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bengaluru-s"
+      priority: 16913
     }
   }
   element {
@@ -79876,20 +79666,9 @@ cont {
   name: "railway-subway_entrance-berlin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -79972,20 +79751,9 @@ cont {
   name: "railway-subway_entrance-bilbao"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bilbao-s"
+      priority: 16913
     }
   }
   element {
@@ -80068,20 +79836,9 @@ cont {
   name: "railway-subway_entrance-brasilia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brasilia-s"
+      priority: 16913
     }
   }
   element {
@@ -80164,20 +79921,9 @@ cont {
   name: "railway-subway_entrance-brescia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brescia-s"
+      priority: 16913
     }
   }
   element {
@@ -80260,20 +80006,9 @@ cont {
   name: "railway-subway_entrance-brussels"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brussel-s"
+      priority: 16913
     }
   }
   element {
@@ -80356,20 +80091,9 @@ cont {
   name: "railway-subway_entrance-bucharest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bucharest-s"
+      priority: 16913
     }
   }
   element {
@@ -80452,20 +80176,9 @@ cont {
   name: "railway-subway_entrance-budapest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-budapest-s"
+      priority: 16913
     }
   }
   element {
@@ -80548,20 +80261,9 @@ cont {
   name: "railway-subway_entrance-buenos_aires"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-buenosaires-s"
+      priority: 16913
     }
   }
   element {
@@ -80644,20 +80346,9 @@ cont {
   name: "railway-subway_entrance-bursa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bursaray-s"
+      priority: 16913
     }
   }
   element {
@@ -80740,20 +80431,9 @@ cont {
   name: "railway-subway_entrance-cairo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-cairo-s"
+      priority: 16913
     }
   }
   element {
@@ -80836,20 +80516,9 @@ cont {
   name: "railway-subway_entrance-caracas"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-caracas-s"
+      priority: 16913
     }
   }
   element {
@@ -80932,20 +80601,9 @@ cont {
   name: "railway-subway_entrance-catania"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-catania-s"
+      priority: 16913
     }
   }
   element {
@@ -81028,20 +80686,9 @@ cont {
   name: "railway-subway_entrance-changchun"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-changchun-s"
+      priority: 16913
     }
   }
   element {
@@ -81124,20 +80771,9 @@ cont {
   name: "railway-subway_entrance-chengdu"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chengdu-s"
+      priority: 16913
     }
   }
   element {
@@ -81220,20 +80856,9 @@ cont {
   name: "railway-subway_entrance-chicago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chicago-s"
+      priority: 16913
     }
   }
   element {
@@ -81316,20 +80941,9 @@ cont {
   name: "railway-subway_entrance-chongqing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chongqing-s"
+      priority: 16913
     }
   }
   element {
@@ -81412,20 +81026,9 @@ cont {
   name: "railway-subway_entrance-dalian"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dalian-s"
+      priority: 16913
     }
   }
   element {
@@ -81508,20 +81111,9 @@ cont {
   name: "railway-subway_entrance-delhi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-delhi-s"
+      priority: 16913
     }
   }
   element {
@@ -81604,20 +81196,9 @@ cont {
   name: "railway-subway_entrance-dnepro"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dnepro-s"
+      priority: 16913
     }
   }
   element {
@@ -81700,20 +81281,9 @@ cont {
   name: "railway-subway_entrance-dubai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dubai-s"
+      priority: 16913
     }
   }
   element {
@@ -81796,20 +81366,9 @@ cont {
   name: "railway-subway_entrance-ekb"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ekb-s"
+      priority: 16913
     }
   }
   element {
@@ -81892,20 +81451,9 @@ cont {
   name: "railway-subway_entrance-fukuoka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-fukuoka-s"
+      priority: 16913
     }
   }
   element {
@@ -81988,20 +81536,9 @@ cont {
   name: "railway-subway_entrance-glasgow"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-glasgow-s"
+      priority: 16913
     }
   }
   element {
@@ -82084,20 +81621,9 @@ cont {
   name: "railway-subway_entrance-guangzhou"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-guangzhou-s"
+      priority: 16913
     }
   }
   element {
@@ -82180,20 +81706,9 @@ cont {
   name: "railway-subway_entrance-hamburg"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -82276,20 +81791,9 @@ cont {
   name: "railway-subway_entrance-helsinki"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-helsinki-s"
+      priority: 16913
     }
   }
   element {
@@ -82372,20 +81876,9 @@ cont {
   name: "railway-subway_entrance-hiroshima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-hirosima-s"
+      priority: 16913
     }
   }
   element {
@@ -82468,20 +81961,9 @@ cont {
   name: "railway-subway_entrance-isfahan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-isfahan-s"
+      priority: 16913
     }
   }
   element {
@@ -82564,20 +82046,9 @@ cont {
   name: "railway-subway_entrance-istanbul"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-istanbul-s"
+      priority: 16913
     }
   }
   element {
@@ -82660,20 +82131,9 @@ cont {
   name: "railway-subway_entrance-izmir"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-izmir-s"
+      priority: 16913
     }
   }
   element {
@@ -82756,20 +82216,9 @@ cont {
   name: "railway-subway_entrance-kazan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kazan-s"
+      priority: 16913
     }
   }
   element {
@@ -82852,20 +82301,9 @@ cont {
   name: "railway-subway_entrance-kharkiv"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kharkiv-s"
+      priority: 16913
     }
   }
   element {
@@ -82948,20 +82386,9 @@ cont {
   name: "railway-subway_entrance-kiev"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kiev-m"
+      priority: 16913
     }
   }
   element {
@@ -83044,20 +82471,9 @@ cont {
   name: "railway-subway_entrance-kobe"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kobe-s"
+      priority: 16913
     }
   }
   element {
@@ -83140,20 +82556,9 @@ cont {
   name: "railway-subway_entrance-kolkata"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kolkata-s"
+      priority: 16913
     }
   }
   element {
@@ -83236,20 +82641,9 @@ cont {
   name: "railway-subway_entrance-kunming"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kunming-s"
+      priority: 16913
     }
   }
   element {
@@ -83332,20 +82726,9 @@ cont {
   name: "railway-subway_entrance-kyoto"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kyoto-s"
+      priority: 16913
     }
   }
   element {
@@ -83428,20 +82811,9 @@ cont {
   name: "railway-subway_entrance-la"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-losangeles-s"
+      priority: 16913
     }
   }
   element {
@@ -83524,20 +82896,9 @@ cont {
   name: "railway-subway_entrance-lausanne"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lausanne-s"
+      priority: 16913
     }
   }
   element {
@@ -83620,20 +82981,9 @@ cont {
   name: "railway-subway_entrance-lille"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lille-s"
+      priority: 16913
     }
   }
   element {
@@ -83716,20 +83066,9 @@ cont {
   name: "railway-subway_entrance-lima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lima-s"
+      priority: 16913
     }
   }
   element {
@@ -83812,20 +83151,9 @@ cont {
   name: "railway-subway_entrance-lisboa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lisboa-s"
+      priority: 16913
     }
   }
   element {
@@ -83908,20 +83236,9 @@ cont {
   name: "railway-subway_entrance-london"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-london-s"
+      priority: 16913
     }
   }
   element {
@@ -84004,20 +83321,9 @@ cont {
   name: "railway-subway_entrance-lyon"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lyon-s"
+      priority: 16913
     }
   }
   element {
@@ -84100,20 +83406,9 @@ cont {
   name: "railway-subway_entrance-madrid"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-madrid-s"
+      priority: 16913
     }
   }
   element {
@@ -84196,20 +83491,9 @@ cont {
   name: "railway-subway_entrance-malaga"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-malaga-s"
+      priority: 16913
     }
   }
   element {
@@ -84292,20 +83576,9 @@ cont {
   name: "railway-subway_entrance-manila"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-manila-s"
+      priority: 16913
     }
   }
   element {
@@ -84388,20 +83661,9 @@ cont {
   name: "railway-subway_entrance-maracaibo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-maracaibo-s"
+      priority: 16913
     }
   }
   element {
@@ -84484,20 +83746,9 @@ cont {
   name: "railway-subway_entrance-mashhad"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mashhad-s"
+      priority: 16913
     }
   }
   element {
@@ -84580,20 +83831,9 @@ cont {
   name: "railway-subway_entrance-mecca"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mecca-s"
+      priority: 16913
     }
   }
   element {
@@ -84676,20 +83916,9 @@ cont {
   name: "railway-subway_entrance-medellin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-medellin-s"
+      priority: 16913
     }
   }
   element {
@@ -84772,20 +84001,9 @@ cont {
   name: "railway-subway_entrance-mexico"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mexico-s"
+      priority: 16913
     }
   }
   element {
@@ -84868,20 +84086,9 @@ cont {
   name: "railway-subway_entrance-milan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-milan-s"
+      priority: 16913
     }
   }
   element {
@@ -84964,20 +84171,9 @@ cont {
   name: "railway-subway_entrance-minsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-minsk-m"
+      priority: 16913
     }
   }
   element {
@@ -85060,20 +84256,9 @@ cont {
   name: "railway-subway_entrance-montreal"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-montreal-s"
+      priority: 16913
     }
   }
   element {
@@ -85284,20 +84469,9 @@ cont {
   name: "railway-subway_entrance-munchen"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -85380,20 +84554,9 @@ cont {
   name: "railway-subway_entrance-nagoya"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-nagoya-s"
+      priority: 16913
     }
   }
   element {
@@ -85476,20 +84639,9 @@ cont {
   name: "railway-subway_entrance-newyork"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-newyork-s"
+      priority: 16913
     }
   }
   element {
@@ -85572,20 +84724,9 @@ cont {
   name: "railway-subway_entrance-nnov"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-nnov-s"
+      priority: 16913
     }
   }
   element {
@@ -85668,20 +84809,9 @@ cont {
   name: "railway-subway_entrance-novosibirsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-novosibirsk-s"
+      priority: 16913
     }
   }
   element {
@@ -85764,20 +84894,9 @@ cont {
   name: "railway-subway_entrance-osaka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-osaka-s"
+      priority: 16913
     }
   }
   element {
@@ -85860,20 +84979,9 @@ cont {
   name: "railway-subway_entrance-oslo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-oslo-s"
+      priority: 16913
     }
   }
   element {
@@ -85956,20 +85064,9 @@ cont {
   name: "railway-subway_entrance-palma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-palma-s"
+      priority: 16913
     }
   }
   element {
@@ -86052,20 +85149,9 @@ cont {
   name: "railway-subway_entrance-panama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-panama-s"
+      priority: 16913
     }
   }
   element {
@@ -86148,20 +85234,9 @@ cont {
   name: "railway-subway_entrance-paris"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-paris-s"
+      priority: 16913
     }
   }
   element {
@@ -86244,20 +85319,9 @@ cont {
   name: "railway-subway_entrance-philadelphia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-philadelphia-s"
+      priority: 16913
     }
   }
   element {
@@ -86340,20 +85404,9 @@ cont {
   name: "railway-subway_entrance-pyongyang"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-pyongyang-s"
+      priority: 16913
     }
   }
   element {
@@ -86436,20 +85489,9 @@ cont {
   name: "railway-subway_entrance-rennes"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rennes-s"
+      priority: 16913
     }
   }
   element {
@@ -86532,20 +85574,9 @@ cont {
   name: "railway-subway_entrance-rio"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-riodejaneiro-s"
+      priority: 16913
     }
   }
   element {
@@ -86628,20 +85659,9 @@ cont {
   name: "railway-subway_entrance-roma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rome-m"
+      priority: 16913
     }
   }
   element {
@@ -86724,20 +85744,9 @@ cont {
   name: "railway-subway_entrance-rotterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rotterdam-s"
+      priority: 16913
     }
   }
   element {
@@ -86820,20 +85829,9 @@ cont {
   name: "railway-subway_entrance-samara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-samara-s"
+      priority: 16913
     }
   }
   element {
@@ -86916,20 +85914,9 @@ cont {
   name: "railway-subway_entrance-santiago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-santiago-s"
+      priority: 16913
     }
   }
   element {
@@ -87012,20 +85999,9 @@ cont {
   name: "railway-subway_entrance-santo_domingo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-santodomingo-s"
+      priority: 16913
     }
   }
   element {
@@ -87108,20 +86084,9 @@ cont {
   name: "railway-subway_entrance-saopaulo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-saopaulo-s"
+      priority: 16913
     }
   }
   element {
@@ -87204,20 +86169,9 @@ cont {
   name: "railway-subway_entrance-sapporo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sapporo-s"
+      priority: 16913
     }
   }
   element {
@@ -87300,20 +86254,9 @@ cont {
   name: "railway-subway_entrance-sendai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sendai-s"
+      priority: 16913
     }
   }
   element {
@@ -87396,20 +86339,9 @@ cont {
   name: "railway-subway_entrance-sf"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sanfrancisco-s"
+      priority: 16913
     }
   }
   element {
@@ -87492,20 +86424,9 @@ cont {
   name: "railway-subway_entrance-shanghai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-shanghai-s"
+      priority: 16913
     }
   }
   element {
@@ -87588,20 +86509,9 @@ cont {
   name: "railway-subway_entrance-shiraz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-shiraz-s"
+      priority: 16913
     }
   }
   element {
@@ -87684,20 +86594,9 @@ cont {
   name: "railway-subway_entrance-sofia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sofia-s"
+      priority: 16913
     }
   }
   element {
@@ -87778,6 +86677,13 @@ cont {
 }
 cont {
   name: "railway-subway_entrance-spb"
+  element {
+    scale: 15
+    symbol {
+      name: "subway-spb-s"
+      priority: 16913
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -87883,20 +86789,9 @@ cont {
   name: "railway-subway_entrance-stockholm"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-stockholm-s"
+      priority: 16913
     }
   }
   element {
@@ -87979,20 +86874,9 @@ cont {
   name: "railway-subway_entrance-tabriz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tabriz-s"
+      priority: 16913
     }
   }
   element {
@@ -88075,20 +86959,9 @@ cont {
   name: "railway-subway_entrance-taipei"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-taipei-s"
+      priority: 16913
     }
   }
   element {
@@ -88171,20 +87044,9 @@ cont {
   name: "railway-subway_entrance-taoyuan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-taoyuan-s"
+      priority: 16913
     }
   }
   element {
@@ -88267,20 +87129,9 @@ cont {
   name: "railway-subway_entrance-tashkent"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tashkent-s"
+      priority: 16913
     }
   }
   element {
@@ -88363,20 +87214,9 @@ cont {
   name: "railway-subway_entrance-tbilisi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tbilisi-s"
+      priority: 16913
     }
   }
   element {
@@ -88459,20 +87299,9 @@ cont {
   name: "railway-subway_entrance-tianjin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tianjin-s"
+      priority: 16913
     }
   }
   element {
@@ -88555,20 +87384,9 @@ cont {
   name: "railway-subway_entrance-tokyo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tokyo-s"
+      priority: 16913
     }
   }
   element {
@@ -88651,20 +87469,9 @@ cont {
   name: "railway-subway_entrance-valencia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-valencia-s"
+      priority: 16913
     }
   }
   element {
@@ -88747,20 +87554,9 @@ cont {
   name: "railway-subway_entrance-vienna"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-vienna-s"
+      priority: 16913
     }
   }
   element {
@@ -88843,20 +87639,9 @@ cont {
   name: "railway-subway_entrance-warszawa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-warszawa-s"
+      priority: 16913
     }
   }
   element {
@@ -88939,20 +87724,9 @@ cont {
   name: "railway-subway_entrance-washington"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-washington-s"
+      priority: 16913
     }
   }
   element {
@@ -89035,20 +87809,9 @@ cont {
   name: "railway-subway_entrance-wuhan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-wuhan-s"
+      priority: 16913
     }
   }
   element {
@@ -89131,20 +87894,9 @@ cont {
   name: "railway-subway_entrance-yerevan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-yerevan-s"
+      priority: 16913
     }
   }
   element {
@@ -89227,20 +87979,9 @@ cont {
   name: "railway-subway_entrance-yokohama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-yokohama-s"
+      priority: 16913
     }
   }
   element {
@@ -90302,28 +89043,6 @@ cont {
 }
 cont {
   name: "shop"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90361,28 +89080,6 @@ cont {
 }
 cont {
   name: "shop-agrarian"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90491,28 +89188,6 @@ cont {
 }
 cont {
   name: "shop-antiques"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90550,28 +89225,6 @@ cont {
 }
 cont {
   name: "shop-appliance"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90609,28 +89262,6 @@ cont {
 }
 cont {
   name: "shop-art"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90668,28 +89299,6 @@ cont {
 }
 cont {
   name: "shop-baby_goods"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90727,28 +89336,6 @@ cont {
 }
 cont {
   name: "shop-bag"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90857,28 +89444,6 @@ cont {
 }
 cont {
   name: "shop-bathroom_furnishing"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90987,28 +89552,6 @@ cont {
 }
 cont {
   name: "shop-bed"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91330,28 +89873,6 @@ cont {
 }
 cont {
   name: "shop-boutique"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91460,28 +89981,6 @@ cont {
 }
 cont {
   name: "shop-cannabis"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91746,7 +90245,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91763,7 +90262,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91780,7 +90279,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91797,7 +90296,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91814,7 +90313,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
 }
@@ -91891,28 +90390,6 @@ cont {
 }
 cont {
   name: "shop-carpet"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92021,28 +90498,6 @@ cont {
 }
 cont {
   name: "shop-cheese"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92293,28 +90748,6 @@ cont {
 }
 cont {
   name: "shop-coffee"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92707,28 +91140,6 @@ cont {
 }
 cont {
   name: "shop-craft"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92766,28 +91177,6 @@ cont {
 }
 cont {
   name: "shop-curtain"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92825,28 +91214,6 @@ cont {
 }
 cont {
   name: "shop-dairy"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93168,28 +91535,6 @@ cont {
 }
 cont {
   name: "shop-electrical"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93511,28 +91856,6 @@ cont {
 }
 cont {
   name: "shop-fashion_accessories"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93570,28 +91893,6 @@ cont {
 }
 cont {
   name: "shop-fishing"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93913,28 +92214,6 @@ cont {
 }
 cont {
   name: "shop-gas"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94398,28 +92677,6 @@ cont {
 }
 cont {
   name: "shop-herbalist"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94457,28 +92714,6 @@ cont {
 }
 cont {
   name: "shop-hifi"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94587,28 +92822,6 @@ cont {
 }
 cont {
   name: "shop-interior_decoration"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94930,28 +93143,6 @@ cont {
 }
 cont {
   name: "shop-lottery"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95094,32 +93285,12 @@ cont {
 }
 cont {
   name: "shop-massage"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15586
+      min_distance: 24
     }
   }
   element {
@@ -95127,7 +93298,7 @@ cont {
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -95144,7 +93315,7 @@ cont {
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -95159,28 +93330,6 @@ cont {
 }
 cont {
   name: "shop-medical_supply"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95289,23 +93438,12 @@ cont {
 }
 cont {
   name: "shop-money_lender"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -95322,7 +93460,7 @@ cont {
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -95339,7 +93477,7 @@ cont {
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -95425,28 +93563,6 @@ cont {
 }
 cont {
   name: "shop-motorcycle_repair"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95626,17 +93742,6 @@ cont {
 }
 cont {
   name: "shop-newsagent"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
@@ -95644,15 +93749,6 @@ cont {
       priority: 16586
       min_distance: 24
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15586
-    }
   }
   element {
     scale: 18
@@ -95691,28 +93787,6 @@ cont {
 }
 cont {
   name: "shop-nutrition_supplements"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95892,28 +93966,6 @@ cont {
 }
 cont {
   name: "shop-outpost"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95951,28 +94003,6 @@ cont {
 }
 cont {
   name: "shop-paint"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96081,23 +94111,12 @@ cont {
 }
 cont {
   name: "shop-pawnbroker"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15625
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -96114,7 +94133,7 @@ cont {
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -96131,7 +94150,7 @@ cont {
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -96146,28 +94165,6 @@ cont {
 }
 cont {
   name: "shop-perfumery"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96276,28 +94273,6 @@ cont {
 }
 cont {
   name: "shop-pet_grooming"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96763,11 +94738,17 @@ cont {
   name: "shop-stationery"
   element {
     scale: 16
+    symbol {
+      name: "stationery_shop-m"
+      priority: 16586
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15586
     }
@@ -96826,28 +94807,6 @@ cont {
 }
 cont {
   name: "shop-storage_rental"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97061,28 +95020,6 @@ cont {
 }
 cont {
   name: "shop-tea"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97191,28 +95128,6 @@ cont {
 }
 cont {
   name: "shop-tobacco"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97321,28 +95236,6 @@ cont {
 }
 cont {
   name: "shop-trade"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97380,28 +95273,6 @@ cont {
 }
 cont {
   name: "shop-travel_agency"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97511,23 +95382,18 @@ cont {
 cont {
   name: "shop-variety_store"
   element {
-    scale: 16
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
+        is_optional: true
       }
       priority: 15586
     }
@@ -97537,11 +95403,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16586
-      min_distance: 8
+      min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -97554,11 +95420,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16586
-      min_distance: 8
+      min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -97711,28 +95577,6 @@ cont {
 }
 cont {
   name: "shop-watches"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97770,28 +95614,6 @@ cont {
 }
 cont {
   name: "shop-wholesale"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 5a32f00d15..881e1706ba 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 6b902024b3..63d68fbb78 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -26201,13 +26201,14 @@ cont {
       priority: 16644
       min_distance: 20
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26216,13 +26217,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26231,13 +26233,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26246,13 +26249,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26261,13 +26265,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
 }
@@ -36213,13 +36218,10 @@ cont {
       color: 12372094
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -36511,13 +36513,10 @@ cont {
       color: 12372094
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -36809,13 +36808,10 @@ cont {
       color: 12372094
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -37107,13 +37103,10 @@ cont {
       color: 12372094
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 3832097
-        stroke_color: 872415231
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -38890,13 +38883,6 @@ cont {
       color: 16575614
       priority: -15991
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-      }
-      priority: 15009
-    }
   }
   element {
     scale: 16
@@ -39386,14 +39372,6 @@ cont {
       color: 11190117
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39527,14 +39505,6 @@ cont {
       color: 11190117
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39543,14 +39513,6 @@ cont {
       color: 11190117
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39575,14 +39537,6 @@ cont {
       color: 11190117
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -40224,14 +40178,6 @@ cont {
       color: 12372094
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -40489,14 +40435,6 @@ cont {
       color: 12372094
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -40754,14 +40692,6 @@ cont {
       color: 12372094
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -41019,14 +40949,6 @@ cont {
       color: 12372094
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -78226,20 +78148,9 @@ cont {
   name: "railway-subway_entrance"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16913
     }
   }
   element {
@@ -78322,20 +78233,9 @@ cont {
   name: "railway-subway_entrance-adana"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-adana-s"
+      priority: 16913
     }
   }
   element {
@@ -78418,20 +78318,9 @@ cont {
   name: "railway-subway_entrance-algiers"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-algeria-s"
+      priority: 16913
     }
   }
   element {
@@ -78514,20 +78403,9 @@ cont {
   name: "railway-subway_entrance-almaty"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-almaty-s"
+      priority: 16913
     }
   }
   element {
@@ -78610,20 +78488,9 @@ cont {
   name: "railway-subway_entrance-amsterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-amsterdam-s"
+      priority: 16913
     }
   }
   element {
@@ -78706,20 +78573,9 @@ cont {
   name: "railway-subway_entrance-ankara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ankara-s"
+      priority: 16913
     }
   }
   element {
@@ -78802,20 +78658,9 @@ cont {
   name: "railway-subway_entrance-athens"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-athens-s"
+      priority: 16913
     }
   }
   element {
@@ -78898,20 +78743,9 @@ cont {
   name: "railway-subway_entrance-baku"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-baku-s"
+      priority: 16913
     }
   }
   element {
@@ -78994,20 +78828,9 @@ cont {
   name: "railway-subway_entrance-bangkok"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bangkok-s"
+      priority: 16913
     }
   }
   element {
@@ -79090,20 +78913,9 @@ cont {
   name: "railway-subway_entrance-barcelona"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-barcelona-s"
+      priority: 16913
     }
   }
   element {
@@ -79186,20 +78998,9 @@ cont {
   name: "railway-subway_entrance-beijing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-beijing-s"
+      priority: 16913
     }
   }
   element {
@@ -79282,20 +79083,9 @@ cont {
   name: "railway-subway_entrance-bengalore"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bengaluru-s"
+      priority: 16913
     }
   }
   element {
@@ -79378,20 +79168,9 @@ cont {
   name: "railway-subway_entrance-berlin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -79474,20 +79253,9 @@ cont {
   name: "railway-subway_entrance-bilbao"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bilbao-s"
+      priority: 16913
     }
   }
   element {
@@ -79570,20 +79338,9 @@ cont {
   name: "railway-subway_entrance-brasilia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brasilia-s"
+      priority: 16913
     }
   }
   element {
@@ -79666,20 +79423,9 @@ cont {
   name: "railway-subway_entrance-brescia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brescia-s"
+      priority: 16913
     }
   }
   element {
@@ -79762,20 +79508,9 @@ cont {
   name: "railway-subway_entrance-brussels"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brussel-s"
+      priority: 16913
     }
   }
   element {
@@ -79858,20 +79593,9 @@ cont {
   name: "railway-subway_entrance-bucharest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bucharest-s"
+      priority: 16913
     }
   }
   element {
@@ -79954,20 +79678,9 @@ cont {
   name: "railway-subway_entrance-budapest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-budapest-s"
+      priority: 16913
     }
   }
   element {
@@ -80050,20 +79763,9 @@ cont {
   name: "railway-subway_entrance-buenos_aires"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-buenosaires-s"
+      priority: 16913
     }
   }
   element {
@@ -80146,20 +79848,9 @@ cont {
   name: "railway-subway_entrance-bursa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bursaray-s"
+      priority: 16913
     }
   }
   element {
@@ -80242,20 +79933,9 @@ cont {
   name: "railway-subway_entrance-cairo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-cairo-s"
+      priority: 16913
     }
   }
   element {
@@ -80338,20 +80018,9 @@ cont {
   name: "railway-subway_entrance-caracas"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-caracas-s"
+      priority: 16913
     }
   }
   element {
@@ -80434,20 +80103,9 @@ cont {
   name: "railway-subway_entrance-catania"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-catania-s"
+      priority: 16913
     }
   }
   element {
@@ -80530,20 +80188,9 @@ cont {
   name: "railway-subway_entrance-changchun"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-changchun-s"
+      priority: 16913
     }
   }
   element {
@@ -80626,20 +80273,9 @@ cont {
   name: "railway-subway_entrance-chengdu"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chengdu-s"
+      priority: 16913
     }
   }
   element {
@@ -80722,20 +80358,9 @@ cont {
   name: "railway-subway_entrance-chicago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chicago-s"
+      priority: 16913
     }
   }
   element {
@@ -80818,20 +80443,9 @@ cont {
   name: "railway-subway_entrance-chongqing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chongqing-s"
+      priority: 16913
     }
   }
   element {
@@ -80914,20 +80528,9 @@ cont {
   name: "railway-subway_entrance-dalian"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dalian-s"
+      priority: 16913
     }
   }
   element {
@@ -81010,20 +80613,9 @@ cont {
   name: "railway-subway_entrance-delhi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-delhi-s"
+      priority: 16913
     }
   }
   element {
@@ -81106,20 +80698,9 @@ cont {
   name: "railway-subway_entrance-dnepro"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dnepro-s"
+      priority: 16913
     }
   }
   element {
@@ -81202,20 +80783,9 @@ cont {
   name: "railway-subway_entrance-dubai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dubai-s"
+      priority: 16913
     }
   }
   element {
@@ -81298,20 +80868,9 @@ cont {
   name: "railway-subway_entrance-ekb"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ekb-s"
+      priority: 16913
     }
   }
   element {
@@ -81394,20 +80953,9 @@ cont {
   name: "railway-subway_entrance-fukuoka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-fukuoka-s"
+      priority: 16913
     }
   }
   element {
@@ -81490,20 +81038,9 @@ cont {
   name: "railway-subway_entrance-glasgow"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-glasgow-s"
+      priority: 16913
     }
   }
   element {
@@ -81586,20 +81123,9 @@ cont {
   name: "railway-subway_entrance-guangzhou"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-guangzhou-s"
+      priority: 16913
     }
   }
   element {
@@ -81682,20 +81208,9 @@ cont {
   name: "railway-subway_entrance-hamburg"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -81778,20 +81293,9 @@ cont {
   name: "railway-subway_entrance-helsinki"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-helsinki-s"
+      priority: 16913
     }
   }
   element {
@@ -81874,20 +81378,9 @@ cont {
   name: "railway-subway_entrance-hiroshima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-hirosima-s"
+      priority: 16913
     }
   }
   element {
@@ -81970,20 +81463,9 @@ cont {
   name: "railway-subway_entrance-isfahan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-isfahan-s"
+      priority: 16913
     }
   }
   element {
@@ -82066,20 +81548,9 @@ cont {
   name: "railway-subway_entrance-istanbul"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-istanbul-s"
+      priority: 16913
     }
   }
   element {
@@ -82162,20 +81633,9 @@ cont {
   name: "railway-subway_entrance-izmir"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-izmir-s"
+      priority: 16913
     }
   }
   element {
@@ -82258,20 +81718,9 @@ cont {
   name: "railway-subway_entrance-kazan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kazan-s"
+      priority: 16913
     }
   }
   element {
@@ -82354,20 +81803,9 @@ cont {
   name: "railway-subway_entrance-kharkiv"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kharkiv-s"
+      priority: 16913
     }
   }
   element {
@@ -82450,20 +81888,9 @@ cont {
   name: "railway-subway_entrance-kiev"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kiev-m"
+      priority: 16913
     }
   }
   element {
@@ -82546,20 +81973,9 @@ cont {
   name: "railway-subway_entrance-kobe"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kobe-s"
+      priority: 16913
     }
   }
   element {
@@ -82642,20 +82058,9 @@ cont {
   name: "railway-subway_entrance-kolkata"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kolkata-s"
+      priority: 16913
     }
   }
   element {
@@ -82738,20 +82143,9 @@ cont {
   name: "railway-subway_entrance-kunming"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kunming-s"
+      priority: 16913
     }
   }
   element {
@@ -82834,20 +82228,9 @@ cont {
   name: "railway-subway_entrance-kyoto"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kyoto-s"
+      priority: 16913
     }
   }
   element {
@@ -82930,20 +82313,9 @@ cont {
   name: "railway-subway_entrance-la"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-losangeles-s"
+      priority: 16913
     }
   }
   element {
@@ -83026,20 +82398,9 @@ cont {
   name: "railway-subway_entrance-lausanne"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lausanne-s"
+      priority: 16913
     }
   }
   element {
@@ -83122,20 +82483,9 @@ cont {
   name: "railway-subway_entrance-lille"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lille-s"
+      priority: 16913
     }
   }
   element {
@@ -83218,20 +82568,9 @@ cont {
   name: "railway-subway_entrance-lima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lima-s"
+      priority: 16913
     }
   }
   element {
@@ -83314,20 +82653,9 @@ cont {
   name: "railway-subway_entrance-lisboa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lisboa-s"
+      priority: 16913
     }
   }
   element {
@@ -83410,20 +82738,9 @@ cont {
   name: "railway-subway_entrance-london"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-london-s"
+      priority: 16913
     }
   }
   element {
@@ -83506,20 +82823,9 @@ cont {
   name: "railway-subway_entrance-lyon"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lyon-s"
+      priority: 16913
     }
   }
   element {
@@ -83602,20 +82908,9 @@ cont {
   name: "railway-subway_entrance-madrid"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-madrid-s"
+      priority: 16913
     }
   }
   element {
@@ -83698,20 +82993,9 @@ cont {
   name: "railway-subway_entrance-malaga"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-malaga-s"
+      priority: 16913
     }
   }
   element {
@@ -83794,20 +83078,9 @@ cont {
   name: "railway-subway_entrance-manila"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-manila-s"
+      priority: 16913
     }
   }
   element {
@@ -83890,20 +83163,9 @@ cont {
   name: "railway-subway_entrance-maracaibo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-maracaibo-s"
+      priority: 16913
     }
   }
   element {
@@ -83986,20 +83248,9 @@ cont {
   name: "railway-subway_entrance-mashhad"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mashhad-s"
+      priority: 16913
     }
   }
   element {
@@ -84082,20 +83333,9 @@ cont {
   name: "railway-subway_entrance-mecca"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mecca-s"
+      priority: 16913
     }
   }
   element {
@@ -84178,20 +83418,9 @@ cont {
   name: "railway-subway_entrance-medellin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-medellin-s"
+      priority: 16913
     }
   }
   element {
@@ -84274,20 +83503,9 @@ cont {
   name: "railway-subway_entrance-mexico"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mexico-s"
+      priority: 16913
     }
   }
   element {
@@ -84370,20 +83588,9 @@ cont {
   name: "railway-subway_entrance-milan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-milan-s"
+      priority: 16913
     }
   }
   element {
@@ -84466,20 +83673,9 @@ cont {
   name: "railway-subway_entrance-minsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-minsk-m"
+      priority: 16913
     }
   }
   element {
@@ -84562,20 +83758,9 @@ cont {
   name: "railway-subway_entrance-montreal"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-montreal-s"
+      priority: 16913
     }
   }
   element {
@@ -84786,20 +83971,9 @@ cont {
   name: "railway-subway_entrance-munchen"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -84882,20 +84056,9 @@ cont {
   name: "railway-subway_entrance-nagoya"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-nagoya-s"
+      priority: 16913
     }
   }
   element {
@@ -84978,20 +84141,9 @@ cont {
   name: "railway-subway_entrance-newyork"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-newyork-s"
+      priority: 16913
     }
   }
   element {
@@ -85074,20 +84226,9 @@ cont {
   name: "railway-subway_entrance-nnov"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-nnov-s"
+      priority: 16913
     }
   }
   element {
@@ -85170,20 +84311,9 @@ cont {
   name: "railway-subway_entrance-novosibirsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-novosibirsk-s"
+      priority: 16913
     }
   }
   element {
@@ -85266,20 +84396,9 @@ cont {
   name: "railway-subway_entrance-osaka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-osaka-s"
+      priority: 16913
     }
   }
   element {
@@ -85362,20 +84481,9 @@ cont {
   name: "railway-subway_entrance-oslo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-oslo-s"
+      priority: 16913
     }
   }
   element {
@@ -85458,20 +84566,9 @@ cont {
   name: "railway-subway_entrance-palma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-palma-s"
+      priority: 16913
     }
   }
   element {
@@ -85554,20 +84651,9 @@ cont {
   name: "railway-subway_entrance-panama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-panama-s"
+      priority: 16913
     }
   }
   element {
@@ -85650,20 +84736,9 @@ cont {
   name: "railway-subway_entrance-paris"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-paris-s"
+      priority: 16913
     }
   }
   element {
@@ -85746,20 +84821,9 @@ cont {
   name: "railway-subway_entrance-philadelphia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-philadelphia-s"
+      priority: 16913
     }
   }
   element {
@@ -85842,20 +84906,9 @@ cont {
   name: "railway-subway_entrance-pyongyang"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-pyongyang-s"
+      priority: 16913
     }
   }
   element {
@@ -85938,20 +84991,9 @@ cont {
   name: "railway-subway_entrance-rennes"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rennes-s"
+      priority: 16913
     }
   }
   element {
@@ -86034,20 +85076,9 @@ cont {
   name: "railway-subway_entrance-rio"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-riodejaneiro-s"
+      priority: 16913
     }
   }
   element {
@@ -86130,20 +85161,9 @@ cont {
   name: "railway-subway_entrance-roma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rome-m"
+      priority: 16913
     }
   }
   element {
@@ -86226,20 +85246,9 @@ cont {
   name: "railway-subway_entrance-rotterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rotterdam-s"
+      priority: 16913
     }
   }
   element {
@@ -86322,20 +85331,9 @@ cont {
   name: "railway-subway_entrance-samara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-samara-s"
+      priority: 16913
     }
   }
   element {
@@ -86418,20 +85416,9 @@ cont {
   name: "railway-subway_entrance-santiago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-santiago-s"
+      priority: 16913
     }
   }
   element {
@@ -86514,20 +85501,9 @@ cont {
   name: "railway-subway_entrance-santo_domingo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-santodomingo-s"
+      priority: 16913
     }
   }
   element {
@@ -86610,20 +85586,9 @@ cont {
   name: "railway-subway_entrance-saopaulo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-saopaulo-s"
+      priority: 16913
     }
   }
   element {
@@ -86706,20 +85671,9 @@ cont {
   name: "railway-subway_entrance-sapporo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sapporo-s"
+      priority: 16913
     }
   }
   element {
@@ -86802,20 +85756,9 @@ cont {
   name: "railway-subway_entrance-sendai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sendai-s"
+      priority: 16913
     }
   }
   element {
@@ -86898,20 +85841,9 @@ cont {
   name: "railway-subway_entrance-sf"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sanfrancisco-s"
+      priority: 16913
     }
   }
   element {
@@ -86994,20 +85926,9 @@ cont {
   name: "railway-subway_entrance-shanghai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-shanghai-s"
+      priority: 16913
     }
   }
   element {
@@ -87090,20 +86011,9 @@ cont {
   name: "railway-subway_entrance-shiraz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-shiraz-s"
+      priority: 16913
     }
   }
   element {
@@ -87186,20 +86096,9 @@ cont {
   name: "railway-subway_entrance-sofia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sofia-s"
+      priority: 16913
     }
   }
   element {
@@ -87280,6 +86179,13 @@ cont {
 }
 cont {
   name: "railway-subway_entrance-spb"
+  element {
+    scale: 15
+    symbol {
+      name: "subway-spb-s"
+      priority: 16913
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -87385,20 +86291,9 @@ cont {
   name: "railway-subway_entrance-stockholm"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-stockholm-s"
+      priority: 16913
     }
   }
   element {
@@ -87481,20 +86376,9 @@ cont {
   name: "railway-subway_entrance-tabriz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tabriz-s"
+      priority: 16913
     }
   }
   element {
@@ -87577,20 +86461,9 @@ cont {
   name: "railway-subway_entrance-taipei"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-taipei-s"
+      priority: 16913
     }
   }
   element {
@@ -87673,20 +86546,9 @@ cont {
   name: "railway-subway_entrance-taoyuan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-taoyuan-s"
+      priority: 16913
     }
   }
   element {
@@ -87769,20 +86631,9 @@ cont {
   name: "railway-subway_entrance-tashkent"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tashkent-s"
+      priority: 16913
     }
   }
   element {
@@ -87865,20 +86716,9 @@ cont {
   name: "railway-subway_entrance-tbilisi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tbilisi-s"
+      priority: 16913
     }
   }
   element {
@@ -87961,20 +86801,9 @@ cont {
   name: "railway-subway_entrance-tianjin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tianjin-s"
+      priority: 16913
     }
   }
   element {
@@ -88057,20 +86886,9 @@ cont {
   name: "railway-subway_entrance-tokyo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tokyo-s"
+      priority: 16913
     }
   }
   element {
@@ -88153,20 +86971,9 @@ cont {
   name: "railway-subway_entrance-valencia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-valencia-s"
+      priority: 16913
     }
   }
   element {
@@ -88249,20 +87056,9 @@ cont {
   name: "railway-subway_entrance-vienna"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-vienna-s"
+      priority: 16913
     }
   }
   element {
@@ -88345,20 +87141,9 @@ cont {
   name: "railway-subway_entrance-warszawa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-warszawa-s"
+      priority: 16913
     }
   }
   element {
@@ -88441,20 +87226,9 @@ cont {
   name: "railway-subway_entrance-washington"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-washington-s"
+      priority: 16913
     }
   }
   element {
@@ -88537,20 +87311,9 @@ cont {
   name: "railway-subway_entrance-wuhan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-wuhan-s"
+      priority: 16913
     }
   }
   element {
@@ -88633,20 +87396,9 @@ cont {
   name: "railway-subway_entrance-yerevan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-yerevan-s"
+      priority: 16913
     }
   }
   element {
@@ -88729,20 +87481,9 @@ cont {
   name: "railway-subway_entrance-yokohama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 2236962
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-yokohama-s"
+      priority: 16913
     }
   }
   element {
@@ -89804,28 +88545,6 @@ cont {
 }
 cont {
   name: "shop"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -89863,28 +88582,6 @@ cont {
 }
 cont {
   name: "shop-agrarian"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -89993,28 +88690,6 @@ cont {
 }
 cont {
   name: "shop-antiques"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90052,28 +88727,6 @@ cont {
 }
 cont {
   name: "shop-appliance"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90111,28 +88764,6 @@ cont {
 }
 cont {
   name: "shop-art"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90170,28 +88801,6 @@ cont {
 }
 cont {
   name: "shop-baby_goods"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90229,28 +88838,6 @@ cont {
 }
 cont {
   name: "shop-bag"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90359,28 +88946,6 @@ cont {
 }
 cont {
   name: "shop-bathroom_furnishing"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90489,28 +89054,6 @@ cont {
 }
 cont {
   name: "shop-bed"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90832,28 +89375,6 @@ cont {
 }
 cont {
   name: "shop-boutique"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90962,28 +89483,6 @@ cont {
 }
 cont {
   name: "shop-cannabis"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91248,7 +89747,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91265,7 +89764,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91282,7 +89781,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91299,7 +89798,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91316,7 +89815,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
 }
@@ -91393,28 +89892,6 @@ cont {
 }
 cont {
   name: "shop-carpet"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91523,28 +90000,6 @@ cont {
 }
 cont {
   name: "shop-cheese"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91795,28 +90250,6 @@ cont {
 }
 cont {
   name: "shop-coffee"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92209,28 +90642,6 @@ cont {
 }
 cont {
   name: "shop-craft"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92268,28 +90679,6 @@ cont {
 }
 cont {
   name: "shop-curtain"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92327,28 +90716,6 @@ cont {
 }
 cont {
   name: "shop-dairy"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92670,28 +91037,6 @@ cont {
 }
 cont {
   name: "shop-electrical"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93013,28 +91358,6 @@ cont {
 }
 cont {
   name: "shop-fashion_accessories"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93072,28 +91395,6 @@ cont {
 }
 cont {
   name: "shop-fishing"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93415,28 +91716,6 @@ cont {
 }
 cont {
   name: "shop-gas"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93900,28 +92179,6 @@ cont {
 }
 cont {
   name: "shop-herbalist"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93959,28 +92216,6 @@ cont {
 }
 cont {
   name: "shop-hifi"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94089,28 +92324,6 @@ cont {
 }
 cont {
   name: "shop-interior_decoration"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94432,28 +92645,6 @@ cont {
 }
 cont {
   name: "shop-lottery"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94596,32 +92787,12 @@ cont {
 }
 cont {
   name: "shop-massage"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15586
+      min_distance: 24
     }
   }
   element {
@@ -94629,7 +92800,7 @@ cont {
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -94646,7 +92817,7 @@ cont {
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -94661,28 +92832,6 @@ cont {
 }
 cont {
   name: "shop-medical_supply"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94791,23 +92940,12 @@ cont {
 }
 cont {
   name: "shop-money_lender"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -94824,7 +92962,7 @@ cont {
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -94841,7 +92979,7 @@ cont {
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -94927,28 +93065,6 @@ cont {
 }
 cont {
   name: "shop-motorcycle_repair"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95128,17 +93244,6 @@ cont {
 }
 cont {
   name: "shop-newsagent"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
@@ -95146,15 +93251,6 @@ cont {
       priority: 16586
       min_distance: 24
     }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15586
-    }
   }
   element {
     scale: 18
@@ -95193,28 +93289,6 @@ cont {
 }
 cont {
   name: "shop-nutrition_supplements"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95394,28 +93468,6 @@ cont {
 }
 cont {
   name: "shop-outpost"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95453,28 +93505,6 @@ cont {
 }
 cont {
   name: "shop-paint"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95583,23 +93613,12 @@ cont {
 }
 cont {
   name: "shop-pawnbroker"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15625
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -95616,7 +93635,7 @@ cont {
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -95633,7 +93652,7 @@ cont {
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -95648,28 +93667,6 @@ cont {
 }
 cont {
   name: "shop-perfumery"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95778,28 +93775,6 @@ cont {
 }
 cont {
   name: "shop-pet_grooming"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96265,11 +94240,17 @@ cont {
   name: "shop-stationery"
   element {
     scale: 16
+    symbol {
+      name: "stationery_shop-m"
+      priority: 16586
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15586
     }
@@ -96328,28 +94309,6 @@ cont {
 }
 cont {
   name: "shop-storage_rental"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96529,28 +94488,6 @@ cont {
 }
 cont {
   name: "shop-tea"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96659,28 +94596,6 @@ cont {
 }
 cont {
   name: "shop-tobacco"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96789,28 +94704,6 @@ cont {
 }
 cont {
   name: "shop-trade"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96848,28 +94741,6 @@ cont {
 }
 cont {
   name: "shop-travel_agency"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96979,23 +94850,18 @@ cont {
 cont {
   name: "shop-variety_store"
   element {
-    scale: 16
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
+        is_optional: true
       }
       priority: 15586
     }
@@ -97005,11 +94871,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16586
-      min_distance: 8
+      min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -97022,11 +94888,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16586
-      min_distance: 8
+      min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
@@ -97179,28 +95045,6 @@ cont {
 }
 cont {
   name: "shop-watches"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97238,28 +95082,6 @@ cont {
 }
 cont {
   name: "shop-wholesale"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 9dc0420ee9..88d06af29f 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index e597f13faa..8a16db8c31 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -26302,13 +26302,14 @@ cont {
       priority: 16644
       min_distance: 20
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26317,13 +26318,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26332,13 +26334,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26347,13 +26350,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -26362,13 +26366,14 @@ cont {
       name: "car-repair-m"
       priority: 16644
     }
-    path_text {
+    caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
 }
@@ -36356,13 +36361,10 @@ cont {
       color: 1317888
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 2836760
-        stroke_color: 856756480
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -36654,13 +36656,10 @@ cont {
       color: 1317888
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 2836760
-        stroke_color: 856756480
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -36952,13 +36951,10 @@ cont {
       color: 1317888
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 2836760
-        stroke_color: 856756480
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -37250,13 +37246,10 @@ cont {
       color: 1317888
       priority: -15943
     }
-    caption {
-      primary {
-        height: 10
-        color: 2836760
-        stroke_color: 856756480
-      }
-      priority: 15057
+    symbol {
+      name: "nparkf-outline-s"
+      priority: 16057
+      min_distance: 12
     }
     apply_if: "name"
   }
@@ -39033,13 +39026,6 @@ cont {
       color: 2631706
       priority: -15991
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-      }
-      priority: 15009
-    }
   }
   element {
     scale: 16
@@ -39529,14 +39515,6 @@ cont {
       color: 1317888
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39670,14 +39648,6 @@ cont {
       color: 1317888
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39686,14 +39656,6 @@ cont {
       color: 1317888
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -39718,14 +39680,6 @@ cont {
       color: 1317888
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -40367,14 +40321,6 @@ cont {
       color: 1317888
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -40632,14 +40578,6 @@ cont {
       color: 1317888
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -40897,14 +40835,6 @@ cont {
       color: 1317888
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -41162,14 +41092,6 @@ cont {
       color: 1317888
       priority: -15933
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15067
-    }
     apply_if: "!name"
   }
   element {
@@ -78311,20 +78233,9 @@ cont {
   name: "railway-subway_entrance"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16913
     }
   }
   element {
@@ -78407,20 +78318,9 @@ cont {
   name: "railway-subway_entrance-adana"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-adana-s"
+      priority: 16913
     }
   }
   element {
@@ -78503,20 +78403,9 @@ cont {
   name: "railway-subway_entrance-algiers"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-algeria-s"
+      priority: 16913
     }
   }
   element {
@@ -78599,20 +78488,9 @@ cont {
   name: "railway-subway_entrance-almaty"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-almaty-s"
+      priority: 16913
     }
   }
   element {
@@ -78695,20 +78573,9 @@ cont {
   name: "railway-subway_entrance-amsterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-amsterdam-s"
+      priority: 16913
     }
   }
   element {
@@ -78791,20 +78658,9 @@ cont {
   name: "railway-subway_entrance-ankara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ankara-s"
+      priority: 16913
     }
   }
   element {
@@ -78887,20 +78743,9 @@ cont {
   name: "railway-subway_entrance-athens"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-athens-s"
+      priority: 16913
     }
   }
   element {
@@ -78983,20 +78828,9 @@ cont {
   name: "railway-subway_entrance-baku"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-baku-s"
+      priority: 16913
     }
   }
   element {
@@ -79079,20 +78913,9 @@ cont {
   name: "railway-subway_entrance-bangkok"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bangkok-s"
+      priority: 16913
     }
   }
   element {
@@ -79175,20 +78998,9 @@ cont {
   name: "railway-subway_entrance-barcelona"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-barcelona-s"
+      priority: 16913
     }
   }
   element {
@@ -79271,20 +79083,9 @@ cont {
   name: "railway-subway_entrance-beijing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-beijing-s"
+      priority: 16913
     }
   }
   element {
@@ -79367,20 +79168,9 @@ cont {
   name: "railway-subway_entrance-bengalore"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bengaluru-s"
+      priority: 16913
     }
   }
   element {
@@ -79463,20 +79253,9 @@ cont {
   name: "railway-subway_entrance-berlin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -79559,20 +79338,9 @@ cont {
   name: "railway-subway_entrance-bilbao"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bilbao-s"
+      priority: 16913
     }
   }
   element {
@@ -79655,20 +79423,9 @@ cont {
   name: "railway-subway_entrance-brasilia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brasilia-s"
+      priority: 16913
     }
   }
   element {
@@ -79751,20 +79508,9 @@ cont {
   name: "railway-subway_entrance-brescia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brescia-s"
+      priority: 16913
     }
   }
   element {
@@ -79847,20 +79593,9 @@ cont {
   name: "railway-subway_entrance-brussels"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-brussel-s"
+      priority: 16913
     }
   }
   element {
@@ -79943,20 +79678,9 @@ cont {
   name: "railway-subway_entrance-bucharest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bucharest-s"
+      priority: 16913
     }
   }
   element {
@@ -80039,20 +79763,9 @@ cont {
   name: "railway-subway_entrance-budapest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-budapest-s"
+      priority: 16913
     }
   }
   element {
@@ -80135,20 +79848,9 @@ cont {
   name: "railway-subway_entrance-buenos_aires"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-buenosaires-s"
+      priority: 16913
     }
   }
   element {
@@ -80231,20 +79933,9 @@ cont {
   name: "railway-subway_entrance-bursa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-bursaray-s"
+      priority: 16913
     }
   }
   element {
@@ -80327,20 +80018,9 @@ cont {
   name: "railway-subway_entrance-cairo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-cairo-s"
+      priority: 16913
     }
   }
   element {
@@ -80423,20 +80103,9 @@ cont {
   name: "railway-subway_entrance-caracas"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-caracas-s"
+      priority: 16913
     }
   }
   element {
@@ -80519,20 +80188,9 @@ cont {
   name: "railway-subway_entrance-catania"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-catania-s"
+      priority: 16913
     }
   }
   element {
@@ -80615,20 +80273,9 @@ cont {
   name: "railway-subway_entrance-changchun"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-changchun-s"
+      priority: 16913
     }
   }
   element {
@@ -80711,20 +80358,9 @@ cont {
   name: "railway-subway_entrance-chengdu"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chengdu-s"
+      priority: 16913
     }
   }
   element {
@@ -80807,20 +80443,9 @@ cont {
   name: "railway-subway_entrance-chicago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chicago-s"
+      priority: 16913
     }
   }
   element {
@@ -80903,20 +80528,9 @@ cont {
   name: "railway-subway_entrance-chongqing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-chongqing-s"
+      priority: 16913
     }
   }
   element {
@@ -80999,20 +80613,9 @@ cont {
   name: "railway-subway_entrance-dalian"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dalian-s"
+      priority: 16913
     }
   }
   element {
@@ -81095,20 +80698,9 @@ cont {
   name: "railway-subway_entrance-delhi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-delhi-s"
+      priority: 16913
     }
   }
   element {
@@ -81191,20 +80783,9 @@ cont {
   name: "railway-subway_entrance-dnepro"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dnepro-s"
+      priority: 16913
     }
   }
   element {
@@ -81287,20 +80868,9 @@ cont {
   name: "railway-subway_entrance-dubai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-dubai-s"
+      priority: 16913
     }
   }
   element {
@@ -81383,20 +80953,9 @@ cont {
   name: "railway-subway_entrance-ekb"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ekb-s"
+      priority: 16913
     }
   }
   element {
@@ -81479,20 +81038,9 @@ cont {
   name: "railway-subway_entrance-fukuoka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-fukuoka-s"
+      priority: 16913
     }
   }
   element {
@@ -81575,20 +81123,9 @@ cont {
   name: "railway-subway_entrance-glasgow"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-glasgow-s"
+      priority: 16913
     }
   }
   element {
@@ -81671,20 +81208,9 @@ cont {
   name: "railway-subway_entrance-guangzhou"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-guangzhou-s"
+      priority: 16913
     }
   }
   element {
@@ -81767,20 +81293,9 @@ cont {
   name: "railway-subway_entrance-hamburg"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -81863,20 +81378,9 @@ cont {
   name: "railway-subway_entrance-helsinki"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-helsinki-s"
+      priority: 16913
     }
   }
   element {
@@ -81959,20 +81463,9 @@ cont {
   name: "railway-subway_entrance-hiroshima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-hirosima-s"
+      priority: 16913
     }
   }
   element {
@@ -82055,20 +81548,9 @@ cont {
   name: "railway-subway_entrance-isfahan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-isfahan-s"
+      priority: 16913
     }
   }
   element {
@@ -82151,20 +81633,9 @@ cont {
   name: "railway-subway_entrance-istanbul"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-istanbul-s"
+      priority: 16913
     }
   }
   element {
@@ -82247,20 +81718,9 @@ cont {
   name: "railway-subway_entrance-izmir"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-izmir-s"
+      priority: 16913
     }
   }
   element {
@@ -82343,20 +81803,9 @@ cont {
   name: "railway-subway_entrance-kazan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kazan-s"
+      priority: 16913
     }
   }
   element {
@@ -82439,20 +81888,9 @@ cont {
   name: "railway-subway_entrance-kharkiv"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kharkiv-s"
+      priority: 16913
     }
   }
   element {
@@ -82535,20 +81973,9 @@ cont {
   name: "railway-subway_entrance-kiev"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kiev-m"
+      priority: 16913
     }
   }
   element {
@@ -82631,20 +82058,9 @@ cont {
   name: "railway-subway_entrance-kobe"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kobe-s"
+      priority: 16913
     }
   }
   element {
@@ -82727,20 +82143,9 @@ cont {
   name: "railway-subway_entrance-kolkata"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kolkata-s"
+      priority: 16913
     }
   }
   element {
@@ -82823,20 +82228,9 @@ cont {
   name: "railway-subway_entrance-kunming"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kunming-s"
+      priority: 16913
     }
   }
   element {
@@ -82919,20 +82313,9 @@ cont {
   name: "railway-subway_entrance-kyoto"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-kyoto-s"
+      priority: 16913
     }
   }
   element {
@@ -83015,20 +82398,9 @@ cont {
   name: "railway-subway_entrance-la"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-losangeles-s"
+      priority: 16913
     }
   }
   element {
@@ -83111,20 +82483,9 @@ cont {
   name: "railway-subway_entrance-lausanne"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lausanne-s"
+      priority: 16913
     }
   }
   element {
@@ -83207,20 +82568,9 @@ cont {
   name: "railway-subway_entrance-lille"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lille-s"
+      priority: 16913
     }
   }
   element {
@@ -83303,20 +82653,9 @@ cont {
   name: "railway-subway_entrance-lima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lima-s"
+      priority: 16913
     }
   }
   element {
@@ -83399,20 +82738,9 @@ cont {
   name: "railway-subway_entrance-lisboa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lisboa-s"
+      priority: 16913
     }
   }
   element {
@@ -83495,20 +82823,9 @@ cont {
   name: "railway-subway_entrance-london"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-london-s"
+      priority: 16913
     }
   }
   element {
@@ -83591,20 +82908,9 @@ cont {
   name: "railway-subway_entrance-lyon"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-lyon-s"
+      priority: 16913
     }
   }
   element {
@@ -83687,20 +82993,9 @@ cont {
   name: "railway-subway_entrance-madrid"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-madrid-s"
+      priority: 16913
     }
   }
   element {
@@ -83783,20 +83078,9 @@ cont {
   name: "railway-subway_entrance-malaga"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-malaga-s"
+      priority: 16913
     }
   }
   element {
@@ -83879,20 +83163,9 @@ cont {
   name: "railway-subway_entrance-manila"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-manila-s"
+      priority: 16913
     }
   }
   element {
@@ -83975,20 +83248,9 @@ cont {
   name: "railway-subway_entrance-maracaibo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-maracaibo-s"
+      priority: 16913
     }
   }
   element {
@@ -84071,20 +83333,9 @@ cont {
   name: "railway-subway_entrance-mashhad"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mashhad-s"
+      priority: 16913
     }
   }
   element {
@@ -84167,20 +83418,9 @@ cont {
   name: "railway-subway_entrance-mecca"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mecca-s"
+      priority: 16913
     }
   }
   element {
@@ -84263,20 +83503,9 @@ cont {
   name: "railway-subway_entrance-medellin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-medellin-s"
+      priority: 16913
     }
   }
   element {
@@ -84359,20 +83588,9 @@ cont {
   name: "railway-subway_entrance-mexico"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-mexico-s"
+      priority: 16913
     }
   }
   element {
@@ -84455,20 +83673,9 @@ cont {
   name: "railway-subway_entrance-milan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-milan-s"
+      priority: 16913
     }
   }
   element {
@@ -84551,20 +83758,9 @@ cont {
   name: "railway-subway_entrance-minsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-minsk-m"
+      priority: 16913
     }
   }
   element {
@@ -84647,20 +83843,9 @@ cont {
   name: "railway-subway_entrance-montreal"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-montreal-s"
+      priority: 16913
     }
   }
   element {
@@ -84871,20 +84056,9 @@ cont {
   name: "railway-subway_entrance-munchen"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16913
     }
   }
   element {
@@ -84967,20 +84141,9 @@ cont {
   name: "railway-subway_entrance-nagoya"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-nagoya-s"
+      priority: 16913
     }
   }
   element {
@@ -85063,20 +84226,9 @@ cont {
   name: "railway-subway_entrance-newyork"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-newyork-s"
+      priority: 16913
     }
   }
   element {
@@ -85159,20 +84311,9 @@ cont {
   name: "railway-subway_entrance-nnov"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-nnov-s"
+      priority: 16913
     }
   }
   element {
@@ -85255,20 +84396,9 @@ cont {
   name: "railway-subway_entrance-novosibirsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-novosibirsk-s"
+      priority: 16913
     }
   }
   element {
@@ -85351,20 +84481,9 @@ cont {
   name: "railway-subway_entrance-osaka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-osaka-s"
+      priority: 16913
     }
   }
   element {
@@ -85447,20 +84566,9 @@ cont {
   name: "railway-subway_entrance-oslo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-oslo-s"
+      priority: 16913
     }
   }
   element {
@@ -85543,20 +84651,9 @@ cont {
   name: "railway-subway_entrance-palma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-palma-s"
+      priority: 16913
     }
   }
   element {
@@ -85639,20 +84736,9 @@ cont {
   name: "railway-subway_entrance-panama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-panama-s"
+      priority: 16913
     }
   }
   element {
@@ -85735,20 +84821,9 @@ cont {
   name: "railway-subway_entrance-paris"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-paris-s"
+      priority: 16913
     }
   }
   element {
@@ -85831,20 +84906,9 @@ cont {
   name: "railway-subway_entrance-philadelphia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-philadelphia-s"
+      priority: 16913
     }
   }
   element {
@@ -85927,20 +84991,9 @@ cont {
   name: "railway-subway_entrance-pyongyang"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-pyongyang-s"
+      priority: 16913
     }
   }
   element {
@@ -86023,20 +85076,9 @@ cont {
   name: "railway-subway_entrance-rennes"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rennes-s"
+      priority: 16913
     }
   }
   element {
@@ -86119,20 +85161,9 @@ cont {
   name: "railway-subway_entrance-rio"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-riodejaneiro-s"
+      priority: 16913
     }
   }
   element {
@@ -86215,20 +85246,9 @@ cont {
   name: "railway-subway_entrance-roma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rome-m"
+      priority: 16913
     }
   }
   element {
@@ -86311,20 +85331,9 @@ cont {
   name: "railway-subway_entrance-rotterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-rotterdam-s"
+      priority: 16913
     }
   }
   element {
@@ -86407,20 +85416,9 @@ cont {
   name: "railway-subway_entrance-samara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-samara-s"
+      priority: 16913
     }
   }
   element {
@@ -86503,20 +85501,9 @@ cont {
   name: "railway-subway_entrance-santiago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-santiago-s"
+      priority: 16913
     }
   }
   element {
@@ -86599,20 +85586,9 @@ cont {
   name: "railway-subway_entrance-santo_domingo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-santodomingo-s"
+      priority: 16913
     }
   }
   element {
@@ -86695,20 +85671,9 @@ cont {
   name: "railway-subway_entrance-saopaulo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-saopaulo-s"
+      priority: 16913
     }
   }
   element {
@@ -86791,20 +85756,9 @@ cont {
   name: "railway-subway_entrance-sapporo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sapporo-s"
+      priority: 16913
     }
   }
   element {
@@ -86887,20 +85841,9 @@ cont {
   name: "railway-subway_entrance-sendai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sendai-s"
+      priority: 16913
     }
   }
   element {
@@ -86983,20 +85926,9 @@ cont {
   name: "railway-subway_entrance-sf"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sanfrancisco-s"
+      priority: 16913
     }
   }
   element {
@@ -87079,20 +86011,9 @@ cont {
   name: "railway-subway_entrance-shanghai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-shanghai-s"
+      priority: 16913
     }
   }
   element {
@@ -87175,20 +86096,9 @@ cont {
   name: "railway-subway_entrance-shiraz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-shiraz-s"
+      priority: 16913
     }
   }
   element {
@@ -87271,20 +86181,9 @@ cont {
   name: "railway-subway_entrance-sofia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-sofia-s"
+      priority: 16913
     }
   }
   element {
@@ -87365,6 +86264,13 @@ cont {
 }
 cont {
   name: "railway-subway_entrance-spb"
+  element {
+    scale: 15
+    symbol {
+      name: "subway-spb-s"
+      priority: 16913
+    }
+  }
   element {
     scale: 16
     symbol {
@@ -87470,20 +86376,9 @@ cont {
   name: "railway-subway_entrance-stockholm"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-stockholm-s"
+      priority: 16913
     }
   }
   element {
@@ -87566,20 +86461,9 @@ cont {
   name: "railway-subway_entrance-tabriz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tabriz-s"
+      priority: 16913
     }
   }
   element {
@@ -87662,20 +86546,9 @@ cont {
   name: "railway-subway_entrance-taipei"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-taipei-s"
+      priority: 16913
     }
   }
   element {
@@ -87758,20 +86631,9 @@ cont {
   name: "railway-subway_entrance-taoyuan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-taoyuan-s"
+      priority: 16913
     }
   }
   element {
@@ -87854,20 +86716,9 @@ cont {
   name: "railway-subway_entrance-tashkent"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tashkent-s"
+      priority: 16913
     }
   }
   element {
@@ -87950,20 +86801,9 @@ cont {
   name: "railway-subway_entrance-tbilisi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tbilisi-s"
+      priority: 16913
     }
   }
   element {
@@ -88046,20 +86886,9 @@ cont {
   name: "railway-subway_entrance-tianjin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tianjin-s"
+      priority: 16913
     }
   }
   element {
@@ -88142,20 +86971,9 @@ cont {
   name: "railway-subway_entrance-tokyo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-tokyo-s"
+      priority: 16913
     }
   }
   element {
@@ -88238,20 +87056,9 @@ cont {
   name: "railway-subway_entrance-valencia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-valencia-s"
+      priority: 16913
     }
   }
   element {
@@ -88334,20 +87141,9 @@ cont {
   name: "railway-subway_entrance-vienna"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-vienna-s"
+      priority: 16913
     }
   }
   element {
@@ -88430,20 +87226,9 @@ cont {
   name: "railway-subway_entrance-warszawa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-warszawa-s"
+      priority: 16913
     }
   }
   element {
@@ -88526,20 +87311,9 @@ cont {
   name: "railway-subway_entrance-washington"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-washington-s"
+      priority: 16913
     }
   }
   element {
@@ -88622,20 +87396,9 @@ cont {
   name: "railway-subway_entrance-wuhan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-wuhan-s"
+      priority: 16913
     }
   }
   element {
@@ -88718,20 +87481,9 @@ cont {
   name: "railway-subway_entrance-yerevan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-yerevan-s"
+      priority: 16913
     }
   }
   element {
@@ -88814,20 +87566,9 @@ cont {
   name: "railway-subway_entrance-yokohama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15913
+    symbol {
+      name: "subway-yokohama-s"
+      priority: 16913
     }
   }
   element {
@@ -89889,28 +88630,6 @@ cont {
 }
 cont {
   name: "shop"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -89948,28 +88667,6 @@ cont {
 }
 cont {
   name: "shop-agrarian"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90078,28 +88775,6 @@ cont {
 }
 cont {
   name: "shop-antiques"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90137,28 +88812,6 @@ cont {
 }
 cont {
   name: "shop-appliance"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90196,28 +88849,6 @@ cont {
 }
 cont {
   name: "shop-art"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90255,28 +88886,6 @@ cont {
 }
 cont {
   name: "shop-baby_goods"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90314,28 +88923,6 @@ cont {
 }
 cont {
   name: "shop-bag"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90444,28 +89031,6 @@ cont {
 }
 cont {
   name: "shop-bathroom_furnishing"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90574,28 +89139,6 @@ cont {
 }
 cont {
   name: "shop-bed"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -90917,28 +89460,6 @@ cont {
 }
 cont {
   name: "shop-boutique"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91047,28 +89568,6 @@ cont {
 }
 cont {
   name: "shop-cannabis"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91333,7 +89832,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91350,7 +89849,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91367,7 +89866,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91384,7 +89883,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
   element {
@@ -91401,7 +89900,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15644
     }
   }
 }
@@ -91478,28 +89977,6 @@ cont {
 }
 cont {
   name: "shop-carpet"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91608,28 +90085,6 @@ cont {
 }
 cont {
   name: "shop-cheese"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -91880,28 +90335,6 @@ cont {
 }
 cont {
   name: "shop-coffee"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92294,28 +90727,6 @@ cont {
 }
 cont {
   name: "shop-craft"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92353,28 +90764,6 @@ cont {
 }
 cont {
   name: "shop-curtain"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92412,28 +90801,6 @@ cont {
 }
 cont {
   name: "shop-dairy"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -92755,28 +91122,6 @@ cont {
 }
 cont {
   name: "shop-electrical"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93098,28 +91443,6 @@ cont {
 }
 cont {
   name: "shop-fashion_accessories"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93157,28 +91480,6 @@ cont {
 }
 cont {
   name: "shop-fishing"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93500,28 +91801,6 @@ cont {
 }
 cont {
   name: "shop-gas"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -93985,28 +92264,6 @@ cont {
 }
 cont {
   name: "shop-herbalist"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94044,28 +92301,6 @@ cont {
 }
 cont {
   name: "shop-hifi"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94174,28 +92409,6 @@ cont {
 }
 cont {
   name: "shop-interior_decoration"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94517,28 +92730,6 @@ cont {
 }
 cont {
   name: "shop-lottery"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94681,32 +92872,12 @@ cont {
 }
 cont {
   name: "shop-massage"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15586
+      min_distance: 24
     }
   }
   element {
@@ -94714,7 +92885,7 @@ cont {
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -94731,7 +92902,7 @@ cont {
     symbol {
       name: "sauna-m"
       priority: 16586
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -94746,28 +92917,6 @@ cont {
 }
 cont {
   name: "shop-medical_supply"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -94876,23 +93025,12 @@ cont {
 }
 cont {
   name: "shop-money_lender"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -94909,7 +93047,7 @@ cont {
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -94926,7 +93064,7 @@ cont {
     symbol {
       name: "bank-m"
       priority: 16586
-      min_distance: 20
+      min_distance: 24
     }
     caption {
       primary {
@@ -95012,28 +93150,6 @@ cont {
 }
 cont {
   name: "shop-motorcycle_repair"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95213,17 +93329,6 @@ cont {
 }
 cont {
   name: "shop-newsagent"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 17
     symbol {
@@ -95231,15 +93336,6 @@ cont {
       priority: 16586
       min_distance: 24
     }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15586
-    }
   }
   element {
     scale: 18
@@ -95278,28 +93374,6 @@ cont {
 }
 cont {
   name: "shop-nutrition_supplements"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95479,28 +93553,6 @@ cont {
 }
 cont {
   name: "shop-outpost"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95538,28 +93590,6 @@ cont {
 }
 cont {
   name: "shop-paint"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95668,23 +93698,12 @@ cont {
 }
 cont {
   name: "shop-pawnbroker"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15625
-    }
-  }
   element {
     scale: 17
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -95701,7 +93720,7 @@ cont {
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -95718,7 +93737,7 @@ cont {
     symbol {
       name: "bookmaker-m"
       priority: 16625
-      min_distance: 10
+      min_distance: 24
     }
     caption {
       primary {
@@ -95733,28 +93752,6 @@ cont {
 }
 cont {
   name: "shop-perfumery"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -95863,28 +93860,6 @@ cont {
 }
 cont {
   name: "shop-pet_grooming"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96350,11 +94325,17 @@ cont {
   name: "shop-stationery"
   element {
     scale: 16
+    symbol {
+      name: "stationery_shop-m"
+      priority: 16586
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
       priority: 15586
     }
@@ -96413,28 +94394,6 @@ cont {
 }
 cont {
   name: "shop-storage_rental"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96614,28 +94573,6 @@ cont {
 }
 cont {
   name: "shop-tea"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96744,28 +94681,6 @@ cont {
 }
 cont {
   name: "shop-tobacco"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96874,28 +94789,6 @@ cont {
 }
 cont {
   name: "shop-trade"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -96933,28 +94826,6 @@ cont {
 }
 cont {
   name: "shop-travel_agency"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97064,23 +94935,18 @@ cont {
 cont {
   name: "shop-variety_store"
   element {
-    scale: 16
+    scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
+        is_optional: true
       }
       priority: 15586
     }
@@ -97090,11 +94956,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16586
-      min_distance: 8
+      min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -97107,11 +94973,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16586
-      min_distance: 8
+      min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 1
         is_optional: true
@@ -97264,28 +95130,6 @@ cont {
 }
 cont {
   name: "shop-watches"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -97323,28 +95167,6 @@ cont {
 }
 cont {
   name: "shop-wholesale"
-  element {
-    scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
-  element {
-    scale: 17
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-      }
-      priority: 15586
-    }
-  }
   element {
     scale: 18
     symbol {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 8df6918c0a..ea485b9528 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 94ef493e7f..2b68149b11 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -3396,11 +3396,17 @@ cont {
   name: "amenity-theatre"
   element {
     scale: 15
+    symbol {
+      name: "theatre-m"
+      priority: 16734
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15734
     }
@@ -60882,29 +60888,24 @@ cont {
   name: "railway-subway_entrance"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16000
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
+        is_optional: true
       }
       secondary {
         height: 10
@@ -60912,17 +60913,24 @@ cont {
         stroke_color: 1728053247
         offset_y: 1
         text: "int_name"
+        is_optional: true
       }
       priority: 15000
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
+        is_optional: true
       }
       secondary {
         height: 10
@@ -60930,17 +60938,24 @@ cont {
         stroke_color: 1728053247
         offset_y: 1
         text: "int_name"
+        is_optional: true
       }
       priority: 15000
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
+        is_optional: true
       }
       secondary {
         height: 10
@@ -60948,6 +60963,7 @@ cont {
         stroke_color: 1728053247
         offset_y: 1
         text: "int_name"
+        is_optional: true
       }
       priority: 15000
     }
@@ -60957,20 +60973,9 @@ cont {
   name: "railway-subway_entrance-adana"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-adana-s"
+      priority: 16000
     }
   }
   element {
@@ -60984,6 +60989,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61008,6 +61014,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61032,6 +61039,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61050,20 +61058,9 @@ cont {
   name: "railway-subway_entrance-algiers"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-algeria-s"
+      priority: 16000
     }
   }
   element {
@@ -61077,6 +61074,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61101,6 +61099,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61125,6 +61124,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61143,20 +61143,9 @@ cont {
   name: "railway-subway_entrance-almaty"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-almaty-s"
+      priority: 16000
     }
   }
   element {
@@ -61170,6 +61159,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61194,6 +61184,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61218,6 +61209,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61236,20 +61228,9 @@ cont {
   name: "railway-subway_entrance-amsterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-amsterdam-s"
+      priority: 16000
     }
   }
   element {
@@ -61263,6 +61244,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61287,6 +61269,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61311,6 +61294,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61329,20 +61313,9 @@ cont {
   name: "railway-subway_entrance-ankara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ankara-s"
+      priority: 16000
     }
   }
   element {
@@ -61356,6 +61329,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61380,6 +61354,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61404,6 +61379,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61422,20 +61398,9 @@ cont {
   name: "railway-subway_entrance-athens"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-athens-s"
+      priority: 16000
     }
   }
   element {
@@ -61449,6 +61414,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61473,6 +61439,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61497,6 +61464,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61515,20 +61483,9 @@ cont {
   name: "railway-subway_entrance-baku"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-baku-s"
+      priority: 16000
     }
   }
   element {
@@ -61542,6 +61499,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61566,6 +61524,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61590,6 +61549,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61608,20 +61568,9 @@ cont {
   name: "railway-subway_entrance-bangkok"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bangkok-s"
+      priority: 16000
     }
   }
   element {
@@ -61635,6 +61584,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61659,6 +61609,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61683,6 +61634,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61701,20 +61653,9 @@ cont {
   name: "railway-subway_entrance-barcelona"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-barcelona-s"
+      priority: 16000
     }
   }
   element {
@@ -61728,6 +61669,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61752,6 +61694,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61776,6 +61719,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61794,20 +61738,9 @@ cont {
   name: "railway-subway_entrance-beijing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-beijing-s"
+      priority: 16000
     }
   }
   element {
@@ -61821,6 +61754,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61845,6 +61779,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61869,6 +61804,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61887,20 +61823,9 @@ cont {
   name: "railway-subway_entrance-bengalore"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bengaluru-s"
+      priority: 16000
     }
   }
   element {
@@ -61914,6 +61839,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61938,6 +61864,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61962,6 +61889,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61980,20 +61908,9 @@ cont {
   name: "railway-subway_entrance-berlin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16000
     }
   }
   element {
@@ -62007,6 +61924,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62031,6 +61949,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62055,6 +61974,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62073,20 +61993,9 @@ cont {
   name: "railway-subway_entrance-bilbao"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bilbao-s"
+      priority: 16000
     }
   }
   element {
@@ -62100,6 +62009,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62124,6 +62034,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62148,6 +62059,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62166,20 +62078,9 @@ cont {
   name: "railway-subway_entrance-brasilia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-brasilia-s"
+      priority: 16000
     }
   }
   element {
@@ -62193,6 +62094,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62217,6 +62119,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62241,6 +62144,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62259,20 +62163,9 @@ cont {
   name: "railway-subway_entrance-brescia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-brescia-s"
+      priority: 16000
     }
   }
   element {
@@ -62286,6 +62179,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62310,6 +62204,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62334,6 +62229,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62352,20 +62248,9 @@ cont {
   name: "railway-subway_entrance-brussels"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-brussel-s"
+      priority: 16000
     }
   }
   element {
@@ -62379,6 +62264,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62403,6 +62289,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62427,6 +62314,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62445,20 +62333,9 @@ cont {
   name: "railway-subway_entrance-bucharest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bucharest-s"
+      priority: 16000
     }
   }
   element {
@@ -62472,6 +62349,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62496,6 +62374,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62520,6 +62399,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62538,20 +62418,9 @@ cont {
   name: "railway-subway_entrance-budapest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-budapest-s"
+      priority: 16000
     }
   }
   element {
@@ -62565,6 +62434,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62589,6 +62459,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62613,6 +62484,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62631,20 +62503,9 @@ cont {
   name: "railway-subway_entrance-buenos_aires"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-buenosaires-s"
+      priority: 16000
     }
   }
   element {
@@ -62658,6 +62519,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62682,6 +62544,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62706,6 +62569,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62724,20 +62588,9 @@ cont {
   name: "railway-subway_entrance-bursa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bursaray-s"
+      priority: 16000
     }
   }
   element {
@@ -62751,6 +62604,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62775,6 +62629,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62799,6 +62654,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62817,20 +62673,9 @@ cont {
   name: "railway-subway_entrance-cairo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-cairo-s"
+      priority: 16000
     }
   }
   element {
@@ -62844,6 +62689,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62868,6 +62714,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62892,6 +62739,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62910,20 +62758,9 @@ cont {
   name: "railway-subway_entrance-caracas"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-caracas-s"
+      priority: 16000
     }
   }
   element {
@@ -62937,6 +62774,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62961,6 +62799,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62985,6 +62824,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63003,20 +62843,9 @@ cont {
   name: "railway-subway_entrance-catania"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-catania-s"
+      priority: 16000
     }
   }
   element {
@@ -63030,6 +62859,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63054,6 +62884,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63078,6 +62909,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63096,20 +62928,9 @@ cont {
   name: "railway-subway_entrance-changchun"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-changchun-s"
+      priority: 16000
     }
   }
   element {
@@ -63123,6 +62944,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63147,6 +62969,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63171,6 +62994,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63189,20 +63013,9 @@ cont {
   name: "railway-subway_entrance-chengdu"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-chengdu-s"
+      priority: 16000
     }
   }
   element {
@@ -63216,6 +63029,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63240,6 +63054,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63264,6 +63079,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63282,20 +63098,9 @@ cont {
   name: "railway-subway_entrance-chicago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-chicago-s"
+      priority: 16000
     }
   }
   element {
@@ -63309,6 +63114,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63333,6 +63139,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63357,6 +63164,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63375,20 +63183,9 @@ cont {
   name: "railway-subway_entrance-chongqing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-chongqing-s"
+      priority: 16000
     }
   }
   element {
@@ -63402,6 +63199,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63426,6 +63224,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63450,6 +63249,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63468,20 +63268,9 @@ cont {
   name: "railway-subway_entrance-dalian"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-dalian-s"
+      priority: 16000
     }
   }
   element {
@@ -63495,6 +63284,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63519,6 +63309,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63543,6 +63334,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63561,20 +63353,9 @@ cont {
   name: "railway-subway_entrance-delhi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-delhi-s"
+      priority: 16000
     }
   }
   element {
@@ -63588,6 +63369,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63612,6 +63394,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63636,6 +63419,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63654,20 +63438,9 @@ cont {
   name: "railway-subway_entrance-dnepro"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-dnepro-s"
+      priority: 16000
     }
   }
   element {
@@ -63681,6 +63454,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63705,6 +63479,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63729,6 +63504,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63747,20 +63523,9 @@ cont {
   name: "railway-subway_entrance-dubai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-dubai-s"
+      priority: 16000
     }
   }
   element {
@@ -63774,6 +63539,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63798,6 +63564,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63822,6 +63589,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63840,20 +63608,9 @@ cont {
   name: "railway-subway_entrance-ekb"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ekb-s"
+      priority: 16000
     }
   }
   element {
@@ -63867,6 +63624,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63891,6 +63649,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63915,6 +63674,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63933,20 +63693,9 @@ cont {
   name: "railway-subway_entrance-fukuoka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-fukuoka-s"
+      priority: 16000
     }
   }
   element {
@@ -63960,6 +63709,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63984,6 +63734,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64008,6 +63759,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64026,20 +63778,9 @@ cont {
   name: "railway-subway_entrance-glasgow"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-glasgow-s"
+      priority: 16000
     }
   }
   element {
@@ -64053,6 +63794,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64077,6 +63819,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64101,6 +63844,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64119,20 +63863,9 @@ cont {
   name: "railway-subway_entrance-guangzhou"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-guangzhou-s"
+      priority: 16000
     }
   }
   element {
@@ -64146,6 +63879,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64170,6 +63904,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64194,6 +63929,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64212,20 +63948,9 @@ cont {
   name: "railway-subway_entrance-hamburg"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16000
     }
   }
   element {
@@ -64239,6 +63964,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64263,6 +63989,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64287,6 +64014,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64305,20 +64033,9 @@ cont {
   name: "railway-subway_entrance-helsinki"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-helsinki-s"
+      priority: 16000
     }
   }
   element {
@@ -64332,6 +64049,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64356,6 +64074,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64380,6 +64099,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64398,20 +64118,9 @@ cont {
   name: "railway-subway_entrance-hiroshima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-hirosima-s"
+      priority: 16000
     }
   }
   element {
@@ -64425,6 +64134,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64449,6 +64159,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64473,6 +64184,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64491,20 +64203,9 @@ cont {
   name: "railway-subway_entrance-isfahan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-isfahan-s"
+      priority: 16000
     }
   }
   element {
@@ -64518,6 +64219,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64542,6 +64244,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64566,6 +64269,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64584,20 +64288,9 @@ cont {
   name: "railway-subway_entrance-istanbul"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-istanbul-s"
+      priority: 16000
     }
   }
   element {
@@ -64611,6 +64304,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64635,6 +64329,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64659,6 +64354,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64677,20 +64373,9 @@ cont {
   name: "railway-subway_entrance-izmir"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-izmir-s"
+      priority: 16000
     }
   }
   element {
@@ -64704,6 +64389,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64728,6 +64414,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64752,6 +64439,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64770,20 +64458,9 @@ cont {
   name: "railway-subway_entrance-kazan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kazan-s"
+      priority: 16000
     }
   }
   element {
@@ -64797,6 +64474,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64821,6 +64499,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64845,6 +64524,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64863,20 +64543,9 @@ cont {
   name: "railway-subway_entrance-kharkiv"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kharkiv-s"
+      priority: 16000
     }
   }
   element {
@@ -64890,6 +64559,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64914,6 +64584,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64938,6 +64609,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64956,20 +64628,9 @@ cont {
   name: "railway-subway_entrance-kiev"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kiev-m"
+      priority: 16000
     }
   }
   element {
@@ -64983,6 +64644,7 @@ cont {
         height: 13
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65007,6 +64669,7 @@ cont {
         height: 13
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65031,6 +64694,7 @@ cont {
         height: 13
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65049,20 +64713,9 @@ cont {
   name: "railway-subway_entrance-kobe"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kobe-s"
+      priority: 16000
     }
   }
   element {
@@ -65076,6 +64729,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65100,6 +64754,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65124,6 +64779,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65142,20 +64798,9 @@ cont {
   name: "railway-subway_entrance-kolkata"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kolkata-s"
+      priority: 16000
     }
   }
   element {
@@ -65169,6 +64814,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65193,6 +64839,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65217,6 +64864,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65235,20 +64883,9 @@ cont {
   name: "railway-subway_entrance-kunming"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kunming-s"
+      priority: 16000
     }
   }
   element {
@@ -65262,6 +64899,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65286,6 +64924,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65310,6 +64949,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65328,20 +64968,9 @@ cont {
   name: "railway-subway_entrance-kyoto"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kyoto-s"
+      priority: 16000
     }
   }
   element {
@@ -65355,6 +64984,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65379,6 +65009,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65403,6 +65034,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65421,20 +65053,9 @@ cont {
   name: "railway-subway_entrance-la"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-losangeles-s"
+      priority: 16000
     }
   }
   element {
@@ -65448,6 +65069,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65472,6 +65094,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65496,6 +65119,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65514,20 +65138,9 @@ cont {
   name: "railway-subway_entrance-lausanne"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lausanne-s"
+      priority: 16000
     }
   }
   element {
@@ -65541,6 +65154,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65565,6 +65179,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65589,6 +65204,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65607,20 +65223,9 @@ cont {
   name: "railway-subway_entrance-lille"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lille-s"
+      priority: 16000
     }
   }
   element {
@@ -65634,6 +65239,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65658,6 +65264,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65682,6 +65289,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65700,20 +65308,9 @@ cont {
   name: "railway-subway_entrance-lima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lima-s"
+      priority: 16000
     }
   }
   element {
@@ -65727,6 +65324,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65751,6 +65349,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65775,6 +65374,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65793,20 +65393,9 @@ cont {
   name: "railway-subway_entrance-lisboa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lisboa-s"
+      priority: 16000
     }
   }
   element {
@@ -65820,6 +65409,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65844,6 +65434,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65868,6 +65459,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65886,20 +65478,9 @@ cont {
   name: "railway-subway_entrance-london"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-london-s"
+      priority: 16000
     }
   }
   element {
@@ -65913,6 +65494,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65937,6 +65519,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65961,6 +65544,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65979,20 +65563,9 @@ cont {
   name: "railway-subway_entrance-lyon"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lyon-s"
+      priority: 16000
     }
   }
   element {
@@ -66006,6 +65579,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66030,6 +65604,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66054,6 +65629,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66072,20 +65648,9 @@ cont {
   name: "railway-subway_entrance-madrid"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-madrid-s"
+      priority: 16000
     }
   }
   element {
@@ -66099,6 +65664,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66123,6 +65689,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66147,6 +65714,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66165,20 +65733,9 @@ cont {
   name: "railway-subway_entrance-malaga"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-malaga-s"
+      priority: 16000
     }
   }
   element {
@@ -66192,6 +65749,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66216,6 +65774,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66240,6 +65799,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66258,20 +65818,9 @@ cont {
   name: "railway-subway_entrance-manila"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-manila-s"
+      priority: 16000
     }
   }
   element {
@@ -66285,6 +65834,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66309,6 +65859,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66333,6 +65884,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66351,20 +65903,9 @@ cont {
   name: "railway-subway_entrance-maracaibo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-maracaibo-s"
+      priority: 16000
     }
   }
   element {
@@ -66378,6 +65919,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66402,6 +65944,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66426,6 +65969,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66444,20 +65988,9 @@ cont {
   name: "railway-subway_entrance-mashhad"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-mashhad-s"
+      priority: 16000
     }
   }
   element {
@@ -66471,6 +66004,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66495,6 +66029,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66519,6 +66054,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66537,20 +66073,9 @@ cont {
   name: "railway-subway_entrance-mecca"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-mecca-s"
+      priority: 16000
     }
   }
   element {
@@ -66564,6 +66089,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66588,6 +66114,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66612,6 +66139,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66630,20 +66158,9 @@ cont {
   name: "railway-subway_entrance-medellin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-medellin-s"
+      priority: 16000
     }
   }
   element {
@@ -66657,6 +66174,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66681,6 +66199,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66705,6 +66224,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66723,20 +66243,9 @@ cont {
   name: "railway-subway_entrance-mexico"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-mexico-s"
+      priority: 16000
     }
   }
   element {
@@ -66750,6 +66259,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66774,6 +66284,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66798,6 +66309,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66816,20 +66328,9 @@ cont {
   name: "railway-subway_entrance-milan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-milan-s"
+      priority: 16000
     }
   }
   element {
@@ -66843,6 +66344,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66867,6 +66369,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66891,6 +66394,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66909,20 +66413,9 @@ cont {
   name: "railway-subway_entrance-minsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-minsk-m"
+      priority: 16000
     }
   }
   element {
@@ -67005,20 +66498,9 @@ cont {
   name: "railway-subway_entrance-montreal"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-montreal-s"
+      priority: 16000
     }
   }
   element {
@@ -67032,6 +66514,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67056,6 +66539,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67080,6 +66564,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67201,20 +66686,9 @@ cont {
   name: "railway-subway_entrance-munchen"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16000
     }
   }
   element {
@@ -67228,6 +66702,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67252,6 +66727,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67276,6 +66752,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67294,20 +66771,9 @@ cont {
   name: "railway-subway_entrance-nagoya"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-nagoya-s"
+      priority: 16000
     }
   }
   element {
@@ -67321,6 +66787,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67345,6 +66812,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67369,6 +66837,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67387,20 +66856,9 @@ cont {
   name: "railway-subway_entrance-newyork"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-newyork-s"
+      priority: 16000
     }
   }
   element {
@@ -67414,6 +66872,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67438,6 +66897,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67462,6 +66922,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67480,20 +66941,9 @@ cont {
   name: "railway-subway_entrance-nnov"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-nnov-s"
+      priority: 16000
     }
   }
   element {
@@ -67507,6 +66957,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67531,6 +66982,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67555,6 +67007,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67573,20 +67026,9 @@ cont {
   name: "railway-subway_entrance-novosibirsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-novosibirsk-s"
+      priority: 16000
     }
   }
   element {
@@ -67600,6 +67042,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67624,6 +67067,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67648,6 +67092,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67666,20 +67111,9 @@ cont {
   name: "railway-subway_entrance-osaka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-osaka-s"
+      priority: 16000
     }
   }
   element {
@@ -67693,6 +67127,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67717,6 +67152,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67741,6 +67177,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67759,20 +67196,9 @@ cont {
   name: "railway-subway_entrance-oslo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-oslo-s"
+      priority: 16000
     }
   }
   element {
@@ -67786,6 +67212,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67810,6 +67237,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67834,6 +67262,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67852,20 +67281,9 @@ cont {
   name: "railway-subway_entrance-palma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-palma-s"
+      priority: 16000
     }
   }
   element {
@@ -67879,6 +67297,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67903,6 +67322,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67927,6 +67347,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67945,20 +67366,9 @@ cont {
   name: "railway-subway_entrance-panama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-panama-s"
+      priority: 16000
     }
   }
   element {
@@ -67972,6 +67382,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67996,6 +67407,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68020,6 +67432,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68038,20 +67451,9 @@ cont {
   name: "railway-subway_entrance-paris"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-paris-s"
+      priority: 16000
     }
   }
   element {
@@ -68065,6 +67467,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68089,6 +67492,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68113,6 +67517,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68131,20 +67536,9 @@ cont {
   name: "railway-subway_entrance-philadelphia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-philadelphia-s"
+      priority: 16000
     }
   }
   element {
@@ -68158,6 +67552,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68182,6 +67577,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68206,6 +67602,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68224,20 +67621,9 @@ cont {
   name: "railway-subway_entrance-pyongyang"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-pyongyang-s"
+      priority: 16000
     }
   }
   element {
@@ -68251,6 +67637,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68275,6 +67662,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68299,6 +67687,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68317,20 +67706,9 @@ cont {
   name: "railway-subway_entrance-rennes"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-rennes-s"
+      priority: 16000
     }
   }
   element {
@@ -68344,6 +67722,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68368,6 +67747,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68392,6 +67772,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68410,20 +67791,9 @@ cont {
   name: "railway-subway_entrance-rio"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-riodejaneiro-s"
+      priority: 16000
     }
   }
   element {
@@ -68437,6 +67807,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68461,6 +67832,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68485,6 +67857,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68503,20 +67876,9 @@ cont {
   name: "railway-subway_entrance-roma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-rome-m"
+      priority: 16000
     }
   }
   element {
@@ -68530,6 +67892,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68554,6 +67917,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68578,6 +67942,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68596,20 +67961,9 @@ cont {
   name: "railway-subway_entrance-rotterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-rotterdam-s"
+      priority: 16000
     }
   }
   element {
@@ -68623,6 +67977,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68647,6 +68002,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68671,6 +68027,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68689,20 +68046,9 @@ cont {
   name: "railway-subway_entrance-samara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-samara-s"
+      priority: 16000
     }
   }
   element {
@@ -68716,6 +68062,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68740,6 +68087,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68764,6 +68112,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68782,20 +68131,9 @@ cont {
   name: "railway-subway_entrance-santiago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-santiago-s"
+      priority: 16000
     }
   }
   element {
@@ -68809,6 +68147,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68833,6 +68172,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68857,6 +68197,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68875,20 +68216,9 @@ cont {
   name: "railway-subway_entrance-santo_domingo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-santodomingo-s"
+      priority: 16000
     }
   }
   element {
@@ -68902,6 +68232,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68926,6 +68257,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68950,6 +68282,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68968,20 +68301,9 @@ cont {
   name: "railway-subway_entrance-saopaulo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-saopaulo-s"
+      priority: 16000
     }
   }
   element {
@@ -68995,6 +68317,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69019,6 +68342,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69043,6 +68367,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69061,20 +68386,9 @@ cont {
   name: "railway-subway_entrance-sapporo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-sapporo-s"
+      priority: 16000
     }
   }
   element {
@@ -69088,6 +68402,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69112,6 +68427,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69136,6 +68452,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69154,20 +68471,9 @@ cont {
   name: "railway-subway_entrance-sendai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-sendai-s"
+      priority: 16000
     }
   }
   element {
@@ -69181,6 +68487,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69205,6 +68512,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69229,6 +68537,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69247,20 +68556,9 @@ cont {
   name: "railway-subway_entrance-sf"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-sanfrancisco-s"
+      priority: 16000
     }
   }
   element {
@@ -69274,6 +68572,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69298,6 +68597,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69322,6 +68622,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69340,20 +68641,9 @@ cont {
   name: "railway-subway_entrance-shanghai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-shanghai-s"
+      priority: 16000
     }
   }
   element {
@@ -69367,6 +68657,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69391,6 +68682,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69415,6 +68707,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69433,20 +68726,9 @@ cont {
   name: "railway-subway_entrance-shiraz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-shiraz-s"
+      priority: 16000
     }
   }
   element {
@@ -69460,6 +68742,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69484,6 +68767,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69508,6 +68792,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69526,20 +68811,9 @@ cont {
   name: "railway-subway_entrance-sofia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-sofia-s"
+      priority: 16000
     }
   }
   element {
@@ -69553,6 +68827,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69577,6 +68852,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69601,6 +68877,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69722,20 +68999,9 @@ cont {
   name: "railway-subway_entrance-stockholm"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-stockholm-s"
+      priority: 16000
     }
   }
   element {
@@ -69749,6 +69015,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69773,6 +69040,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69797,6 +69065,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69815,20 +69084,9 @@ cont {
   name: "railway-subway_entrance-tabriz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tabriz-s"
+      priority: 16000
     }
   }
   element {
@@ -69842,6 +69100,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69866,6 +69125,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69890,6 +69150,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69908,20 +69169,9 @@ cont {
   name: "railway-subway_entrance-taipei"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-taipei-s"
+      priority: 16000
     }
   }
   element {
@@ -69935,6 +69185,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69959,6 +69210,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69983,6 +69235,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70001,20 +69254,9 @@ cont {
   name: "railway-subway_entrance-taoyuan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-taoyuan-s"
+      priority: 16000
     }
   }
   element {
@@ -70028,6 +69270,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70052,6 +69295,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70076,6 +69320,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70094,20 +69339,9 @@ cont {
   name: "railway-subway_entrance-tashkent"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tashkent-s"
+      priority: 16000
     }
   }
   element {
@@ -70121,6 +69355,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70145,6 +69380,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70169,6 +69405,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70187,20 +69424,9 @@ cont {
   name: "railway-subway_entrance-tbilisi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tbilisi-s"
+      priority: 16000
     }
   }
   element {
@@ -70214,6 +69440,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70238,6 +69465,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70262,6 +69490,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70280,20 +69509,9 @@ cont {
   name: "railway-subway_entrance-tianjin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tianjin-s"
+      priority: 16000
     }
   }
   element {
@@ -70307,6 +69525,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70331,6 +69550,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70355,6 +69575,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70373,20 +69594,9 @@ cont {
   name: "railway-subway_entrance-tokyo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tokyo-s"
+      priority: 16000
     }
   }
   element {
@@ -70400,6 +69610,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70424,6 +69635,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70448,6 +69660,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70466,20 +69679,9 @@ cont {
   name: "railway-subway_entrance-valencia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-valencia-s"
+      priority: 16000
     }
   }
   element {
@@ -70493,6 +69695,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70517,6 +69720,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70541,6 +69745,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70559,20 +69764,9 @@ cont {
   name: "railway-subway_entrance-vienna"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-vienna-s"
+      priority: 16000
     }
   }
   element {
@@ -70586,6 +69780,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70610,6 +69805,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70634,6 +69830,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70652,20 +69849,9 @@ cont {
   name: "railway-subway_entrance-warszawa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-warszawa-s"
+      priority: 16000
     }
   }
   element {
@@ -70679,6 +69865,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70703,6 +69890,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70727,6 +69915,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70745,20 +69934,9 @@ cont {
   name: "railway-subway_entrance-washington"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-washington-s"
+      priority: 16000
     }
   }
   element {
@@ -70772,6 +69950,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70796,6 +69975,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70820,6 +70000,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70838,20 +70019,9 @@ cont {
   name: "railway-subway_entrance-wuhan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-wuhan-s"
+      priority: 16000
     }
   }
   element {
@@ -70865,6 +70035,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70889,6 +70060,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70913,6 +70085,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70931,20 +70104,9 @@ cont {
   name: "railway-subway_entrance-yerevan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-yerevan-s"
+      priority: 16000
     }
   }
   element {
@@ -70958,6 +70120,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70982,6 +70145,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71006,6 +70170,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71024,20 +70189,9 @@ cont {
   name: "railway-subway_entrance-yokohama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-      }
-      secondary {
-        height: 10
-        color: 3355443
-        stroke_color: 1728053247
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-yokohama-s"
+      priority: 16000
     }
   }
   element {
@@ -71051,6 +70205,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71075,6 +70230,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71099,6 +70255,7 @@ cont {
         height: 10
         color: 3355443
         stroke_color: 1728053247
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -72001,7 +71158,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15746
     }
   }
   element {
@@ -72017,7 +71174,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15746
     }
   }
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index d788420263..f05334b3ad 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index d72e2c0d89..42b21e014a 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -3396,11 +3396,17 @@ cont {
   name: "amenity-theatre"
   element {
     scale: 15
+    symbol {
+      name: "theatre-m"
+      priority: 16734
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 6710886
         offset_y: 1
+        is_optional: true
       }
       priority: 15734
     }
@@ -61206,29 +61212,24 @@ cont {
   name: "railway-subway_entrance"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16000
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
+        is_optional: true
       }
       secondary {
         height: 10
@@ -61236,17 +61237,24 @@ cont {
         stroke_color: 1712394496
         offset_y: 1
         text: "int_name"
+        is_optional: true
       }
       priority: 15000
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
+        is_optional: true
       }
       secondary {
         height: 10
@@ -61254,17 +61262,24 @@ cont {
         stroke_color: 1712394496
         offset_y: 1
         text: "int_name"
+        is_optional: true
       }
       priority: 15000
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "subway-entrance-m"
+      priority: 16000
+    }
     caption {
       primary {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
+        is_optional: true
       }
       secondary {
         height: 10
@@ -61272,6 +61287,7 @@ cont {
         stroke_color: 1712394496
         offset_y: 1
         text: "int_name"
+        is_optional: true
       }
       priority: 15000
     }
@@ -61281,20 +61297,9 @@ cont {
   name: "railway-subway_entrance-adana"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-adana-s"
+      priority: 16000
     }
   }
   element {
@@ -61308,6 +61313,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61332,6 +61338,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61356,6 +61363,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61374,20 +61382,9 @@ cont {
   name: "railway-subway_entrance-algiers"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-algeria-s"
+      priority: 16000
     }
   }
   element {
@@ -61401,6 +61398,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61425,6 +61423,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61449,6 +61448,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61467,20 +61467,9 @@ cont {
   name: "railway-subway_entrance-almaty"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-almaty-s"
+      priority: 16000
     }
   }
   element {
@@ -61494,6 +61483,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61518,6 +61508,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61542,6 +61533,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61560,20 +61552,9 @@ cont {
   name: "railway-subway_entrance-amsterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-amsterdam-s"
+      priority: 16000
     }
   }
   element {
@@ -61587,6 +61568,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61611,6 +61593,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61635,6 +61618,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61653,20 +61637,9 @@ cont {
   name: "railway-subway_entrance-ankara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ankara-s"
+      priority: 16000
     }
   }
   element {
@@ -61680,6 +61653,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61704,6 +61678,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61728,6 +61703,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61746,20 +61722,9 @@ cont {
   name: "railway-subway_entrance-athens"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-athens-s"
+      priority: 16000
     }
   }
   element {
@@ -61773,6 +61738,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61797,6 +61763,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61821,6 +61788,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61839,20 +61807,9 @@ cont {
   name: "railway-subway_entrance-baku"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-baku-s"
+      priority: 16000
     }
   }
   element {
@@ -61866,6 +61823,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61890,6 +61848,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61914,6 +61873,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61932,20 +61892,9 @@ cont {
   name: "railway-subway_entrance-bangkok"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bangkok-s"
+      priority: 16000
     }
   }
   element {
@@ -61959,6 +61908,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -61983,6 +61933,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62007,6 +61958,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62025,20 +61977,9 @@ cont {
   name: "railway-subway_entrance-barcelona"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-barcelona-s"
+      priority: 16000
     }
   }
   element {
@@ -62052,6 +61993,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62076,6 +62018,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62100,6 +62043,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62118,20 +62062,9 @@ cont {
   name: "railway-subway_entrance-beijing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-beijing-s"
+      priority: 16000
     }
   }
   element {
@@ -62145,6 +62078,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62169,6 +62103,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62193,6 +62128,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62211,20 +62147,9 @@ cont {
   name: "railway-subway_entrance-bengalore"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bengaluru-s"
+      priority: 16000
     }
   }
   element {
@@ -62238,6 +62163,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62262,6 +62188,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62286,6 +62213,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62304,20 +62232,9 @@ cont {
   name: "railway-subway_entrance-berlin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16000
     }
   }
   element {
@@ -62331,6 +62248,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62355,6 +62273,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62379,6 +62298,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62397,20 +62317,9 @@ cont {
   name: "railway-subway_entrance-bilbao"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bilbao-s"
+      priority: 16000
     }
   }
   element {
@@ -62424,6 +62333,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62448,6 +62358,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62472,6 +62383,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62490,20 +62402,9 @@ cont {
   name: "railway-subway_entrance-brasilia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-brasilia-s"
+      priority: 16000
     }
   }
   element {
@@ -62517,6 +62418,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62541,6 +62443,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62565,6 +62468,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62583,20 +62487,9 @@ cont {
   name: "railway-subway_entrance-brescia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-brescia-s"
+      priority: 16000
     }
   }
   element {
@@ -62610,6 +62503,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62634,6 +62528,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62658,6 +62553,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62676,20 +62572,9 @@ cont {
   name: "railway-subway_entrance-brussels"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-brussel-s"
+      priority: 16000
     }
   }
   element {
@@ -62703,6 +62588,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62727,6 +62613,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62751,6 +62638,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62769,20 +62657,9 @@ cont {
   name: "railway-subway_entrance-bucharest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bucharest-s"
+      priority: 16000
     }
   }
   element {
@@ -62796,6 +62673,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62820,6 +62698,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62844,6 +62723,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62862,20 +62742,9 @@ cont {
   name: "railway-subway_entrance-budapest"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-budapest-s"
+      priority: 16000
     }
   }
   element {
@@ -62889,6 +62758,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62913,6 +62783,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62937,6 +62808,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -62955,20 +62827,9 @@ cont {
   name: "railway-subway_entrance-buenos_aires"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-buenosaires-s"
+      priority: 16000
     }
   }
   element {
@@ -62982,6 +62843,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63006,6 +62868,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63030,6 +62893,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63048,20 +62912,9 @@ cont {
   name: "railway-subway_entrance-bursa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-bursaray-s"
+      priority: 16000
     }
   }
   element {
@@ -63075,6 +62928,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63099,6 +62953,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63123,6 +62978,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63141,20 +62997,9 @@ cont {
   name: "railway-subway_entrance-cairo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-cairo-s"
+      priority: 16000
     }
   }
   element {
@@ -63168,6 +63013,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63192,6 +63038,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63216,6 +63063,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63234,20 +63082,9 @@ cont {
   name: "railway-subway_entrance-caracas"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-caracas-s"
+      priority: 16000
     }
   }
   element {
@@ -63261,6 +63098,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63285,6 +63123,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63309,6 +63148,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63327,20 +63167,9 @@ cont {
   name: "railway-subway_entrance-catania"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-catania-s"
+      priority: 16000
     }
   }
   element {
@@ -63354,6 +63183,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63378,6 +63208,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63402,6 +63233,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63420,20 +63252,9 @@ cont {
   name: "railway-subway_entrance-changchun"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-changchun-s"
+      priority: 16000
     }
   }
   element {
@@ -63447,6 +63268,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63471,6 +63293,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63495,6 +63318,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63513,20 +63337,9 @@ cont {
   name: "railway-subway_entrance-chengdu"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-chengdu-s"
+      priority: 16000
     }
   }
   element {
@@ -63540,6 +63353,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63564,6 +63378,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63588,6 +63403,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63606,20 +63422,9 @@ cont {
   name: "railway-subway_entrance-chicago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-chicago-s"
+      priority: 16000
     }
   }
   element {
@@ -63633,6 +63438,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63657,6 +63463,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63681,6 +63488,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63699,20 +63507,9 @@ cont {
   name: "railway-subway_entrance-chongqing"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-chongqing-s"
+      priority: 16000
     }
   }
   element {
@@ -63726,6 +63523,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63750,6 +63548,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63774,6 +63573,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63792,20 +63592,9 @@ cont {
   name: "railway-subway_entrance-dalian"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-dalian-s"
+      priority: 16000
     }
   }
   element {
@@ -63819,6 +63608,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63843,6 +63633,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63867,6 +63658,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63885,20 +63677,9 @@ cont {
   name: "railway-subway_entrance-delhi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-delhi-s"
+      priority: 16000
     }
   }
   element {
@@ -63912,6 +63693,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63936,6 +63718,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63960,6 +63743,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -63978,20 +63762,9 @@ cont {
   name: "railway-subway_entrance-dnepro"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-dnepro-s"
+      priority: 16000
     }
   }
   element {
@@ -64005,6 +63778,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64029,6 +63803,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64053,6 +63828,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64071,20 +63847,9 @@ cont {
   name: "railway-subway_entrance-dubai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-dubai-s"
+      priority: 16000
     }
   }
   element {
@@ -64098,6 +63863,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64122,6 +63888,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64146,6 +63913,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64164,20 +63932,9 @@ cont {
   name: "railway-subway_entrance-ekb"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ekb-s"
+      priority: 16000
     }
   }
   element {
@@ -64191,6 +63948,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64215,6 +63973,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64239,6 +63998,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64257,20 +64017,9 @@ cont {
   name: "railway-subway_entrance-fukuoka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-fukuoka-s"
+      priority: 16000
     }
   }
   element {
@@ -64284,6 +64033,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64308,6 +64058,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64332,6 +64083,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64350,20 +64102,9 @@ cont {
   name: "railway-subway_entrance-glasgow"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-glasgow-s"
+      priority: 16000
     }
   }
   element {
@@ -64377,6 +64118,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64401,6 +64143,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64425,6 +64168,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64443,20 +64187,9 @@ cont {
   name: "railway-subway_entrance-guangzhou"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-guangzhou-s"
+      priority: 16000
     }
   }
   element {
@@ -64470,6 +64203,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64494,6 +64228,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64518,6 +64253,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64536,20 +64272,9 @@ cont {
   name: "railway-subway_entrance-hamburg"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16000
     }
   }
   element {
@@ -64563,6 +64288,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64587,6 +64313,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64611,6 +64338,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64629,20 +64357,9 @@ cont {
   name: "railway-subway_entrance-helsinki"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-helsinki-s"
+      priority: 16000
     }
   }
   element {
@@ -64656,6 +64373,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64680,6 +64398,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64704,6 +64423,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64722,20 +64442,9 @@ cont {
   name: "railway-subway_entrance-hiroshima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-hirosima-s"
+      priority: 16000
     }
   }
   element {
@@ -64749,6 +64458,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64773,6 +64483,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64797,6 +64508,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64815,20 +64527,9 @@ cont {
   name: "railway-subway_entrance-isfahan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-isfahan-s"
+      priority: 16000
     }
   }
   element {
@@ -64842,6 +64543,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64866,6 +64568,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64890,6 +64593,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64908,20 +64612,9 @@ cont {
   name: "railway-subway_entrance-istanbul"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-istanbul-s"
+      priority: 16000
     }
   }
   element {
@@ -64935,6 +64628,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64959,6 +64653,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -64983,6 +64678,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65001,20 +64697,9 @@ cont {
   name: "railway-subway_entrance-izmir"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-izmir-s"
+      priority: 16000
     }
   }
   element {
@@ -65028,6 +64713,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65052,6 +64738,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65076,6 +64763,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65094,20 +64782,9 @@ cont {
   name: "railway-subway_entrance-kazan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kazan-s"
+      priority: 16000
     }
   }
   element {
@@ -65121,6 +64798,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65145,6 +64823,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65169,6 +64848,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65187,20 +64867,9 @@ cont {
   name: "railway-subway_entrance-kharkiv"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kharkiv-s"
+      priority: 16000
     }
   }
   element {
@@ -65214,6 +64883,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65238,6 +64908,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65262,6 +64933,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65280,20 +64952,9 @@ cont {
   name: "railway-subway_entrance-kiev"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kiev-m"
+      priority: 16000
     }
   }
   element {
@@ -65307,6 +64968,7 @@ cont {
         height: 13
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65331,6 +64993,7 @@ cont {
         height: 13
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65355,6 +65018,7 @@ cont {
         height: 13
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65373,20 +65037,9 @@ cont {
   name: "railway-subway_entrance-kobe"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kobe-s"
+      priority: 16000
     }
   }
   element {
@@ -65400,6 +65053,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65424,6 +65078,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65448,6 +65103,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65466,20 +65122,9 @@ cont {
   name: "railway-subway_entrance-kolkata"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kolkata-s"
+      priority: 16000
     }
   }
   element {
@@ -65493,6 +65138,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65517,6 +65163,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65541,6 +65188,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65559,20 +65207,9 @@ cont {
   name: "railway-subway_entrance-kunming"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kunming-s"
+      priority: 16000
     }
   }
   element {
@@ -65586,6 +65223,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65610,6 +65248,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65634,6 +65273,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65652,20 +65292,9 @@ cont {
   name: "railway-subway_entrance-kyoto"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-kyoto-s"
+      priority: 16000
     }
   }
   element {
@@ -65679,6 +65308,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65703,6 +65333,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65727,6 +65358,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65745,20 +65377,9 @@ cont {
   name: "railway-subway_entrance-la"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-losangeles-s"
+      priority: 16000
     }
   }
   element {
@@ -65772,6 +65393,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65796,6 +65418,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65820,6 +65443,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65838,20 +65462,9 @@ cont {
   name: "railway-subway_entrance-lausanne"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lausanne-s"
+      priority: 16000
     }
   }
   element {
@@ -65865,6 +65478,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65889,6 +65503,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65913,6 +65528,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65931,20 +65547,9 @@ cont {
   name: "railway-subway_entrance-lille"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lille-s"
+      priority: 16000
     }
   }
   element {
@@ -65958,6 +65563,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -65982,6 +65588,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66006,6 +65613,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66024,20 +65632,9 @@ cont {
   name: "railway-subway_entrance-lima"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lima-s"
+      priority: 16000
     }
   }
   element {
@@ -66051,6 +65648,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66075,6 +65673,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66099,6 +65698,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66117,20 +65717,9 @@ cont {
   name: "railway-subway_entrance-lisboa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lisboa-s"
+      priority: 16000
     }
   }
   element {
@@ -66144,6 +65733,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66168,6 +65758,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66192,6 +65783,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66210,20 +65802,9 @@ cont {
   name: "railway-subway_entrance-london"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-london-s"
+      priority: 16000
     }
   }
   element {
@@ -66237,6 +65818,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66261,6 +65843,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66285,6 +65868,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66303,20 +65887,9 @@ cont {
   name: "railway-subway_entrance-lyon"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-lyon-s"
+      priority: 16000
     }
   }
   element {
@@ -66330,6 +65903,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66354,6 +65928,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66378,6 +65953,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66396,20 +65972,9 @@ cont {
   name: "railway-subway_entrance-madrid"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-madrid-s"
+      priority: 16000
     }
   }
   element {
@@ -66423,6 +65988,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66447,6 +66013,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66471,6 +66038,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66489,20 +66057,9 @@ cont {
   name: "railway-subway_entrance-malaga"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-malaga-s"
+      priority: 16000
     }
   }
   element {
@@ -66516,6 +66073,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66540,6 +66098,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66564,6 +66123,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66582,20 +66142,9 @@ cont {
   name: "railway-subway_entrance-manila"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-manila-s"
+      priority: 16000
     }
   }
   element {
@@ -66609,6 +66158,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66633,6 +66183,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66657,6 +66208,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66675,20 +66227,9 @@ cont {
   name: "railway-subway_entrance-maracaibo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-maracaibo-s"
+      priority: 16000
     }
   }
   element {
@@ -66702,6 +66243,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66726,6 +66268,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66750,6 +66293,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66768,20 +66312,9 @@ cont {
   name: "railway-subway_entrance-mashhad"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-mashhad-s"
+      priority: 16000
     }
   }
   element {
@@ -66795,6 +66328,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66819,6 +66353,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66843,6 +66378,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66861,20 +66397,9 @@ cont {
   name: "railway-subway_entrance-mecca"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-mecca-s"
+      priority: 16000
     }
   }
   element {
@@ -66888,6 +66413,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66912,6 +66438,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66936,6 +66463,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -66954,20 +66482,9 @@ cont {
   name: "railway-subway_entrance-medellin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-medellin-s"
+      priority: 16000
     }
   }
   element {
@@ -66981,6 +66498,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67005,6 +66523,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67029,6 +66548,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67047,20 +66567,9 @@ cont {
   name: "railway-subway_entrance-mexico"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-mexico-s"
+      priority: 16000
     }
   }
   element {
@@ -67074,6 +66583,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67098,6 +66608,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67122,6 +66633,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67140,20 +66652,9 @@ cont {
   name: "railway-subway_entrance-milan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-milan-s"
+      priority: 16000
     }
   }
   element {
@@ -67167,6 +66668,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67191,6 +66693,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67215,6 +66718,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67233,20 +66737,9 @@ cont {
   name: "railway-subway_entrance-minsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-minsk-m"
+      priority: 16000
     }
   }
   element {
@@ -67329,20 +66822,9 @@ cont {
   name: "railway-subway_entrance-montreal"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-montreal-s"
+      priority: 16000
     }
   }
   element {
@@ -67356,6 +66838,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67380,6 +66863,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67404,6 +66888,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67525,20 +67010,9 @@ cont {
   name: "railway-subway_entrance-munchen"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-ubahn-s"
+      priority: 16000
     }
   }
   element {
@@ -67552,6 +67026,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67576,6 +67051,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67600,6 +67076,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67618,20 +67095,9 @@ cont {
   name: "railway-subway_entrance-nagoya"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-nagoya-s"
+      priority: 16000
     }
   }
   element {
@@ -67645,6 +67111,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67669,6 +67136,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67693,6 +67161,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67711,20 +67180,9 @@ cont {
   name: "railway-subway_entrance-newyork"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-newyork-s"
+      priority: 16000
     }
   }
   element {
@@ -67738,6 +67196,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67762,6 +67221,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67786,6 +67246,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67804,20 +67265,9 @@ cont {
   name: "railway-subway_entrance-nnov"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-nnov-s"
+      priority: 16000
     }
   }
   element {
@@ -67831,6 +67281,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67855,6 +67306,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67879,6 +67331,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67897,20 +67350,9 @@ cont {
   name: "railway-subway_entrance-novosibirsk"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-novosibirsk-s"
+      priority: 16000
     }
   }
   element {
@@ -67924,6 +67366,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67948,6 +67391,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67972,6 +67416,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -67990,20 +67435,9 @@ cont {
   name: "railway-subway_entrance-osaka"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-osaka-s"
+      priority: 16000
     }
   }
   element {
@@ -68017,6 +67451,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68041,6 +67476,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68065,6 +67501,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68083,20 +67520,9 @@ cont {
   name: "railway-subway_entrance-oslo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-oslo-s"
+      priority: 16000
     }
   }
   element {
@@ -68110,6 +67536,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68134,6 +67561,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68158,6 +67586,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68176,20 +67605,9 @@ cont {
   name: "railway-subway_entrance-palma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-palma-s"
+      priority: 16000
     }
   }
   element {
@@ -68203,6 +67621,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68227,6 +67646,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68251,6 +67671,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68269,20 +67690,9 @@ cont {
   name: "railway-subway_entrance-panama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-panama-s"
+      priority: 16000
     }
   }
   element {
@@ -68296,6 +67706,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68320,6 +67731,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68344,6 +67756,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68362,20 +67775,9 @@ cont {
   name: "railway-subway_entrance-paris"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-paris-s"
+      priority: 16000
     }
   }
   element {
@@ -68389,6 +67791,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68413,6 +67816,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68437,6 +67841,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68455,20 +67860,9 @@ cont {
   name: "railway-subway_entrance-philadelphia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-philadelphia-s"
+      priority: 16000
     }
   }
   element {
@@ -68482,6 +67876,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68506,6 +67901,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68530,6 +67926,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68548,20 +67945,9 @@ cont {
   name: "railway-subway_entrance-pyongyang"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-pyongyang-s"
+      priority: 16000
     }
   }
   element {
@@ -68575,6 +67961,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68599,6 +67986,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68623,6 +68011,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68641,20 +68030,9 @@ cont {
   name: "railway-subway_entrance-rennes"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-rennes-s"
+      priority: 16000
     }
   }
   element {
@@ -68668,6 +68046,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68692,6 +68071,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68716,6 +68096,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68734,20 +68115,9 @@ cont {
   name: "railway-subway_entrance-rio"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-riodejaneiro-s"
+      priority: 16000
     }
   }
   element {
@@ -68761,6 +68131,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68785,6 +68156,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68809,6 +68181,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68827,20 +68200,9 @@ cont {
   name: "railway-subway_entrance-roma"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-rome-m"
+      priority: 16000
     }
   }
   element {
@@ -68854,6 +68216,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68878,6 +68241,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68902,6 +68266,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68920,20 +68285,9 @@ cont {
   name: "railway-subway_entrance-rotterdam"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-rotterdam-s"
+      priority: 16000
     }
   }
   element {
@@ -68947,6 +68301,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68971,6 +68326,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -68995,6 +68351,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69013,20 +68370,9 @@ cont {
   name: "railway-subway_entrance-samara"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-samara-s"
+      priority: 16000
     }
   }
   element {
@@ -69040,6 +68386,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69064,6 +68411,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69088,6 +68436,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69106,20 +68455,9 @@ cont {
   name: "railway-subway_entrance-santiago"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-santiago-s"
+      priority: 16000
     }
   }
   element {
@@ -69133,6 +68471,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69157,6 +68496,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69181,6 +68521,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69199,20 +68540,9 @@ cont {
   name: "railway-subway_entrance-santo_domingo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-santodomingo-s"
+      priority: 16000
     }
   }
   element {
@@ -69226,6 +68556,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69250,6 +68581,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69274,6 +68606,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69292,20 +68625,9 @@ cont {
   name: "railway-subway_entrance-saopaulo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-saopaulo-s"
+      priority: 16000
     }
   }
   element {
@@ -69319,6 +68641,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69343,6 +68666,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69367,6 +68691,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69385,20 +68710,9 @@ cont {
   name: "railway-subway_entrance-sapporo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-sapporo-s"
+      priority: 16000
     }
   }
   element {
@@ -69412,6 +68726,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69436,6 +68751,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69460,6 +68776,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69478,20 +68795,9 @@ cont {
   name: "railway-subway_entrance-sendai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-sendai-s"
+      priority: 16000
     }
   }
   element {
@@ -69505,6 +68811,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69529,6 +68836,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69553,6 +68861,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69571,20 +68880,9 @@ cont {
   name: "railway-subway_entrance-sf"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-sanfrancisco-s"
+      priority: 16000
     }
   }
   element {
@@ -69598,6 +68896,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69622,6 +68921,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69646,6 +68946,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69664,20 +68965,9 @@ cont {
   name: "railway-subway_entrance-shanghai"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-shanghai-s"
+      priority: 16000
     }
   }
   element {
@@ -69691,6 +68981,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69715,6 +69006,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69739,6 +69031,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69757,20 +69050,9 @@ cont {
   name: "railway-subway_entrance-shiraz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-shiraz-s"
+      priority: 16000
     }
   }
   element {
@@ -69784,6 +69066,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69808,6 +69091,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69832,6 +69116,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69850,20 +69135,9 @@ cont {
   name: "railway-subway_entrance-sofia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-sofia-s"
+      priority: 16000
     }
   }
   element {
@@ -69877,6 +69151,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69901,6 +69176,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -69925,6 +69201,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70046,20 +69323,9 @@ cont {
   name: "railway-subway_entrance-stockholm"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-stockholm-s"
+      priority: 16000
     }
   }
   element {
@@ -70073,6 +69339,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70097,6 +69364,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70121,6 +69389,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70139,20 +69408,9 @@ cont {
   name: "railway-subway_entrance-tabriz"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tabriz-s"
+      priority: 16000
     }
   }
   element {
@@ -70166,6 +69424,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70190,6 +69449,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70214,6 +69474,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70232,20 +69493,9 @@ cont {
   name: "railway-subway_entrance-taipei"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-taipei-s"
+      priority: 16000
     }
   }
   element {
@@ -70259,6 +69509,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70283,6 +69534,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70307,6 +69559,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70325,20 +69578,9 @@ cont {
   name: "railway-subway_entrance-taoyuan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-taoyuan-s"
+      priority: 16000
     }
   }
   element {
@@ -70352,6 +69594,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70376,6 +69619,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70400,6 +69644,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70418,20 +69663,9 @@ cont {
   name: "railway-subway_entrance-tashkent"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tashkent-s"
+      priority: 16000
     }
   }
   element {
@@ -70445,6 +69679,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70469,6 +69704,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70493,6 +69729,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70511,20 +69748,9 @@ cont {
   name: "railway-subway_entrance-tbilisi"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tbilisi-s"
+      priority: 16000
     }
   }
   element {
@@ -70538,6 +69764,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70562,6 +69789,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70586,6 +69814,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70604,20 +69833,9 @@ cont {
   name: "railway-subway_entrance-tianjin"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tianjin-s"
+      priority: 16000
     }
   }
   element {
@@ -70631,6 +69849,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70655,6 +69874,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70679,6 +69899,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70697,20 +69918,9 @@ cont {
   name: "railway-subway_entrance-tokyo"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-tokyo-s"
+      priority: 16000
     }
   }
   element {
@@ -70724,6 +69934,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70748,6 +69959,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70772,6 +69984,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70790,20 +70003,9 @@ cont {
   name: "railway-subway_entrance-valencia"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-valencia-s"
+      priority: 16000
     }
   }
   element {
@@ -70817,6 +70019,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70841,6 +70044,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70865,6 +70069,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70883,20 +70088,9 @@ cont {
   name: "railway-subway_entrance-vienna"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-vienna-s"
+      priority: 16000
     }
   }
   element {
@@ -70910,6 +70104,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70934,6 +70129,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70958,6 +70154,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -70976,20 +70173,9 @@ cont {
   name: "railway-subway_entrance-warszawa"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-warszawa-s"
+      priority: 16000
     }
   }
   element {
@@ -71003,6 +70189,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71027,6 +70214,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71051,6 +70239,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71069,20 +70258,9 @@ cont {
   name: "railway-subway_entrance-washington"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-washington-s"
+      priority: 16000
     }
   }
   element {
@@ -71096,6 +70274,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71120,6 +70299,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71144,6 +70324,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71162,20 +70343,9 @@ cont {
   name: "railway-subway_entrance-wuhan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-wuhan-s"
+      priority: 16000
     }
   }
   element {
@@ -71189,6 +70359,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71213,6 +70384,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71237,6 +70409,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71255,20 +70428,9 @@ cont {
   name: "railway-subway_entrance-yerevan"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-yerevan-s"
+      priority: 16000
     }
   }
   element {
@@ -71282,6 +70444,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71306,6 +70469,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71330,6 +70494,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71348,20 +70513,9 @@ cont {
   name: "railway-subway_entrance-yokohama"
   element {
     scale: 16
-    caption {
-      primary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-      }
-      secondary {
-        height: 10
-        color: 8947848
-        stroke_color: 1712394496
-        offset_y: 1
-        text: "int_name"
-      }
-      priority: 15000
+    symbol {
+      name: "subway-yokohama-s"
+      priority: 16000
     }
   }
   element {
@@ -71375,6 +70529,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71399,6 +70554,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -71423,6 +70579,7 @@ cont {
         height: 10
         color: 8947848
         stroke_color: 1712394496
+        offset_y: 1
         is_optional: true
       }
       secondary {
@@ -72325,7 +71482,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15746
     }
   }
   element {
@@ -72341,7 +71498,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15500
+      priority: 15746
     }
   }
   element {