diff --git a/data/classificator.txt b/data/classificator.txt
index 60ee2787c8..3ddf396a75 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -993,6 +993,7 @@ world  +
                 taoyuan  -
                 tashkent  -
                 tbilisi  -
+                tehran  -
                 tianjin  -
                 tokyo  -
                 valencia  -
@@ -1109,6 +1110,7 @@ world  +
             taoyuan  -
             tashkent  -
             tbilisi  -
+            tehran  -
             tianjin  -
             tokyo  -
             valencia  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index b5f40b8627..c259549b92 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 41b6e86ccb..f8ae6572fe 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -80865,6 +80865,168 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-tehran"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16970
+      min_distance: 1
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16970
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2236962
+        stroke_color: 1308622847
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 2236962
+        stroke_color: 1308622847
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+}
 cont {
   name: "railway-station-subway-tianjin"
   element {
@@ -91254,6 +91416,91 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-tehran"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-tianjin"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index a0f89e06ee..c7c987098c 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 fe0249e1bd..82ab49d913 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -80326,6 +80326,168 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-tehran"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16970
+      min_distance: 1
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16970
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 2236962
+        stroke_color: 1308622847
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 2236962
+        stroke_color: 1308622847
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 12
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+}
 cont {
   name: "railway-station-subway-tianjin"
   element {
@@ -90715,6 +90877,91 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-tehran"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 2236962
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-tianjin"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index a9a2e37ca7..8d048be4a8 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 da828458e6..2c7067564b 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -80411,6 +80411,168 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-tehran"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16970
+      min_distance: 1
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16970
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 8947848
+        stroke_color: 1292964096
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 8947848
+        stroke_color: 1292964096
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16970
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15970
+    }
+  }
+}
 cont {
   name: "railway-station-subway-tianjin"
   element {
@@ -90800,6 +90962,91 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-tehran"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16931
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15931
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-tianjin"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 44aec15fe4..502cec49c2 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 558334ddc6..8585bf6efc 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -61537,6 +61537,185 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-tehran"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16939
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 1308622847
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 3355443
+        stroke_color: 1308622847
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 12
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 13
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 3355443
+        stroke_color: 872415231
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 14
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 12
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 14
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 12
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 14
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 12
+        color: 3355443
+        stroke_color: 452984831
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+}
 cont {
   name: "railway-station-subway-tianjin"
   element {
@@ -72025,6 +72204,91 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-tehran"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 3355443
+        stroke_color: 1728053247
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-tianjin"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index c68e8faeca..7ce73c2bfa 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 857ba794fd..b9f18ade62 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -61861,6 +61861,185 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-station-subway-tehran"
+  element {
+    scale: 13
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16939
+      min_distance: 1
+    }
+    caption {
+      primary {
+        height: 11
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 9
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 1292964096
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 1292964096
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 12
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 13
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 11
+        color: 8947848
+        stroke_color: 856756480
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 14
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 12
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 14
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 12
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-m"
+      priority: 16939
+    }
+    caption {
+      primary {
+        height: 14
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 12
+        color: 8947848
+        stroke_color: 437326080
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15939
+    }
+  }
+}
 cont {
   name: "railway-station-subway-tianjin"
   element {
@@ -72349,6 +72528,91 @@ cont {
     }
   }
 }
+cont {
+  name: "railway-subway_entrance-tehran"
+  element {
+    scale: 16
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "subway-tehran-s"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        is_optional: true
+      }
+      secondary {
+        height: 10
+        color: 8947848
+        stroke_color: 1712394496
+        offset_y: 1
+        text: "int_name"
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "railway-subway_entrance-tianjin"
   element {
diff --git a/data/types.txt b/data/types.txt
index f2261783ef..968eb04c86 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1499,7 +1499,7 @@ amenity|recycling|container
 *railway|subway_entrance|lille
 *railway|subway_entrance|lima
 *railway|subway_entrance|lisboa
-mapswithme
+*railway|subway_entrance|tehran
 *railway|subway_entrance|lyon
 *railway|subway_entrance|malaga
 *railway|subway_entrance|manila
@@ -1562,3 +1562,4 @@ mapswithme
 *shop|camera
 *shop|auction
 *shop|collector
+*railway|station|subway|tehran
diff --git a/data/visibility.txt b/data/visibility.txt
index c0db07dbc1..9b25fb3052 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -993,6 +993,7 @@ world  00000000000000000000  +
                 taoyuan  00000000000001111111  -
                 tashkent  00000000000001111111  -
                 tbilisi  00000000000001111111  -
+                tehran  00000000000001111111  -
                 tianjin  00000000000001111111  -
                 tokyo  00000000000001111111  -
                 valencia  00000000000001111111  -
@@ -1109,6 +1110,7 @@ world  00000000000000000000  +
             taoyuan  00000000000000001111  -
             tashkent  00000000000000001111  -
             tbilisi  00000000000000001111  -
+            tehran  00000000000000001111  -
             tianjin  00000000000000001111  -
             tokyo  00000000000000001111  -
             valencia  00000000000000001111  -