diff --git a/data/classificator.txt b/data/classificator.txt
index f8987b6a8e..283078d5cb 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -143,6 +143,7 @@ world  +
         block  -
         bollard  -
         border_control  -
+        chain  -
         city_wall  -
         cycle_barrier  -
         entrance  -
@@ -152,6 +153,7 @@ world  +
         lift_gate  -
         retaining_wall  -
         stile  -
+        swing_gate  -
         toll_booth  -
         wall  -
         {}
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 87a288a3a2..1a0e3b59e9 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 a34fd3e67e..556cc7c209 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -8904,6 +8904,69 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-chain"
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "barrier-city_wall"
   element {
@@ -9367,6 +9430,76 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-swing_gate"
+  element {
+    scale: 16
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "barrier-toll_booth"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 2c409a7303..db3d05dee8 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 69bd5f033b..754b6beacc 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -8838,6 +8838,69 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-chain"
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "barrier-city_wall"
   element {
@@ -9301,6 +9364,76 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-swing_gate"
+  element {
+    scale: 16
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "barrier-toll_booth"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 02745a11af..f45df931cc 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 c99eb149ad..421766165f 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -8838,6 +8838,69 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-chain"
+  element {
+    scale: 16
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "dot-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "barrier-city_wall"
   element {
@@ -9301,6 +9364,76 @@ cont {
     }
   }
 }
+cont {
+  name: "barrier-swing_gate"
+  element {
+    scale: 16
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 30
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "lift_gate-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15000
+    }
+  }
+}
 cont {
   name: "barrier-toll_booth"
   element {
diff --git a/data/types.txt b/data/types.txt
index ab5867b15e..61a52cb772 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -737,8 +737,8 @@ mapswithme
 *place|state|USA
 *building|address
 *amenity|parking|no-access
-mapswithme
-mapswithme
+*barrier|swing_gate
+*barrier|chain
 mapswithme
 mapswithme
 mapswithme
diff --git a/data/visibility.txt b/data/visibility.txt
index 64b194da59..77840c7f80 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -143,6 +143,7 @@ world  00000000000000000000  +
         block  00000000000000000000  -
         bollard  00000000000000000000  -
         border_control  00000000000000011111  -
+        chain  00000000000000000000  -
         city_wall  00000000000000001111  -
         cycle_barrier  00000000000000000000  -
         entrance  00000000000000000000  -
@@ -152,6 +153,7 @@ world  00000000000000000000  +
         lift_gate  00000000000000001111  -
         retaining_wall  00000000000000000000  -
         stile  00000000000000000000  -
+        swing_gate  00000000000000000000  -
         toll_booth  00000000000011111111  -
         wall  00000000000000001111  -
         {}