diff --git a/layers/poi/mapping.yaml b/layers/poi/mapping.yaml
index be83af26..9b24e0ed 100644
--- a/layers/poi/mapping.yaml
+++ b/layers/poi/mapping.yaml
@@ -118,7 +118,66 @@ def_poi_mapping_leisure: &poi_mapping_leisure
 
 # office values , see http://taginfo.openstreetmap.org/keys/office#values
 def_poi_mapping_office: &poi_mapping_office
+  - accountant
+  - advertising_agency
+  - architect
+  - association
+  - bail_bond_agent
+  - charity
+  - company
+  - construction_company
+  - consulting
+  - cooperative
+  - courier
+  - coworking
   - diplomatic
+  - educational_institution
+  - employment_agency
+  - energy_supplier
+  - engineer
+  - estate_agent
+  - financial
+  - financial_advisor
+  - forestry
+  - foundation
+  - geodesist
+  - government
+  - graphic_design
+  - guide
+  - harbour_master
+  - health_insurance
+  - insurance
+  - interior_design
+  - it
+  - lawyer
+  - logistics
+  - marketing
+  - moving_company
+  - newspaper
+  - ngo
+  - notary
+  - physician
+  - political_party
+  - private_investigator
+  - property_management
+  - publisher
+  - quango
+  - religion
+  - research
+  - security
+  - surveyor
+  - tax_advisor
+  - taxi
+  - telecommunication
+  - therapist
+  - translator
+  - travel_agent
+  - tutoring
+  - union
+  - university
+  - water_utility
+  - web_design
+  - wedding_planner
 
 # railway values , see http://taginfo.openstreetmap.org/keys/railway#values
 def_poi_mapping_railway: &poi_mapping_railway
diff --git a/layers/poi/mapping_diagram.png b/layers/poi/mapping_diagram.png
index 2d64322b..ccd3fe7f 100644
Binary files a/layers/poi/mapping_diagram.png and b/layers/poi/mapping_diagram.png differ
diff --git a/layers/poi/poi.yaml b/layers/poi/poi.yaml
index 77632566..e56a964c 100644
--- a/layers/poi/poi.yaml
+++ b/layers/poi/poi.yaml
@@ -25,6 +25,16 @@ layer:
                      'newsagent', 'optician', 'outdoor', 'paint', 'perfumery', 'perfume', 'pet', 'photo', 'second_hand', 
                      'shoes', 'sports', 'stationery', 'tailor', 'tattoo', 'ticket', 'tobacco', 'toys', 'travel_agency',
                      'watches', 'weapons', 'wholesale']
+        office:
+          subclass: ['accountant', 'advertising_agency', 'architect', 'association', 'bail_bond_agent', 'charity',
+                     'company', 'construction_company', 'consulting', 'cooperative', 'courier', 'coworking', 'diplomatic',
+                     'educational_institution', 'employment_agency', 'energy_supplier', 'engineer', 'estate_agent', 'financial',
+                     'financial_advisor', 'forestry', 'foundation', 'geodesist', 'government', 'graphic_design', 'guide',
+                     'harbour_master', 'health_insurance', 'insurance', 'interior_design', 'it', 'lawyer', 'logistics', 'marketing',
+                     'moving_company', 'newspaper', 'ngo', 'notary', 'physician', 'political_party', 'private_investigator',
+                     'property_management', 'publisher', 'quango', 'religion', 'research', 'security', 'surveyor', 'tax_advisor',
+                     'taxi', 'telecommunication', 'therapist', 'translator', 'travel_agent', 'tutoring', 'union', 'university',
+                     'water_utility', 'web_design', 'wedding_planner']
         town_hall:
           subclass: ['townhall', 'public_building', 'courthouse', 'community_centre']
         golf:
diff --git a/layers/poi/style.json b/layers/poi/style.json
index 3c5fa70b..84ca2221 100644
--- a/layers/poi/style.json
+++ b/layers/poi/style.json
@@ -743,7 +743,27 @@
             ]
           ]
         },
-        "icon-image": "{subclass}",
+        "icon-image": [
+          "coalesce",
+          [
+            "image",
+            [
+              "get",
+              "subclass"
+            ]
+          ],
+          [
+            "image",
+            [
+              "get",
+              "class"
+            ]
+          ],
+          [
+            "image",
+            ""
+          ]
+        ],
         "text-field": "{name:latin}\n{name:nonlatin}",
         "visibility": "visible",
         "text-anchor": "top",
@@ -778,7 +798,8 @@
           "information",
           "cinema",
           "theatre",
-          "fire_station"
+          "fire_station",
+          "office"
         ],
         [
           "!=",