diff --git a/data/classificator.txt b/data/classificator.txt
index c60bc3caae..f06b49867e 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -86,6 +86,7 @@ world  +
         marketplace  -
         money_transfer  -
         motorcycle_parking  -
+        motorcycle_rental  -
         music_school  -
         nightclub  -
         nursing_home  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 70b4c4df44..2d42a39b0e 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 84305e5227..395dfbc17f 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -7674,6 +7674,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-motorcycle_rental"
+  element {
+    scale: 17
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+}
 cont {
   name: "amenity-music_school"
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index dbc81ebb5e..c3d886cffb 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index c292431800..1d9579e7df 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -7516,6 +7516,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-motorcycle_rental"
+  element {
+    scale: 17
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+}
 cont {
   name: "amenity-music_school"
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 0f7cc76ad3..e979141227 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index d530faed13..746f61f01e 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -7516,6 +7516,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-motorcycle_rental"
+  element {
+    scale: 17
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+}
 cont {
   name: "amenity-music_school"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 2a522f87f1..06285bc01b 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 2d797f1462..56f0edd1c7 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -7667,6 +7667,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-motorcycle_rental"
+  element {
+    scale: 17
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+}
 cont {
   name: "amenity-music_school"
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 93f4a76550..edc607b653 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 1dae4b09de..a9e01b2821 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -7667,6 +7667,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-motorcycle_rental"
+  element {
+    scale: 17
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7500
+    }
+  }
+}
 cont {
   name: "amenity-music_school"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 5ca7fcbacd..94daed3e8c 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 f703d3d5bc..6868d3d5a5 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -2104,6 +2104,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-motorcycle_rental"
+  element {
+    scale: 18
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2400
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2400
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2400
+    }
+    caption {
+      primary {
+        height: 14
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7600
+    }
+  }
+}
 cont {
   name: "amenity-parcel_locker"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 75dd50bdae..2c48ecaab0 100644
Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ
diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt
index 40ca123bc5..ebd0602336 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -2104,6 +2104,57 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-motorcycle_rental"
+  element {
+    scale: 18
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2400
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2400
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "motorcycle_rental-m"
+      priority: 2400
+    }
+    caption {
+      primary {
+        height: 14
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -7600
+    }
+  }
+}
 cont {
   name: "amenity-parcel_locker"
   element {
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index b7c4487202..2f7063ee5d 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -795,7 +795,7 @@ shop-seafood                                        # icon z16- (also has captio
 aeroway-helipad                                     # icon z16- (also has caption(optional) z16-)
 amenity-bicycle_repair_station                      # icon z17- (also has caption(optional) z17-)
 amenity-car_rental                                  # icon z18- (also has caption(optional) z18-)
-amenity-motorcycle_rental
+amenity-motorcycle_rental                           # icon z17- (also has caption(optional) z17-)
 === 2500
 
 amenity-cinema                                      # icon z17- (also has caption(optional) z17-)
@@ -1759,6 +1759,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # aeroway-helipad                                   # caption(optional) z16- (also has icon z16-)
 # amenity-bicycle_repair_station                    # caption(optional) z17- (also has icon z17-)
 # amenity-car_rental                                # caption(optional) z18- (also has icon z18-)
+# amenity-motorcycle_rental                         # caption(optional) z17- (also has icon z17-)
 # === -7500
 
 # amenity-cinema                                    # caption(optional) z17- (also has icon z17-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 1831c80cbc..44ecc64d12 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -795,7 +795,7 @@ shop-seafood                                        # icon z16- (also has captio
 aeroway-helipad                                     # icon z16- (also has caption(optional) z16-)
 amenity-bicycle_repair_station                      # icon z17- (also has caption(optional) z17-)
 amenity-car_rental                                  # icon z18- (also has caption(optional) z18-)
-amenity-motorcycle_rental
+amenity-motorcycle_rental                           # icon z17- (also has caption(optional) z17-)
 === 2500
 
 amenity-cinema                                      # icon z17- (also has caption(optional) z17-)
@@ -1760,6 +1760,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # aeroway-helipad                                   # caption(optional) z16- (also has icon z16-)
 # amenity-bicycle_repair_station                    # caption(optional) z17- (also has icon z17-)
 # amenity-car_rental                                # caption(optional) z18- (also has icon z18-)
+# amenity-motorcycle_rental                         # caption(optional) z17- (also has icon z17-)
 # === -7500
 
 # amenity-cinema                                    # caption(optional) z17- (also has icon z17-)
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 6e60221e78..e268d4e9c5 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -277,7 +277,7 @@ historic-fort                                       # icon z12- (also has captio
 
 amenity-car_rental                                  # icon z18- (also has caption(optional) z18-)
 amenity-car_sharing                                 # icon z18- (also has caption(optional) z18-)
-amenity-motorcycle_rental
+amenity-motorcycle_rental                           # icon z18- (also has caption(optional) z18-)
 shop-car                                            # icon z17-
 === 2400
 
@@ -831,6 +831,7 @@ entrance-main                                       # icon z18- (also has captio
 
 # amenity-car_rental                                # caption(optional) z18- (also has icon z18-)
 # amenity-car_sharing                               # caption(optional) z18- (also has icon z18-)
+# amenity-motorcycle_rental                         # caption(optional) z18- (also has icon z18-)
 # === -7600
 
 # leisure-park                                      # caption(optional) z14- (also has icon z14-, area z10-)
diff --git a/data/types.txt b/data/types.txt
index fa0f076c4a..0e7bbc71f9 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -902,7 +902,7 @@ mapswithme
 railway|subway|tunnel
 mapswithme
 railway|subway|tunnel
-mapswithme
+*amenity|motorcycle_rental
 railway|subway|tunnel
 *place|quarter
 railway|subway|tunnel
diff --git a/data/visibility.txt b/data/visibility.txt
index 896e9b5287..91579725a6 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -86,6 +86,7 @@ world  000000000000000000000  +
         marketplace  000000000000000000000  -
         money_transfer  000000000000000000000  -
         motorcycle_parking  000000000000000001111  -
+        motorcycle_rental  000000000000000000111  -
         music_school  000000000000000000000  -
         nightclub  000000000000000000000  -
         nursing_home  000000000000000000000  -