diff --git a/amenity-points.mss b/amenity-points.mss
index b074347f50..e2152d2246 100644
--- a/amenity-points.mss
+++ b/amenity-points.mss
@@ -1325,11 +1325,8 @@
   }
 
   // office points
-  [feature = 'office'][zoom >= 17] {
-    marker-width: 4;
-    [zoom >= 18] {
-      marker-width: 6;
-    }
+  [feature = 'office'][zoom >= 18] {
+    marker-width: 6;
     marker-line-width: 0;
     marker-placement: interior;
     marker-clip: false;
@@ -2844,63 +2841,44 @@
   }
 
   [feature = 'office'] {
-    // potentially larger offices
-    [zoom >= 17] {
-      [office = 'administrative'],
-      [office = 'adoption_agency'],
-      [office = 'educational_institution'],
-      [office = 'employment_agency'],
-      [office = 'energy_supplier'],
-      [office = 'financial'],
-      [office = 'government'],
-      [office = 'newspaper'],
-      [office = 'ngo'],
-      [office = 'political_party'],
-      [office = 'quango'],
-      [office = 'religion'],
-      [office = 'research'],
-      [office = 'tax'],
-      [office = 'telecommunication'],
-      [office = 'water_utility'],
-      {
-        text-name: "[name]";
-        text-size: @standard-font-size;
-        text-wrap-width: @standard-wrap-width;
-        text-line-spacing: @standard-line-spacing-size;
-        text-dy: 8;
-        text-fill: @office;
-        text-face-name: @standard-font;
-        text-halo-radius: @standard-halo-radius;
-        text-halo-fill: rgba(255, 255, 255, 0.6);
-        text-placement: interior;
-      }
-    }
-
-    // other documented office types
     [zoom >= 18] {
       [office = 'accountant'],
+      [office = 'adoption_agency'],
       [office = 'advertising_agency'],
       [office = 'architect'],
       [office = 'association'],
       [office = 'charity'],
       [office = 'company'],
+      [office = 'educational_institution'],
+      [office = 'diplomatic'],
+      [office = 'employment_agency'],
+      [office = 'energy_supplier'],
       [office = 'estate_agent'],
+      [office = 'financial'],
       [office = 'forestry'],
       [office = 'foundation'],
+      [office = 'government'],
       [office = 'guide'],
       [office = 'insurance'],
       [office = 'it'],
       [office = 'lawyer'],
       [office = 'logistics'],
       [office = 'moving_company'],
+      [office = 'newspaper'],
+      [office = 'ngo'],
       [office = 'notary'],
-      [office = 'physician'],
+      [office = 'political_party'],
       [office = 'private_investigator'],
       [office = 'property_management'],
+      [office = 'quango'],
+      [office = 'religion'],
+      [office = 'research'],
       [office = 'surveyor'],
+      [office = 'tax'],
       [office = 'tax_advisor'],
-      [office = 'therapist'],
-      [office = 'travel_agent'] {
+      [office = 'telecommunication'],
+      [office = 'travel_agent'],
+      [office = 'water_utility'] {
         text-name: "[name]";
         text-size: @standard-font-size;
         text-wrap-width: @standard-wrap-width;