diff --git a/data/classificator.txt b/data/classificator.txt
index a3747cf1a..2dd4cff2d 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -34,7 +34,9 @@ world  +
         bar  -
         bbq  -
         bench  -
-        bicycle_parking  -
+        bicycle_parking  +
+            covered  -
+            {}
         bicycle_rental  -
         bicycle_repair_station  -
         biergarten  -
@@ -84,6 +86,7 @@ world  +
         library  -
         loading_dock  -
         love_hotel  -
+        luggage_locker  -
         marketplace  -
         money_transfer  -
         motorcycle_parking  -
@@ -145,6 +148,7 @@ world  +
         pub  -
         public_bath  -
         public_bookcase  -
+        ranger_station  -
         recycling  +
             centre  -
             container  -
@@ -883,6 +887,9 @@ world  +
         town  -
         village  -
         {}
+    post_office  +
+        post_partner  -
+        {}
     power  +
         generator  +
             gas  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 4ab1b7e11..85749ed9b 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 d8992c3c4..c5bf7f970 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3604,6 +3604,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 17
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "amenity-bicycle_rental"
   element {
@@ -7769,6 +7836,55 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-luggage_locker"
+  element {
+    scale: 17
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -12380,6 +12496,128 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-ranger_station"
+  element {
+    scale: 14
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+}
 cont {
   name: "amenity-recycling"
   element {
@@ -67996,7 +68234,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68005,7 +68243,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -68016,7 +68254,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68025,7 +68263,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -68036,7 +68274,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68045,7 +68283,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -68056,7 +68294,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68065,7 +68303,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
 }
@@ -76502,6 +76740,57 @@ cont {
     }
   }
 }
+cont {
+  name: "post_office-post_partner"
+  element {
+    scale: 18
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+}
 cont {
   name: "power-generator"
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index a4330bd63..1992ca982 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 b24701c75..3014def41 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -3572,6 +3572,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 17
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "amenity-bicycle_rental"
   element {
@@ -7581,6 +7648,55 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-luggage_locker"
+  element {
+    scale: 17
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -11956,6 +12072,111 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-ranger_station"
+  element {
+    scale: 15
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+}
 cont {
   name: "amenity-recycling"
   element {
@@ -63599,7 +63820,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -63608,7 +63829,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -63618,7 +63839,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -63627,7 +63848,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -63637,7 +63858,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -63646,7 +63867,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -63656,7 +63877,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -63665,7 +63886,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
 }
@@ -71428,6 +71649,57 @@ cont {
     }
   }
 }
+cont {
+  name: "post_office-post_partner"
+  element {
+    scale: 18
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+}
 cont {
   name: "power-generator"
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 57fa60021..e3641662b 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 d5e135bf6..65dc98463 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -3572,6 +3572,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 17
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "amenity-bicycle_rental"
   element {
@@ -7611,6 +7678,55 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-luggage_locker"
+  element {
+    scale: 17
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -12078,6 +12194,111 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-ranger_station"
+  element {
+    scale: 15
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+}
 cont {
   name: "amenity-recycling"
   element {
@@ -63653,7 +63874,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -63662,7 +63883,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -63673,7 +63894,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -63682,7 +63903,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -63693,7 +63914,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -63702,7 +63923,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -63713,7 +63934,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -63722,7 +63943,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
 }
@@ -71496,6 +71717,57 @@ cont {
     }
   }
 }
+cont {
+  name: "post_office-post_partner"
+  element {
+    scale: 18
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+}
 cont {
   name: "power-generator"
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 26909b42e..bcbf5df28 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 e62f197d8..1b745ce8a 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -3595,6 +3595,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 17
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "amenity-bicycle_rental"
   element {
@@ -7723,6 +7790,55 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-luggage_locker"
+  element {
+    scale: 17
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -12098,6 +12214,128 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-ranger_station"
+  element {
+    scale: 14
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+}
 cont {
   name: "amenity-recycling"
   element {
@@ -67944,7 +68182,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -67953,7 +68191,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -67963,7 +68201,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -67972,7 +68210,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -67982,7 +68220,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -67991,7 +68229,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -68001,7 +68239,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68010,7 +68248,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
 }
@@ -76471,6 +76709,57 @@ cont {
     }
   }
 }
+cont {
+  name: "post_office-post_partner"
+  element {
+    scale: 18
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 9211020
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+}
 cont {
   name: "power-generator"
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 7aa70c666..d2affef34 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 d59de2229..e9ecbbd9e 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -3595,6 +3595,73 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-bicycle_parking-covered"
+  element {
+    scale: 17
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "bicycle-parking-covered-m"
+      priority: 250
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9750
+    }
+  }
+}
 cont {
   name: "amenity-bicycle_rental"
   element {
@@ -7753,6 +7820,55 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-luggage_locker"
+  element {
+    scale: 17
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "luggage_locker-m"
+      priority: 450
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9550
+    }
+  }
+}
 cont {
   name: "amenity-marketplace"
   element {
@@ -12220,6 +12336,128 @@ cont {
     }
   }
 }
+cont {
+  name: "amenity-ranger_station"
+  element {
+    scale: 14
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "ranger-station-m"
+      priority: 4400
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -5600
+    }
+  }
+}
 cont {
   name: "amenity-recycling"
   element {
@@ -67998,7 +68236,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68007,7 +68245,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -68018,7 +68256,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68027,7 +68265,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -68038,7 +68276,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68047,7 +68285,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
   element {
@@ -68058,7 +68296,7 @@ cont {
     }
     symbol {
       name: "embassy-m"
-      priority: 500
+      priority: 2450
     }
     caption {
       primary {
@@ -68067,7 +68305,7 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: -9500
+      priority: -7550
     }
   }
 }
@@ -76539,6 +76777,57 @@ cont {
     }
   }
 }
+cont {
+  name: "post_office-post_partner"
+  element {
+    scale: 18
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mail-m"
+      priority: 470
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9530
+    }
+  }
+}
 cont {
   name: "power-generator"
   element {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index da60f4779..8ac5ad005 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 88e561f53..35962ce9f 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -44083,6 +44083,57 @@ cont {
     }
   }
 }
+cont {
+  name: "post_office-post_partner"
+  element {
+    scale: 18
+    symbol {
+      name: "mail-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mail-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mail-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 11
+        color: 6710886
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+}
 cont {
   name: "power-generator"
   element {
diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin
index 105b6d45f..4fb1af8b9 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 d24e3eb5b..1e66199eb 100644
--- a/data/drules_proto_vehicle_light.txt
+++ b/data/drules_proto_vehicle_light.txt
@@ -43587,6 +43587,57 @@ cont {
     }
   }
 }
+cont {
+  name: "post_office-post_partner"
+  element {
+    scale: 18
+    symbol {
+      name: "mail-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "mail-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+  element {
+    scale: 20
+    symbol {
+      name: "mail-m"
+      priority: 200
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: -9800
+    }
+  }
+}
 cont {
   name: "power-generator"
   element {
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 873f5e691..93c501aa2 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -357,10 +357,10 @@ railway-subway_entrance-moscow                      # icon z15- (also has captio
 railway-subway_entrance-spb                         # icon z15- (also has caption(optional) z16-)
 === 4450
 
+amenity-ranger_station                              # icon z15- (also has caption(optional) z15-)
 historic-monument                                   # icon z13- (also has caption(optional) z13-)
 tourism-information-office                          # icon z15- (also has caption(optional) z15-)
 tourism-information-visitor_centre                  # icon z15- (also has caption(optional) z15-)
-amenity-ranger_station
 === 4400
 
 amenity-community_centre                            # icon z15- (also has caption(optional) z15-)
@@ -805,7 +805,6 @@ amenity-cinema                                      # icon z17- (also has captio
 amenity-fountain                                    # icon z16- (also has caption(optional) z16-, area z16-)
 amenity-nightclub                                   # icon z16- (also has caption(optional) z16-)
 amenity-post_office                                 # icon z17- (also has caption(optional) z17-)
-office-diplomatic
 attraction-amusement_ride                           # icon z17- (also has caption(optional) z17-)
 attraction-animal                                   # icon z17- (also has caption(optional) z17-)
 attraction-big_wheel                                # icon z17- (also has caption(optional) z17-)
@@ -822,6 +821,7 @@ landuse-plant_nursery                               # icon z17- (also has captio
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
 leisure-swimming_pool                               # icon z17- (also has caption(optional) z17-, area z13-)
+office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 tourism-zoo-petting                                 # icon z15- (also has caption(optional) z15-)
 === 2450
 
@@ -1177,11 +1177,11 @@ shop-watches                                        # icon z18- (also has captio
 shop-wholesale                                      # icon z18- (also has caption(optional) z18-)
 === 500
 
-post_office-post_partner
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
 amenity-toilets                                     # icon z18- (also has caption(optional) z18-)
 man_made-embankment                                 # pathtext z18- (also has line z16-)
 office                                              # icon z18- (also has caption(optional) z18-)
+post_office-post_partner                            # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
 
@@ -1514,10 +1514,10 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-subway_entrance-spb                       # caption(optional) z16- (also has icon z15-)
 # === -5550
 
+# amenity-ranger_station                            # caption(optional) z15- (also has icon z15-)
 # historic-monument                                 # caption(optional) z13- (also has icon z13-)
 # tourism-information-office                        # caption(optional) z15- (also has icon z15-)
 # tourism-information-visitor_centre                # caption(optional) z15- (also has icon z15-)
-# amenity-ranger_station
 # === -5600
 
 # amenity-community_centre                          # caption(optional) z15- (also has icon z15-)
@@ -1800,6 +1800,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-bowling_alley                             # caption(optional) z17- (also has icon z17-)
 # leisure-garden                                    # caption(optional) z16- (also has icon z16-, area z12-)
 # leisure-swimming_pool                             # caption(optional) z17- (also has icon z17-, area z13-)
+# office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # tourism-zoo-petting                               # caption(optional) z15- (also has icon z15-)
 # === -7550
 
@@ -2087,7 +2088,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
-# office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
 # shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
@@ -2117,6 +2117,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shower                                    # caption(optional) z17- (also has icon z17-)
 # amenity-toilets                                   # caption(optional) z18- (also has icon z18-)
 # office                                            # caption(optional) z18- (also has icon z18-)
+# post_office-post_partner                          # caption(optional) z18- (also has icon z18-)
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
 
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 3d81a6343..43f7c7e77 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -357,10 +357,10 @@ railway-subway_entrance-moscow                      # icon z15- (also has captio
 railway-subway_entrance-spb                         # icon z15- (also has caption(optional) z16-)
 === 4450
 
+amenity-ranger_station                              # icon z14- (also has caption(optional) z14-)
 historic-monument                                   # icon z13- (also has caption(optional) z13-)
 tourism-information-office                          # icon z13- (also has caption(optional) z14-)
 tourism-information-visitor_centre                  # icon z13- (also has caption(optional) z14-)
-amenity-ranger_station
 === 4400
 
 amenity-community_centre                            # icon z15- (also has caption(optional) z15-)
@@ -805,7 +805,6 @@ amenity-cinema                                      # icon z17- (also has captio
 amenity-fountain                                    # icon z16- (also has caption(optional) z16-, area z16-)
 amenity-nightclub                                   # icon z16- (also has caption(optional) z16-)
 amenity-post_office                                 # icon z17- (also has caption(optional) z17-)
-office-diplomatic
 attraction-amusement_ride                           # icon z17- (also has caption(optional) z17-)
 attraction-animal                                   # icon z17- (also has caption(optional) z17-)
 attraction-big_wheel                                # icon z17- (also has caption(optional) z17-)
@@ -822,6 +821,7 @@ landuse-plant_nursery                               # icon z17- (also has captio
 leisure-bowling_alley                               # icon z17- (also has caption(optional) z17-)
 leisure-garden                                      # icon z16- (also has caption(optional) z16-, area z12-)
 leisure-swimming_pool                               # icon z17- (also has caption(optional) z17-, area z13-)
+office-diplomatic                                   # icon z17- (also has caption(optional) z17-, area z15-)
 tourism-zoo-petting                                 # icon z15- (also has caption(optional) z15-)
 === 2450
 
@@ -1178,11 +1178,11 @@ shop-watches                                        # icon z18- (also has captio
 shop-wholesale                                      # icon z18- (also has caption(optional) z18-)
 === 500
 
-post_office-post_partner
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
 amenity-toilets                                     # icon z15- (also has caption(optional) z18-)
 man_made-embankment                                 # pathtext z18- (also has line z16-)
 office                                              # icon z18- (also has caption(optional) z18-)
+post_office-post_partner                            # icon z18- (also has caption(optional) z18-)
 shop                                                # icon z18- (also has caption(optional) z18-)
 === 470
 
@@ -1517,10 +1517,10 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # railway-subway_entrance-spb                       # caption(optional) z16- (also has icon z15-)
 # === -5550
 
+# amenity-ranger_station                            # caption(optional) z14- (also has icon z14-)
 # historic-monument                                 # caption(optional) z13- (also has icon z13-)
 # tourism-information-office                        # caption(optional) z14- (also has icon z13-)
 # tourism-information-visitor_centre                # caption(optional) z14- (also has icon z13-)
-# amenity-ranger_station
 # === -5600
 
 # amenity-community_centre                          # caption(optional) z15- (also has icon z15-)
@@ -1803,6 +1803,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-bowling_alley                             # caption(optional) z17- (also has icon z17-)
 # leisure-garden                                    # caption(optional) z16- (also has icon z16-, area z12-)
 # leisure-swimming_pool                             # caption(optional) z17- (also has icon z17-, area z13-)
+# office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # tourism-zoo-petting                               # caption(optional) z15- (also has icon z15-)
 # === -7550
 
@@ -2091,7 +2092,6 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # leisure-adult_gaming_centre                       # caption(optional) z17- (also has icon z17-)
 # leisure-amusement_arcade                          # caption(optional) z17- (also has icon z17-)
 # office-company                                    # caption(optional) z18- (also has icon z18-)
-# office-diplomatic                                 # caption(optional) z17- (also has icon z17-, area z15-)
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
 # shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
@@ -2121,6 +2121,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # amenity-shower                                    # caption(optional) z17- (also has icon z17-)
 # amenity-toilets                                   # caption(optional) z18- (also has icon z15-)
 # office                                            # caption(optional) z18- (also has icon z18-)
+# post_office-post_partner                          # caption(optional) z18- (also has icon z18-)
 # shop                                              # caption(optional) z18- (also has icon z18-)
 # === -9530
 
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 27c86230f..76e0f2c0c 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -723,8 +723,8 @@ amenity-parcel_locker                               # icon z17- (also has captio
 amenity-police                                      # icon z17-
 amenity-post_office                                 # icon z17- (also has caption(optional) z17-)
 amenity-toilets                                     # icon z17- (also has caption(optional) z17-)
-shop-motorcycle
-post_office-post_partner
+post_office-post_partner                            # icon z18- (also has caption(optional) z18-)
+shop-motorcycle                                     # icon z17-
 === 200
 
 highway-traffic_signals                             # icon z15-
@@ -1205,6 +1205,7 @@ entrance-main                                       # icon z18- (also has captio
 # amenity-parcel_locker                             # caption(optional) z17- (also has icon z17-)
 # amenity-post_office                               # caption(optional) z17- (also has icon z17-)
 # amenity-toilets                                   # caption(optional) z17- (also has icon z17-)
+# post_office-post_partner                          # caption(optional) z18- (also has icon z18-)
 # === -9800
 
 # leisure-park-no-access                            # caption(optional) z14- (also has icon z14-, area z10-)
diff --git a/data/types.txt b/data/types.txt
index 4f3ba3bfc..5505a3cae 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -487,7 +487,7 @@ mapswithme
 *leisure|park|permissive
 *highway|bridleway|tunnel
 *highway|motorway_link|tunnel
-*leisure|escape_game
+mapswithme
 mapswithme
 mapswithme
 *highway|tertiary_link|bridge
@@ -1622,3 +1622,8 @@ amenity|recycling|container
 *shop|hearing_aids
 *railway|station|subway|qingdao
 *railway|subway_entrance|qingdao
+*amenity|bicycle_parking|covered
+*post_office|post_partner
+*amenity|ranger_station
+*leisure|escape_game
+*amenity|luggage_locker
diff --git a/data/visibility.txt b/data/visibility.txt
index 413d3aa5e..505978c60 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -34,7 +34,9 @@ world  000000000000000000000  +
         bar  000000000000000000000  -
         bbq  000000000000000000000  -
         bench  000000000000000000000  -
-        bicycle_parking  000000000000000000000  -
+        bicycle_parking  000000000000000000000  +
+            covered  000000000000000000000  -
+            {}
         bicycle_rental  000000000000000000000  -
         bicycle_repair_station  000000000000000000000  -
         biergarten  000000000000000000000  -
@@ -84,6 +86,7 @@ world  000000000000000000000  +
         library  000000000000000000000  -
         loading_dock  000000000000000000011  -
         love_hotel  000000000000000000000  -
+        luggage_locker  000000000000000000000  -
         marketplace  000000000000000000000  -
         money_transfer  000000000000000000000  -
         motorcycle_parking  000000000000000001111  -
@@ -145,6 +148,7 @@ world  000000000000000000000  +
         pub  000000000000000011111  -
         public_bath  000000000000000000000  -
         public_bookcase  000000000000000000000  -
+        ranger_station  000000000000000000000  -
         recycling  000000000000000000000  +
             centre  000000000000000000000  -
             container  000000000000000000000  -
@@ -883,6 +887,9 @@ world  000000000000000000000  +
         town  000000001111111111111  -
         village  000000000001111111111  -
         {}
+    post_office  000000000000000000000  +
+        post_partner  000000000000000000111  -
+        {}
     power  000000000000000000000  +
         generator  000000000000000111111  +
             gas  000000000000000111111  -