diff --git a/data/classificator.txt b/data/classificator.txt
index b97a9e8085..c532ebcf50 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -117,6 +117,9 @@ world  +
         vending_machine  +
             cigarettes  -
             drinks  -
+            excrement_bags  -
+            fuel  -
+            parcel_pickup  -
             parking_tickets  -
             public_transport_tickets  -
             {}
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 1b8b7f34b7..85fd6beb00 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 214d73ef4c..ab54c31b77 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -8230,6 +8230,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -8332,6 +8383,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
@@ -35052,34 +35256,68 @@ cont {
 cont {
   name: "leisure-marina"
   element {
-    scale: 17
+    scale: 16
+    symbol {
+      name: "marina-m"
+      priority: 16122
+      min_distance: 30
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
       }
+      priority: 15122
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
       priority: 15051
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 90fc4b7b55..7ab8f3b674 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 6d5d56d432..143f664cb3 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -8164,6 +8164,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -8266,6 +8317,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
@@ -34858,34 +35062,68 @@ cont {
 cont {
   name: "leisure-marina"
   element {
-    scale: 17
+    scale: 16
+    symbol {
+      name: "marina-m"
+      priority: 16122
+      min_distance: 30
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
       }
+      priority: 15122
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
       priority: 15051
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 863d86e827..60f4cc08f2 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 9dc6fbd3ac..c5badc4590 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -8164,6 +8164,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -8266,6 +8317,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16622
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15622
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
@@ -35034,34 +35238,68 @@ cont {
 cont {
   name: "leisure-marina"
   element {
-    scale: 17
+    scale: 16
+    symbol {
+      name: "marina-m"
+      priority: 16122
+      min_distance: 30
+    }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
       }
+      priority: 15122
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
       priority: 15051
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "marina-m"
+      priority: 16051
+      min_distance: 20
+    }
     caption {
       primary {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
       priority: 15051
     }
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index bc3c2cd8d4..b55750c45b 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 3a48be95d5..3734ca4037 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -3453,6 +3453,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -3555,6 +3606,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index 0551350d50..eefa8fe6af 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 41aeb5f63a..0e739239d7 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -3453,6 +3453,57 @@ cont {
     apply_if: "!name"
   }
 }
+cont {
+  name: "amenity-vending_machine"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-cigarettes"
   element {
@@ -3555,6 +3606,159 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-vending_machine-excrement_bags"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-fuel"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
+cont {
+  name: "amenity-vending_machine-parcel_pickup"
+  element {
+    scale: 17
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "vending-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+      }
+      priority: 15300
+    }
+  }
+}
 cont {
   name: "amenity-vending_machine-parking_tickets"
   element {
diff --git a/data/types.txt b/data/types.txt
index c0cd360dd5..7dd332f582 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -1080,14 +1080,14 @@ mapswithme
 *highway|rest_area
 *highway|traffic_signals
 *leisure|fitness_centre
-mapswithme
-mapswithme
+*amenity|vending_machine|excrement_bags
+*amenity|vending_machine|parcel_pickup
 *leisure|sauna
-mapswithme
+*amenity|vending_machine|fuel
 *man_made|chimney
 *man_made|tower
 *man_made|water_well
-mapswithme
+*amenity|vending_machine
 *shop|bookmaker
 *shop|car_repair|tyres
 *shop|cosmetics
diff --git a/data/visibility.txt b/data/visibility.txt
index aadda5dfc8..83f8c56bd3 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -114,9 +114,12 @@ world  00000000000000000000  +
         toilets  00000000000000000000  -
         townhall  00000000000000000000  -
         university  00000000000000011111  -
-        vending_machine  00000000000000000000  +
+        vending_machine  00000000000000000111  +
             cigarettes  00000000000000000111  -
             drinks  00000000000000000111  -
+            excrement_bags  00000000000000000111  -
+            fuel  00000000000000000111  -
+            parcel_pickup  00000000000000000111  -
             parking_tickets  00000000000000000111  -
             public_transport_tickets  00000000000000000111  -
             {}