Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 17258)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 17468)
@@ -1736,4 +1736,5 @@
 area[office=association],
 area[office=company],
+area[office=diplomatic],
 area[office=educational_institution],
 area[office=employment_agency],
@@ -1772,4 +1773,8 @@
 node[office=company] {
     icon-image: "presets/office/private_company.svg";
+    set icon_z17;
+}
+node[office=diplomatic] {
+    icon-image: "presets/office/diplomatic.svg";
     set icon_z17;
 }
@@ -2986,5 +2991,4 @@
 }
 area[amenity=townhall],
-area[amenity=embassy],
 area[amenity=community_centre] {
     fill-color: amenity_light#f7efb7;
@@ -2992,8 +2996,4 @@
 node[amenity=townhall] {
     icon-image: "presets/service/townhall.svg";
-    set icon_z17;
-}
-node[amenity=embassy] {
-    icon-image: "presets/service/embassy.svg";
     set icon_z17;
 }