diff --git a/project.mml b/project.mml
index 2a7708949e..0b34b673c2 100644
--- a/project.mml
+++ b/project.mml
@@ -1476,7 +1476,7 @@ Layer:
                 'amenity_' || CASE WHEN amenity IN ('arts_centre', 'atm', 'bank', 'bar', 'bbq', 'bicycle_rental',
                                                     'bicycle_repair_station','biergarten', 'boat_rental', 'bureau_de_change', 'bus_station', 'cafe',
                                                     'car_rental', 'car_wash', 'casino', 'charging_station', 'childcare', 'cinema', 'clinic', 'college',
-                                                    'community_centre', 'courthouse', 'dentist', 'doctors', 'drinking_water', 'driving_school', 'embassy',
+                                                    'community_centre', 'courthouse', 'dentist', 'doctors', 'drinking_water', 'driving_school',
                                                     'fast_food', 'ferry_terminal', 'fire_station', 'food_court', 'fountain', 'fuel', 'grave_yard',
                                                     'hospital', 'hunting_stand', 'ice_cream', 'internet_cafe', 'kindergarten', 'library', 'marketplace',
                                                     'nightclub', 'nursing_home', 'pharmacy', 'place_of_worship', 'police', 'post_box',
@@ -1485,6 +1485,7 @@ Layer:
                                                     'university', 'vehicle_inspection', 'veterinary') THEN amenity END,
                 'amenity_' || CASE WHEN amenity IN ('waste_disposal') AND way_area IS NOT NULL THEN amenity END, -- Waste disposal points are rendered in the low priority layer
                 'amenity_' || CASE WHEN amenity IN ('vending_machine') AND tags->'vending' IN ('excrement_bags', 'parking_tickets', 'public_transport_tickets') THEN amenity END,
+                'diplomatic_'|| CASE WHEN tags->'office' IN ('diplomatic') AND tags->'diplomatic' IN ('embassy', 'consulate') THEN tags->'diplomatic' ELSE NULL END,
                 'advertising_' || CASE WHEN tags->'advertising' in ('column') THEN tags->'advertising' END,
                 'emergency_' || CASE WHEN tags->'emergency' IN ('phone') AND way_area IS NULL THEN tags->'emergency' END,
                 'shop' || CASE WHEN shop IN ('yes', 'no', 'vacant', 'closed', 'disused', 'empty') OR shop IS NULL THEN NULL ELSE '' END,
diff --git a/style/amenity-points.mss b/style/amenity-points.mss
index 136f20c4d7..bbf3ea555c 100644
--- a/style/amenity-points.mss
+++ b/style/amenity-points.mss
@@ -396,12 +396,6 @@
       marker-clip: false;
   }
 
-  [feature = 'amenity_embassy'][zoom >= 17] {
-    marker-file: url('symbols/amenity/embassy.svg');
-    marker-fill: @public-service;
-    marker-clip: false;
-  }
-
   [feature = 'amenity_library'][zoom >= 16] {
     marker-file: url('symbols/amenity/library.svg');
     marker-fill: @culture;
@@ -1202,6 +1196,18 @@
     marker-fill: @office;
   }
 
+  [feature = 'diplomatic_embassy'][zoom >= 17] {
+    marker-file: url('symbols/office/embassy.svg');
+    marker-fill: @office;
+    marker-clip: false;
+  }
+
+  [feature = 'diplomatic_consulate'][zoom >= 17] {
+    marker-file: url('symbols/office/consulate.svg');
+    marker-fill: @office;
+    marker-clip: false;
+  }
+
   [feature = 'leisure_water_park'][zoom >= 17],
   [feature = 'leisure_sports_centre'][sport = 'swimming'][zoom >= 17],
   [feature = 'leisure_swimming_area'][zoom >= 17] {
@@ -1730,7 +1736,6 @@
   [feature = 'amenity_fire_station'][zoom >= 17],
   [feature = 'amenity_post_office'][zoom >= 17],
   [feature = 'amenity_prison'][zoom >= 17],
-  [feature = 'amenity_embassy'][zoom >= 17],
   [feature = 'amenity_bank'][zoom >= 17] {
     text-name: "[name]";
     text-size: @standard-font-size;
@@ -1741,7 +1746,6 @@
     [feature = 'amenity_courthouse'] { text-dy: 13; }
     [feature = 'amenity_townhall'] { text-dy: 13; }
     [feature = 'amenity_prison'] { text-dy: 12; }
-    [feature = 'amenity_embassy'] { text-dy: 10; }
     [feature = 'amenity_bank'] { text-dy: 9; }
     text-face-name: @standard-font;
     text-halo-radius: @standard-halo-radius;
@@ -2672,6 +2676,21 @@
     }
   }
 
+  [feature = 'diplomatic_embassy'],
+  [feature = 'diplomatic_consulate'] {
+    [zoom >= 17] {
+      text-name: "[name]";
+      text-size: @standard-font-size;
+      text-wrap-width: @standard-wrap-width;
+      text-line-spacing: @standard-line-spacing-size;
+      text-dy: 10;
+      text-fill: @office;
+      text-face-name: @standard-font;
+      text-halo-radius: @standard-halo-radius;
+      text-halo-fill: rgba(255, 255, 255, 0.6);
+    }
+  }
+
   [feature = 'shop_supermarket'],
   [feature = 'shop_department_store'] {
     [zoom >= 16] {
diff --git a/symbols/office/consulate.svg b/symbols/office/consulate.svg
new file mode 100644
index 0000000000..a30e894468
--- /dev/null
+++ b/symbols/office/consulate.svg
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   id="svg4"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="path3887-3"
+     d="m 2.5,-1.3e-7 c -0.25,0 -0.5,0.221572 -0.5,0.666016 V 11.333984 c 0,0.888888 1,0.888888 1,0 V 0.66601587 C 3,0.22157187 2.75,-1.3e-7 2.5,-1.3e-7 Z m 6.1347661,0.0059 c -0.514161,-0.03826 -1.1535161,0.08454 -1.8847661,0.574219 -1.95,1.30581203 -3.25,0 -3.25,0 V 5.1504319 c 0,0 1.3,1.305811 3.25,0 1.9500001,-1.3058131 3.25,0 3.25,0 V 0.58011887 c 0,0 -0.508301,-0.510458 -1.3652339,-0.574219 z M 9.5,5.9999999 a 1.5,1.5 0 0 0 -1.5,1.5 1.5,1.5 0 0 0 1.5,1.5 1.5,1.5 0 0 0 1.5,-1.5 1.5,1.5 0 0 0 -1.5,-1.5 z m 0.828125,3.509766 c -0.129799,-0.01707 -0.26298,-0.0091 -0.3945311,0.02539 -0.1632798,0.0428 -0.2925939,0.13083 -0.4023439,0.236328 -0.01244,0.01053 -0.02745,0.0154 -0.03906,0.02734 L 7.833986,11.503902 6.025393,12.013668 c -0.266643,0.07505 -0.420754,0.348596 -0.345703,0.615234 0.07505,0.266643 0.350549,0.420753 0.617187,0.345703 L 8.220705,12.43359 c 0.01754,-0.0049 0.03034,-0.01684 0.04687,-0.02344 0.03211,-0.01089 0.06004,-0.02927 0.08984,-0.04687 0.01916,-0.01265 0.03963,-0.02215 0.05664,-0.03711 0.01708,-0.01352 0.03712,-0.02105 0.05273,-0.03711 L 9.4843631,11.242186 10,14 h 2 L 11.201172,10.214844 C 11.068723,9.8289579 10.717524,9.5609659 10.328125,9.5097659 Z"
+     style="fill:#000000;fill-opacity:1;stroke:none" />
+</svg>
diff --git a/symbols/amenity/embassy.svg b/symbols/office/embassy.svg
similarity index 100%
rename from symbols/amenity/embassy.svg
rename to symbols/office/embassy.svg