diff --git a/data/classificator.txt b/data/classificator.txt
index 6418a4cc33..77d57270bd 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -43,6 +43,7 @@ world  +
         car_wash  -
         casino  -
         charging_station  +
+            bicycle  -
             motorcar  -
             {}
         childcare  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 0dc9873c20..67d47cd7d6 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 3d6df7578f..b6ba170b7d 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3799,6 +3799,74 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-charging_station-bicycle"
+  element {
+    scale: 16
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+}
 cont {
   name: "amenity-charging_station-motorcar"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index a8612cb472..bf357fd9e4 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 c545826955..7884605050 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3799,6 +3799,74 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-charging_station-bicycle"
+  element {
+    scale: 16
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+}
 cont {
   name: "amenity-charging_station-motorcar"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 76b55f52ee..456005ea68 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 cb8c3c6891..1e18247e4e 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -3799,6 +3799,74 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-charging_station-bicycle"
+  element {
+    scale: 16
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "charging-station-m"
+      priority: 16634
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15634
+    }
+  }
+}
 cont {
   name: "amenity-charging_station-motorcar"
   element {
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index 0d5fd81903..4f1d360341 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 a57339043a..e9253626de 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -939,6 +939,70 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-charging_station-bicycle"
+  element {
+    scale: 16
+    symbol {
+      name: "charging-station-m"
+      priority: 16927
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "charging-station-m"
+      priority: 16927
+    }
+    caption {
+      primary {
+        height: 13
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15927
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "charging-station-m"
+      priority: 16927
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15927
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "charging-station-m"
+      priority: 16927
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15927
+    }
+  }
+}
 cont {
   name: "amenity-charging_station-motorcar"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 575a5c9cb8..47fcd150e8 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 b78471562b..ac7b80ceb5 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -939,6 +939,70 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-charging_station-bicycle"
+  element {
+    scale: 16
+    symbol {
+      name: "charging-station-m"
+      priority: 16927
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 12
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "charging-station-m"
+      priority: 16927
+    }
+    caption {
+      primary {
+        height: 13
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15927
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "charging-station-m"
+      priority: 16927
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15927
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "charging-station-m"
+      priority: 16927
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15927
+    }
+  }
+}
 cont {
   name: "amenity-charging_station-motorcar"
   element {
diff --git a/data/types.txt b/data/types.txt
index 6b0bfa8445..69450d09b0 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -255,7 +255,7 @@ landuse|forest|deciduous
 mapswithme
 *piste:type|downhill|intermediate
 *railway|subway_entrance
-mapswithme
+*amenity|charging_station|bicycle
 *man_made|pipeline
 *route|ferry
 *highway|trunk_link|bridge
diff --git a/data/visibility.txt b/data/visibility.txt
index 2e3330c8dd..ef75548aca 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -43,6 +43,7 @@ world  00000000000000000000  +
         car_wash  00000000000000000111  -
         casino  00000000000000000000  -
         charging_station  00000000000000001111  +
+            bicycle  00000000000000001111  -
             motorcar  00000000000000111111  -
             {}
         childcare  00000000000000000000  -