Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 9138)
+++ trunk/data/defaultpresets.xml	(revision 9148)
@@ -7624,5 +7624,5 @@
   </group> <!-- Shops -->
   <group name="Offices" icon="icons/office_blue.png">
-    <item name="Accountant" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Accountant" icon="styles/standard/office/accountant.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=accountant"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=accountant"
@@ -7635,5 +7635,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Administrative" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Administrative" icon="styles/standard/office/administrative.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=administrative"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=administrative"
@@ -7645,5 +7645,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Advertising agency" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Advertising agency" icon="styles/standard/office/advertising_agency.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=advertising_agency" />
         <space />
@@ -7652,5 +7652,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Architect" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Architect" icon="styles/standard/office/architect.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=architect"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=architect"
@@ -7662,5 +7662,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Association" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Association" icon="styles/standard/office/association.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=association" />
         <space />
@@ -7669,5 +7669,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Private company" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Private company" icon="styles/standard/office/private_company.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=company"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=company"
@@ -7679,5 +7679,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Educational institution" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Educational institution" icon="styles/standard/office/educational_institution.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=educational_institution"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=educational_institution"
@@ -7688,5 +7688,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Employment agency" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Employment agency" icon="styles/standard/office/employment_agency.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=employment_agency"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=employment_agency"
@@ -7700,5 +7700,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Estate agent" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Estate agent" icon="styles/standard/office/real_state.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=estate_agent"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=estate_agent"
@@ -7712,5 +7712,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Foundation" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Foundation" icon="styles/standard/office/foundation.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=foundation" />
         <space />
@@ -7719,5 +7719,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Government" icon="icons/office_pink.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Government" icon="styles/standard/office/government.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=government"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=government"
@@ -7729,5 +7729,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Insurance" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Insurance" icon="styles/standard/office/insurance.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=insurance"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=insurance"
@@ -7740,5 +7740,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="It specialist" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="It specialist" icon="styles/standard/office/it.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=it"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=it"
@@ -7750,5 +7750,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Lawyer" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Lawyer" icon="styles/standard/office/lawyer.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=lawyer"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=lawyer"
@@ -7762,5 +7762,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Newspaper" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Newspaper" icon="styles/standard/office/newspaper.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=newspaper"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=newspaper"
@@ -7772,5 +7772,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Non-governmental organisation (NGO)" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Non-governmental organisation (NGO)" icon="styles/standard/office/ong.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=ngo"
                   fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:office=ngo"
@@ -7783,5 +7783,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Notary" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Notary" icon="styles/standard/office/notary.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=notary" />
         <space />
@@ -7790,5 +7790,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Political party" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Political party" icon="styles/standard/office/political_party.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=political_party"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=political_party"
@@ -7799,5 +7799,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Religion" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Religion" icon="styles/standard/office/religion.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=religion"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=religion"
@@ -7809,5 +7809,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Research" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Research" icon="styles/standard/office/research.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=research"
                   es.href="http://wiki.openstreetmap.org/wiki/ES:Tag:office=research"
@@ -7820,5 +7820,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Tax advisor" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Tax advisor" icon="styles/standard/office/tax_advisor.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=tax_advisor"
                   de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:office=tax_advisor" />
@@ -7828,5 +7828,5 @@
         <reference ref="link_contact_address" />
     </item>
-    <item name="Telecommunication" icon="icons/office_blue.png" name_context="office" type="node,closedway" preset_name_label="true">
+    <item name="Telecommunication" icon="styles/standard/office/telecommunication.svg" name_context="office" type="node,closedway" preset_name_label="true">
         <link href="http://wiki.openstreetmap.org/wiki/Tag:office=telecommunication"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:office=telecommunication"