diff --git a/android/app/src/main/res/values/types_strings.xml b/android/app/src/main/res/values/types_strings.xml
index 83bfe993d..bac0e256e 100644
--- a/android/app/src/main/res/values/types_strings.xml
+++ b/android/app/src/main/res/values/types_strings.xml
@@ -129,6 +129,7 @@
Police
Mailbox
Post Office
+ Post Partner
Prison
Pub
Book Exchange
diff --git a/data/categories.txt b/data/categories.txt
index f00f5310f..6b49373ee 100644
--- a/data/categories.txt
+++ b/data/categories.txt
@@ -6606,7 +6606,7 @@ sk:3Poštová schránka|3schránka
sw:Sanduku la posta
fa:صندوق پست
-amenity-post_office|@category_post
+amenity-post_office|post_office-post_partner|@category_post
en:3Post Office|U+2709|U+1F3E3|U+1F4E8|U+1F4E9|U+1F3E4|U+1F4EF
ru:3Почтовое отделение
be:3Паштовае аддзяленне
diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv
index 1f85a324a..f761d44cf 100644
--- a/data/mapcss-mapping.csv
+++ b/data/mapcss-mapping.csv
@@ -1747,3 +1747,4 @@ shop|hearing_aids;1622;
railway|station|subway|qingdao;[railway=station][transport=subway][city=qingdao],[railway=station][station=subway][city=qingdao];;name;int_name;1623;
railway|subway_entrance|qingdao;[railway=subway_entrance][city=qingdao];;name;int_name;1624;
amenity|bicycle_parking|covered;[amenity=bicycle_parking][covered=yes];;;;1625;
+post_office|post_partner;1626;
diff --git a/data/styles/default/include/Icons.mapcss b/data/styles/default/include/Icons.mapcss
index 88aada9d4..3de83e846 100644
--- a/data/styles/default/include/Icons.mapcss
+++ b/data/styles/default/include/Icons.mapcss
@@ -800,6 +800,7 @@ node|z17-[amenity=motorcycle_rental],
node|z17-[amenity=bicycle_rental],
node|z17-[amenity=bicycle_repair_station],
node|z17-[amenity=post_office],
+node|z18-[post_office=post_partner],
node|z17-[man_made=works],
node|z17-[amenity=parcel_locker],
node|z17-[amenity=public_bath],
@@ -1292,8 +1293,10 @@ node|z18-[amenity=bicycle_repair_station],
{font-size: 11;}
node|z17-[amenity=post_office],
+node|z18-[post_office=post_partner],
{icon-image: mail-m.svg;}
node|z18-[amenity=post_office],
+node|z18-[post_office=post_partner],
{font-size: 11;}
node|z18-[amenity=post_box],
{icon-image: postbox-m.svg;font-size: 11;}
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index e84c3b282..85326a153 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1176,6 +1176,7 @@ 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-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 4e400d5d6..3f1e1d094 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1177,6 +1177,7 @@ 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-)
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index e3748e820..218788083 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -530,6 +530,8 @@ node|z17-[amenity=parcel_locker],
area|z17-[amenity=parcel_locker],
node|z17-[amenity=post_office],
area|z17-[amenity=post_office],
+node|z18-[post_office=post_partner],
+area|z18-[post_office=post_partner],
{text: name;text-color: @poi_label;text-offset: 1;font-size: 11;}
/* POI */
@@ -678,9 +680,13 @@ area|z17-[amenity=parcel_locker],
node|z17-[amenity=post_office],
area|z17-[amenity=post_office],
+node|z18-[post_office=post_partner],
+area|z18-[post_office=post_partner],
{icon-image: mail-m.svg;}
node|z18-[amenity=post_office],
area|z18-[amenity=post_office],
+node|z18-[post_office=post_partner],
+area|z18-[post_office=post_partner],
{font-size: 11;}
/* 6. SHOP */
diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
index 582060cb4..27c86230f 100644
--- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt
+++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt
@@ -723,7 +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 # icon z17-
+shop-motorcycle
+post_office-post_partner
=== 200
highway-traffic_signals # icon z15-
diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
index 83e766ac8..a6c700320 100644
--- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
+++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings
@@ -132,6 +132,7 @@
"type.amenity.police" = "Police";
"type.amenity.post_box" = "Mailbox";
"type.amenity.post_office" = "Post Office";
+"type.post_office.post_partner" = "Post Partner";
"type.amenity.prison" = "Prison";
"type.amenity.pub" = "Pub";
"type.amenity.public_bookcase" = "Book Exchange";