regenerated skins

8 files changed, 318 insertions, 330 deletions

diff --git a/data/basic_hdpi.skn b/data/basic_hdpi.skn
index 06f1a424e4..4fba2474d2 100644
--- a/data/basic_hdpi.skn
+++ b/data/basic_hdpi.skn
@@ -322,167 +322,164 @@
   <symbolStyle id="107" name="placemark-red">
    <resourceStyle width="31" x="0" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="108" name="placemark">
+  <symbolStyle id="108" name="playground">
    <resourceStyle width="40" x="31" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="109" name="playground">
+  <symbolStyle id="109" name="postbox">
    <resourceStyle width="40" x="71" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="110" name="postbox">
+  <symbolStyle id="110" name="postoffice">
    <resourceStyle width="40" x="111" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="111" name="postoffice">
-   <resourceStyle width="40" x="151" y="320" height="40"/>
+  <symbolStyle id="111" name="power-pole">
+   <resourceStyle width="12" x="151" y="320" height="12"/>
   </symbolStyle>
-  <symbolStyle id="112" name="power-pole">
-   <resourceStyle width="12" x="191" y="320" height="12"/>
+  <symbolStyle id="112" name="power-tower">
+   <resourceStyle width="18" x="163" y="320" height="18"/>
   </symbolStyle>
-  <symbolStyle id="113" name="power-tower">
-   <resourceStyle width="18" x="203" y="320" height="18"/>
+  <symbolStyle id="113" name="power_generic">
+   <resourceStyle width="28" x="181" y="320" height="28"/>
   </symbolStyle>
-  <symbolStyle id="114" name="power_generic">
-   <resourceStyle width="28" x="221" y="320" height="28"/>
+  <symbolStyle id="114" name="power_hydro">
+   <resourceStyle width="28" x="209" y="320" height="28"/>
   </symbolStyle>
-  <symbolStyle id="115" name="power_hydro">
-   <resourceStyle width="28" x="249" y="320" height="28"/>
+  <symbolStyle id="115" name="power_photovoltaic">
+   <resourceStyle width="28" x="237" y="320" height="28"/>
   </symbolStyle>
-  <symbolStyle id="116" name="power_photovoltaic">
-   <resourceStyle width="28" x="277" y="320" height="28"/>
+  <symbolStyle id="116" name="power_wind">
+   <resourceStyle width="28" x="265" y="320" height="28"/>
   </symbolStyle>
-  <symbolStyle id="117" name="power_wind">
-   <resourceStyle width="28" x="305" y="320" height="28"/>
+  <symbolStyle id="117" name="pub">
+   <resourceStyle width="40" x="293" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="118" name="pub">
+  <symbolStyle id="118" name="pubx">
    <resourceStyle width="40" x="333" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="119" name="pubx">
+  <symbolStyle id="119" name="railway-crossing-small">
    <resourceStyle width="40" x="373" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="120" name="railway-crossing-small">
+  <symbolStyle id="120" name="railway-crossing">
    <resourceStyle width="40" x="413" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="121" name="railway-crossing">
+  <symbolStyle id="121" name="railway-station-mini">
    <resourceStyle width="40" x="453" y="320" height="40"/>
   </symbolStyle>
-  <symbolStyle id="122" name="railway-station-mini">
+  <symbolStyle id="122" name="railway-station">
    <resourceStyle width="40" x="0" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="123" name="railway-station">
+  <symbolStyle id="123" name="recycling">
    <resourceStyle width="40" x="40" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="124" name="recycling">
+  <symbolStyle id="124" name="religion">
    <resourceStyle width="40" x="80" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="125" name="religion">
+  <symbolStyle id="125" name="restaurant">
    <resourceStyle width="40" x="120" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="126" name="restaurant">
-   <resourceStyle width="40" x="160" y="360" height="40"/>
+  <symbolStyle id="126" name="roundabout_left">
+   <resourceStyle width="31" x="160" y="360" height="31"/>
   </symbolStyle>
-  <symbolStyle id="127" name="roundabout_left">
-   <resourceStyle width="31" x="200" y="360" height="31"/>
+  <symbolStyle id="127" name="roundabout_right">
+   <resourceStyle width="31" x="191" y="360" height="31"/>
   </symbolStyle>
-  <symbolStyle id="128" name="roundabout_right">
-   <resourceStyle width="31" x="231" y="360" height="31"/>
+  <symbolStyle id="128" name="school">
+   <resourceStyle width="40" x="222" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="129" name="school">
+  <symbolStyle id="129" name="shelter-fireplace">
    <resourceStyle width="40" x="262" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="130" name="shelter-fireplace">
+  <symbolStyle id="130" name="shelter">
    <resourceStyle width="40" x="302" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="131" name="shelter">
+  <symbolStyle id="131" name="shooting-borderless">
    <resourceStyle width="40" x="342" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="132" name="shooting-borderless">
+  <symbolStyle id="132" name="shooting">
    <resourceStyle width="40" x="382" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="133" name="shooting">
+  <symbolStyle id="133" name="slipway">
    <resourceStyle width="40" x="422" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="134" name="slipway">
+  <symbolStyle id="134" name="soccer-borderless">
    <resourceStyle width="40" x="462" y="360" height="40"/>
   </symbolStyle>
-  <symbolStyle id="135" name="soccer-borderless">
+  <symbolStyle id="135" name="soccer">
    <resourceStyle width="40" x="0" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="136" name="soccer">
-   <resourceStyle width="40" x="40" y="400" height="40"/>
+  <symbolStyle id="136" name="speed_trap">
+   <resourceStyle width="31" x="40" y="400" height="31"/>
   </symbolStyle>
-  <symbolStyle id="137" name="speed_trap">
-   <resourceStyle width="31" x="80" y="400" height="31"/>
+  <symbolStyle id="137" name="subway-station-l">
+   <resourceStyle width="40" x="71" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="138" name="subway-station-l">
+  <symbolStyle id="138" name="subway-station-m">
    <resourceStyle width="40" x="111" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="139" name="subway-station-m">
+  <symbolStyle id="139" name="subway-station-s">
    <resourceStyle width="40" x="151" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="140" name="subway-station-s">
+  <symbolStyle id="140" name="subway">
    <resourceStyle width="40" x="191" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="141" name="subway">
+  <symbolStyle id="141" name="supermarket">
    <resourceStyle width="40" x="231" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="142" name="supermarket">
-   <resourceStyle width="40" x="271" y="400" height="40"/>
+  <symbolStyle id="142" name="survey_point">
+   <resourceStyle width="16" x="271" y="400" height="16"/>
   </symbolStyle>
-  <symbolStyle id="143" name="survey_point">
-   <resourceStyle width="16" x="311" y="400" height="16"/>
+  <symbolStyle id="143" name="swimming-borderless">
+   <resourceStyle width="40" x="287" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="144" name="swimming-borderless">
+  <symbolStyle id="144" name="swimming">
    <resourceStyle width="40" x="327" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="145" name="swimming">
+  <symbolStyle id="145" name="synagogue">
    <resourceStyle width="40" x="367" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="146" name="synagogue">
+  <symbolStyle id="146" name="taxi">
    <resourceStyle width="40" x="407" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="147" name="taxi">
+  <symbolStyle id="147" name="telephone">
    <resourceStyle width="40" x="447" y="400" height="40"/>
   </symbolStyle>
-  <symbolStyle id="148" name="telephone">
+  <symbolStyle id="148" name="tennis-borderless">
    <resourceStyle width="40" x="0" y="440" height="40"/>
   </symbolStyle>
-  <symbolStyle id="149" name="tennis-borderless">
+  <symbolStyle id="149" name="tennis">
    <resourceStyle width="40" x="40" y="440" height="40"/>
   </symbolStyle>
-  <symbolStyle id="150" name="tennis">
+  <symbolStyle id="150" name="theatre">
    <resourceStyle width="40" x="80" y="440" height="40"/>
   </symbolStyle>
-  <symbolStyle id="151" name="theatre">
+  <symbolStyle id="151" name="toilets">
    <resourceStyle width="40" x="120" y="440" height="40"/>
   </symbolStyle>
-  <symbolStyle id="152" name="toilets">
-   <resourceStyle width="40" x="160" y="440" height="40"/>
+  <symbolStyle id="152" name="traffic_signal">
+   <resourceStyle width="31" x="160" y="440" height="31"/>
   </symbolStyle>
-  <symbolStyle id="153" name="traffic_signal">
-   <resourceStyle width="31" x="200" y="440" height="31"/>
+  <symbolStyle id="153" name="tramway-mini">
+   <resourceStyle width="40" x="191" y="440" height="40"/>
   </symbolStyle>
-  <symbolStyle id="154" name="tramway-mini">
+  <symbolStyle id="154" name="tramway">
    <resourceStyle width="40" x="231" y="440" height="40"/>
   </symbolStyle>
-  <symbolStyle id="155" name="tramway">
-   <resourceStyle width="40" x="271" y="440" height="40"/>
+  <symbolStyle id="155" name="tree">
+   <resourceStyle width="10" x="271" y="440" height="10"/>
   </symbolStyle>
-  <symbolStyle id="156" name="tree">
-   <resourceStyle width="10" x="311" y="440" height="10"/>
+  <symbolStyle id="156" name="university">
+   <resourceStyle width="40" x="281" y="440" height="40"/>
   </symbolStyle>
-  <symbolStyle id="157" name="university">
-   <resourceStyle width="40" x="321" y="440" height="40"/>
+  <symbolStyle id="157" name="viewpoint">
+   <resourceStyle width="28" x="321" y="440" height="28"/>
   </symbolStyle>
-  <symbolStyle id="158" name="viewpoint">
-   <resourceStyle width="28" x="361" y="440" height="28"/>
+  <symbolStyle id="158" name="vulcan">
+   <resourceStyle width="18" x="349" y="440" height="18"/>
   </symbolStyle>
-  <symbolStyle id="159" name="vulcan">
-   <resourceStyle width="18" x="389" y="440" height="18"/>
+  <symbolStyle id="159" name="wastewater">
+   <resourceStyle width="28" x="367" y="440" height="28"/>
   </symbolStyle>
-  <symbolStyle id="160" name="wastewater">
-   <resourceStyle width="28" x="407" y="440" height="28"/>
-  </symbolStyle>
-  <symbolStyle id="161" name="windmill">
-   <resourceStyle width="31" x="435" y="440" height="31"/>
+  <symbolStyle id="160" name="windmill">
+   <resourceStyle width="31" x="395" y="440" height="31"/>
   </symbolStyle>
  </page>
 </skin>
diff --git a/data/basic_ldpi.skn b/data/basic_ldpi.skn
index f5dbd98c59..33d4c7c898 100644
--- a/data/basic_ldpi.skn
+++ b/data/basic_ldpi.skn
@@ -322,167 +322,164 @@
   <symbolStyle id="107" name="placemark-red">
    <resourceStyle width="16" x="32" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="108" name="placemark">
+  <symbolStyle id="108" name="playground">
    <resourceStyle width="20" x="48" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="109" name="playground">
+  <symbolStyle id="109" name="postbox">
    <resourceStyle width="20" x="68" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="110" name="postbox">
+  <symbolStyle id="110" name="postoffice">
    <resourceStyle width="20" x="88" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="111" name="postoffice">
-   <resourceStyle width="20" x="108" y="160" height="20"/>
+  <symbolStyle id="111" name="power-pole">
+   <resourceStyle width="7" x="108" y="160" height="7"/>
   </symbolStyle>
-  <symbolStyle id="112" name="power-pole">
-   <resourceStyle width="7" x="128" y="160" height="7"/>
+  <symbolStyle id="112" name="power-tower">
+   <resourceStyle width="10" x="115" y="160" height="10"/>
   </symbolStyle>
-  <symbolStyle id="113" name="power-tower">
-   <resourceStyle width="10" x="135" y="160" height="10"/>
+  <symbolStyle id="113" name="power_generic">
+   <resourceStyle width="15" x="125" y="160" height="15"/>
   </symbolStyle>
-  <symbolStyle id="114" name="power_generic">
-   <resourceStyle width="15" x="145" y="160" height="15"/>
+  <symbolStyle id="114" name="power_hydro">
+   <resourceStyle width="15" x="140" y="160" height="15"/>
   </symbolStyle>
-  <symbolStyle id="115" name="power_hydro">
-   <resourceStyle width="15" x="160" y="160" height="15"/>
+  <symbolStyle id="115" name="power_photovoltaic">
+   <resourceStyle width="15" x="155" y="160" height="15"/>
   </symbolStyle>
-  <symbolStyle id="116" name="power_photovoltaic">
-   <resourceStyle width="15" x="175" y="160" height="15"/>
+  <symbolStyle id="116" name="power_wind">
+   <resourceStyle width="15" x="170" y="160" height="15"/>
   </symbolStyle>
-  <symbolStyle id="117" name="power_wind">
-   <resourceStyle width="15" x="190" y="160" height="15"/>
+  <symbolStyle id="117" name="pub">
+   <resourceStyle width="20" x="185" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="118" name="pub">
+  <symbolStyle id="118" name="pubx">
    <resourceStyle width="20" x="205" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="119" name="pubx">
+  <symbolStyle id="119" name="railway-crossing-small">
    <resourceStyle width="20" x="225" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="120" name="railway-crossing-small">
+  <symbolStyle id="120" name="railway-crossing">
    <resourceStyle width="20" x="0" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="121" name="railway-crossing">
+  <symbolStyle id="121" name="railway-station-mini">
    <resourceStyle width="20" x="20" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="122" name="railway-station-mini">
+  <symbolStyle id="122" name="railway-station">
    <resourceStyle width="20" x="40" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="123" name="railway-station">
+  <symbolStyle id="123" name="recycling">
    <resourceStyle width="20" x="60" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="124" name="recycling">
+  <symbolStyle id="124" name="religion">
    <resourceStyle width="20" x="80" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="125" name="religion">
+  <symbolStyle id="125" name="restaurant">
    <resourceStyle width="20" x="100" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="126" name="restaurant">
-   <resourceStyle width="20" x="120" y="180" height="20"/>
+  <symbolStyle id="126" name="roundabout_left">
+   <resourceStyle width="16" x="120" y="180" height="16"/>
   </symbolStyle>
-  <symbolStyle id="127" name="roundabout_left">
-   <resourceStyle width="16" x="140" y="180" height="16"/>
+  <symbolStyle id="127" name="roundabout_right">
+   <resourceStyle width="16" x="136" y="180" height="16"/>
   </symbolStyle>
-  <symbolStyle id="128" name="roundabout_right">
-   <resourceStyle width="16" x="156" y="180" height="16"/>
+  <symbolStyle id="128" name="school">
+   <resourceStyle width="20" x="152" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="129" name="school">
+  <symbolStyle id="129" name="shelter-fireplace">
    <resourceStyle width="20" x="172" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="130" name="shelter-fireplace">
+  <symbolStyle id="130" name="shelter">
    <resourceStyle width="20" x="192" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="131" name="shelter">
+  <symbolStyle id="131" name="shooting-borderless">
    <resourceStyle width="20" x="212" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="132" name="shooting-borderless">
+  <symbolStyle id="132" name="shooting">
    <resourceStyle width="20" x="232" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="133" name="shooting">
+  <symbolStyle id="133" name="slipway">
    <resourceStyle width="20" x="0" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="134" name="slipway">
+  <symbolStyle id="134" name="soccer-borderless">
    <resourceStyle width="20" x="20" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="135" name="soccer-borderless">
+  <symbolStyle id="135" name="soccer">
    <resourceStyle width="20" x="40" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="136" name="soccer">
-   <resourceStyle width="20" x="60" y="200" height="20"/>
+  <symbolStyle id="136" name="speed_trap">
+   <resourceStyle width="16" x="60" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="137" name="speed_trap">
-   <resourceStyle width="16" x="80" y="200" height="16"/>
+  <symbolStyle id="137" name="subway-station-l">
+   <resourceStyle width="20" x="76" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="138" name="subway-station-l">
+  <symbolStyle id="138" name="subway-station-m">
    <resourceStyle width="20" x="96" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="139" name="subway-station-m">
+  <symbolStyle id="139" name="subway-station-s">
    <resourceStyle width="20" x="116" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="140" name="subway-station-s">
+  <symbolStyle id="140" name="subway">
    <resourceStyle width="20" x="136" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="141" name="subway">
+  <symbolStyle id="141" name="supermarket">
    <resourceStyle width="20" x="156" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="142" name="supermarket">
-   <resourceStyle width="20" x="176" y="200" height="20"/>
+  <symbolStyle id="142" name="survey_point">
+   <resourceStyle width="9" x="176" y="200" height="9"/>
   </symbolStyle>
-  <symbolStyle id="143" name="survey_point">
-   <resourceStyle width="9" x="196" y="200" height="9"/>
+  <symbolStyle id="143" name="swimming-borderless">
+   <resourceStyle width="20" x="185" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="144" name="swimming-borderless">
+  <symbolStyle id="144" name="swimming">
    <resourceStyle width="20" x="205" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="145" name="swimming">
+  <symbolStyle id="145" name="synagogue">
    <resourceStyle width="20" x="225" y="200" height="20"/>
   </symbolStyle>
-  <symbolStyle id="146" name="synagogue">
+  <symbolStyle id="146" name="taxi">
    <resourceStyle width="20" x="0" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="147" name="taxi">
+  <symbolStyle id="147" name="telephone">
    <resourceStyle width="20" x="20" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="148" name="telephone">
+  <symbolStyle id="148" name="tennis-borderless">
    <resourceStyle width="20" x="40" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="149" name="tennis-borderless">
+  <symbolStyle id="149" name="tennis">
    <resourceStyle width="20" x="60" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="150" name="tennis">
+  <symbolStyle id="150" name="theatre">
    <resourceStyle width="20" x="80" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="151" name="theatre">
+  <symbolStyle id="151" name="toilets">
    <resourceStyle width="20" x="100" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="152" name="toilets">
-   <resourceStyle width="20" x="120" y="220" height="20"/>
+  <symbolStyle id="152" name="traffic_signal">
+   <resourceStyle width="16" x="120" y="220" height="16"/>
   </symbolStyle>
-  <symbolStyle id="153" name="traffic_signal">
-   <resourceStyle width="16" x="140" y="220" height="16"/>
+  <symbolStyle id="153" name="tramway-mini">
+   <resourceStyle width="20" x="136" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="154" name="tramway-mini">
+  <symbolStyle id="154" name="tramway">
    <resourceStyle width="20" x="156" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="155" name="tramway">
-   <resourceStyle width="20" x="176" y="220" height="20"/>
+  <symbolStyle id="155" name="tree">
+   <resourceStyle width="7" x="176" y="220" height="7"/>
   </symbolStyle>
-  <symbolStyle id="156" name="tree">
-   <resourceStyle width="7" x="196" y="220" height="7"/>
+  <symbolStyle id="156" name="university">
+   <resourceStyle width="20" x="183" y="220" height="20"/>
   </symbolStyle>
-  <symbolStyle id="157" name="university">
-   <resourceStyle width="20" x="203" y="220" height="20"/>
+  <symbolStyle id="157" name="viewpoint">
+   <resourceStyle width="15" x="203" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="158" name="viewpoint">
-   <resourceStyle width="15" x="223" y="220" height="15"/>
+  <symbolStyle id="158" name="vulcan">
+   <resourceStyle width="10" x="218" y="220" height="10"/>
   </symbolStyle>
-  <symbolStyle id="159" name="vulcan">
-   <resourceStyle width="10" x="238" y="220" height="10"/>
+  <symbolStyle id="159" name="wastewater">
+   <resourceStyle width="15" x="228" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="160" name="wastewater">
-   <resourceStyle width="15" x="0" y="240" height="15"/>
-  </symbolStyle>
-  <symbolStyle id="161" name="windmill">
-   <resourceStyle width="16" x="15" y="240" height="16"/>
+  <symbolStyle id="160" name="windmill">
+   <resourceStyle width="16" x="0" y="240" height="16"/>
   </symbolStyle>
  </page>
 </skin>
diff --git a/data/basic_mdpi.skn b/data/basic_mdpi.skn
index b901be6daa..0afb79c5e8 100644
--- a/data/basic_mdpi.skn
+++ b/data/basic_mdpi.skn
@@ -322,167 +322,164 @@
   <symbolStyle id="107" name="placemark-red">
    <resourceStyle width="22" x="316" y="140" height="28"/>
   </symbolStyle>
-  <symbolStyle id="108" name="placemark">
+  <symbolStyle id="108" name="playground">
    <resourceStyle width="28" x="338" y="140" height="28"/>
   </symbolStyle>
-  <symbolStyle id="109" name="playground">
+  <symbolStyle id="109" name="postbox">
    <resourceStyle width="28" x="366" y="140" height="28"/>
   </symbolStyle>
-  <symbolStyle id="110" name="postbox">
+  <symbolStyle id="110" name="postoffice">
    <resourceStyle width="28" x="394" y="140" height="28"/>
   </symbolStyle>
-  <symbolStyle id="111" name="postoffice">
-   <resourceStyle width="28" x="422" y="140" height="28"/>
+  <symbolStyle id="111" name="power-pole">
+   <resourceStyle width="9" x="422" y="140" height="9"/>
   </symbolStyle>
-  <symbolStyle id="112" name="power-pole">
-   <resourceStyle width="9" x="450" y="140" height="9"/>
+  <symbolStyle id="112" name="power-tower">
+   <resourceStyle width="13" x="431" y="140" height="13"/>
   </symbolStyle>
-  <symbolStyle id="113" name="power-tower">
-   <resourceStyle width="13" x="459" y="140" height="13"/>
+  <symbolStyle id="113" name="power_generic">
+   <resourceStyle width="20" x="444" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="114" name="power_generic">
-   <resourceStyle width="20" x="472" y="140" height="20"/>
+  <symbolStyle id="114" name="power_hydro">
+   <resourceStyle width="20" x="464" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="115" name="power_hydro">
-   <resourceStyle width="20" x="492" y="140" height="20"/>
+  <symbolStyle id="115" name="power_photovoltaic">
+   <resourceStyle width="20" x="484" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="116" name="power_photovoltaic">
+  <symbolStyle id="116" name="power_wind">
    <resourceStyle width="20" x="0" y="168" height="20"/>
   </symbolStyle>
-  <symbolStyle id="117" name="power_wind">
-   <resourceStyle width="20" x="20" y="168" height="20"/>
+  <symbolStyle id="117" name="pub">
+   <resourceStyle width="28" x="20" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="118" name="pub">
-   <resourceStyle width="28" x="40" y="168" height="28"/>
+  <symbolStyle id="118" name="pubx">
+   <resourceStyle width="28" x="48" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="119" name="pubx">
-   <resourceStyle width="28" x="68" y="168" height="28"/>
+  <symbolStyle id="119" name="railway-crossing-small">
+   <resourceStyle width="28" x="76" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="120" name="railway-crossing-small">
-   <resourceStyle width="28" x="96" y="168" height="28"/>
+  <symbolStyle id="120" name="railway-crossing">
+   <resourceStyle width="28" x="104" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="121" name="railway-crossing">
-   <resourceStyle width="28" x="124" y="168" height="28"/>
+  <symbolStyle id="121" name="railway-station-mini">
+   <resourceStyle width="28" x="132" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="122" name="railway-station-mini">
-   <resourceStyle width="28" x="152" y="168" height="28"/>
+  <symbolStyle id="122" name="railway-station">
+   <resourceStyle width="28" x="160" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="123" name="railway-station">
-   <resourceStyle width="28" x="180" y="168" height="28"/>
+  <symbolStyle id="123" name="recycling">
+   <resourceStyle width="28" x="188" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="124" name="recycling">
-   <resourceStyle width="28" x="208" y="168" height="28"/>
+  <symbolStyle id="124" name="religion">
+   <resourceStyle width="28" x="216" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="125" name="religion">
-   <resourceStyle width="28" x="236" y="168" height="28"/>
+  <symbolStyle id="125" name="restaurant">
+   <resourceStyle width="28" x="244" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="126" name="restaurant">
-   <resourceStyle width="28" x="264" y="168" height="28"/>
+  <symbolStyle id="126" name="roundabout_left">
+   <resourceStyle width="22" x="272" y="168" height="22"/>
   </symbolStyle>
-  <symbolStyle id="127" name="roundabout_left">
-   <resourceStyle width="22" x="292" y="168" height="22"/>
+  <symbolStyle id="127" name="roundabout_right">
+   <resourceStyle width="22" x="294" y="168" height="22"/>
   </symbolStyle>
-  <symbolStyle id="128" name="roundabout_right">
-   <resourceStyle width="22" x="314" y="168" height="22"/>
+  <symbolStyle id="128" name="school">
+   <resourceStyle width="28" x="316" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="129" name="school">
-   <resourceStyle width="28" x="336" y="168" height="28"/>
+  <symbolStyle id="129" name="shelter-fireplace">
+   <resourceStyle width="28" x="344" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="130" name="shelter-fireplace">
-   <resourceStyle width="28" x="364" y="168" height="28"/>
+  <symbolStyle id="130" name="shelter">
+   <resourceStyle width="28" x="372" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="131" name="shelter">
-   <resourceStyle width="28" x="392" y="168" height="28"/>
+  <symbolStyle id="131" name="shooting-borderless">
+   <resourceStyle width="28" x="400" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="132" name="shooting-borderless">
-   <resourceStyle width="28" x="420" y="168" height="28"/>
+  <symbolStyle id="132" name="shooting">
+   <resourceStyle width="28" x="428" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="133" name="shooting">
-   <resourceStyle width="28" x="448" y="168" height="28"/>
+  <symbolStyle id="133" name="slipway">
+   <resourceStyle width="28" x="456" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="134" name="slipway">
-   <resourceStyle width="28" x="476" y="168" height="28"/>
+  <symbolStyle id="134" name="soccer-borderless">
+   <resourceStyle width="28" x="484" y="168" height="28"/>
   </symbolStyle>
-  <symbolStyle id="135" name="soccer-borderless">
+  <symbolStyle id="135" name="soccer">
    <resourceStyle width="28" x="0" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="136" name="soccer">
-   <resourceStyle width="28" x="28" y="196" height="28"/>
+  <symbolStyle id="136" name="speed_trap">
+   <resourceStyle width="22" x="28" y="196" height="22"/>
   </symbolStyle>
-  <symbolStyle id="137" name="speed_trap">
-   <resourceStyle width="22" x="56" y="196" height="22"/>
+  <symbolStyle id="137" name="subway-station-l">
+   <resourceStyle width="28" x="50" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="138" name="subway-station-l">
+  <symbolStyle id="138" name="subway-station-m">
    <resourceStyle width="28" x="78" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="139" name="subway-station-m">
+  <symbolStyle id="139" name="subway-station-s">
    <resourceStyle width="28" x="106" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="140" name="subway-station-s">
+  <symbolStyle id="140" name="subway">
    <resourceStyle width="28" x="134" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="141" name="subway">
+  <symbolStyle id="141" name="supermarket">
    <resourceStyle width="28" x="162" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="142" name="supermarket">
-   <resourceStyle width="28" x="190" y="196" height="28"/>
+  <symbolStyle id="142" name="survey_point">
+   <resourceStyle width="12" x="190" y="196" height="12"/>
   </symbolStyle>
-  <symbolStyle id="143" name="survey_point">
-   <resourceStyle width="12" x="218" y="196" height="12"/>
+  <symbolStyle id="143" name="swimming-borderless">
+   <resourceStyle width="28" x="202" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="144" name="swimming-borderless">
+  <symbolStyle id="144" name="swimming">
    <resourceStyle width="28" x="230" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="145" name="swimming">
+  <symbolStyle id="145" name="synagogue">
    <resourceStyle width="28" x="258" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="146" name="synagogue">
+  <symbolStyle id="146" name="taxi">
    <resourceStyle width="28" x="286" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="147" name="taxi">
+  <symbolStyle id="147" name="telephone">
    <resourceStyle width="28" x="314" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="148" name="telephone">
+  <symbolStyle id="148" name="tennis-borderless">
    <resourceStyle width="28" x="342" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="149" name="tennis-borderless">
+  <symbolStyle id="149" name="tennis">
    <resourceStyle width="28" x="370" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="150" name="tennis">
+  <symbolStyle id="150" name="theatre">
    <resourceStyle width="28" x="398" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="151" name="theatre">
+  <symbolStyle id="151" name="toilets">
    <resourceStyle width="28" x="426" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="152" name="toilets">
-   <resourceStyle width="28" x="454" y="196" height="28"/>
+  <symbolStyle id="152" name="traffic_signal">
+   <resourceStyle width="22" x="454" y="196" height="22"/>
   </symbolStyle>
-  <symbolStyle id="153" name="traffic_signal">
-   <resourceStyle width="22" x="482" y="196" height="22"/>
+  <symbolStyle id="153" name="tramway-mini">
+   <resourceStyle width="28" x="476" y="196" height="28"/>
   </symbolStyle>
-  <symbolStyle id="154" name="tramway-mini">
+  <symbolStyle id="154" name="tramway">
    <resourceStyle width="28" x="0" y="224" height="28"/>
   </symbolStyle>
-  <symbolStyle id="155" name="tramway">
-   <resourceStyle width="28" x="28" y="224" height="28"/>
+  <symbolStyle id="155" name="tree">
+   <resourceStyle width="8" x="28" y="224" height="8"/>
   </symbolStyle>
-  <symbolStyle id="156" name="tree">
-   <resourceStyle width="8" x="56" y="224" height="8"/>
+  <symbolStyle id="156" name="university">
+   <resourceStyle width="28" x="36" y="224" height="28"/>
   </symbolStyle>
-  <symbolStyle id="157" name="university">
-   <resourceStyle width="28" x="64" y="224" height="28"/>
+  <symbolStyle id="157" name="viewpoint">
+   <resourceStyle width="20" x="64" y="224" height="20"/>
   </symbolStyle>
-  <symbolStyle id="158" name="viewpoint">
-   <resourceStyle width="20" x="92" y="224" height="20"/>
+  <symbolStyle id="158" name="vulcan">
+   <resourceStyle width="13" x="84" y="224" height="13"/>
   </symbolStyle>
-  <symbolStyle id="159" name="vulcan">
-   <resourceStyle width="13" x="112" y="224" height="13"/>
+  <symbolStyle id="159" name="wastewater">
+   <resourceStyle width="20" x="97" y="224" height="20"/>
   </symbolStyle>
-  <symbolStyle id="160" name="wastewater">
-   <resourceStyle width="20" x="125" y="224" height="20"/>
-  </symbolStyle>
-  <symbolStyle id="161" name="windmill">
-   <resourceStyle width="22" x="145" y="224" height="22"/>
+  <symbolStyle id="160" name="windmill">
+   <resourceStyle width="22" x="117" y="224" height="22"/>
   </symbolStyle>
  </page>
 </skin>
diff --git a/data/basic_xhdpi.skn b/data/basic_xhdpi.skn
index 59d16520d7..715d2a9170 100644
--- a/data/basic_xhdpi.skn
+++ b/data/basic_xhdpi.skn
@@ -322,166 +322,163 @@
   <symbolStyle id="107" name="placemark-red">
    <resourceStyle width="40" x="120" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="108" name="placemark">
+  <symbolStyle id="108" name="playground">
    <resourceStyle width="52" x="160" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="109" name="playground">
+  <symbolStyle id="109" name="postbox">
    <resourceStyle width="52" x="212" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="110" name="postbox">
+  <symbolStyle id="110" name="postoffice">
    <resourceStyle width="52" x="264" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="111" name="postoffice">
-   <resourceStyle width="52" x="316" y="260" height="52"/>
+  <symbolStyle id="111" name="power-pole">
+   <resourceStyle width="14" x="316" y="260" height="14"/>
   </symbolStyle>
-  <symbolStyle id="112" name="power-pole">
-   <resourceStyle width="14" x="368" y="260" height="14"/>
+  <symbolStyle id="112" name="power-tower">
+   <resourceStyle width="22" x="330" y="260" height="22"/>
   </symbolStyle>
-  <symbolStyle id="113" name="power-tower">
-   <resourceStyle width="22" x="382" y="260" height="22"/>
+  <symbolStyle id="113" name="power_generic">
+   <resourceStyle width="36" x="352" y="260" height="36"/>
   </symbolStyle>
-  <symbolStyle id="114" name="power_generic">
-   <resourceStyle width="36" x="404" y="260" height="36"/>
+  <symbolStyle id="114" name="power_hydro">
+   <resourceStyle width="36" x="388" y="260" height="36"/>
   </symbolStyle>
-  <symbolStyle id="115" name="power_hydro">
-   <resourceStyle width="36" x="440" y="260" height="36"/>
+  <symbolStyle id="115" name="power_photovoltaic">
+   <resourceStyle width="36" x="424" y="260" height="36"/>
   </symbolStyle>
-  <symbolStyle id="116" name="power_photovoltaic">
-   <resourceStyle width="36" x="476" y="260" height="36"/>
+  <symbolStyle id="116" name="power_wind">
+   <resourceStyle width="36" x="460" y="260" height="36"/>
   </symbolStyle>
-  <symbolStyle id="117" name="power_wind">
-   <resourceStyle width="36" x="512" y="260" height="36"/>
+  <symbolStyle id="117" name="pub">
+   <resourceStyle width="52" x="496" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="118" name="pub">
+  <symbolStyle id="118" name="pubx">
    <resourceStyle width="52" x="548" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="119" name="pubx">
+  <symbolStyle id="119" name="railway-crossing-small">
    <resourceStyle width="52" x="600" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="120" name="railway-crossing-small">
+  <symbolStyle id="120" name="railway-crossing">
    <resourceStyle width="52" x="652" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="121" name="railway-crossing">
+  <symbolStyle id="121" name="railway-station-mini">
    <resourceStyle width="52" x="704" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="122" name="railway-station-mini">
+  <symbolStyle id="122" name="railway-station">
    <resourceStyle width="52" x="756" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="123" name="railway-station">
+  <symbolStyle id="123" name="recycling">
    <resourceStyle width="52" x="808" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="124" name="recycling">
+  <symbolStyle id="124" name="religion">
    <resourceStyle width="52" x="860" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="125" name="religion">
+  <symbolStyle id="125" name="restaurant">
    <resourceStyle width="52" x="912" y="260" height="52"/>
   </symbolStyle>
-  <symbolStyle id="126" name="restaurant">
-   <resourceStyle width="52" x="964" y="260" height="52"/>
+  <symbolStyle id="126" name="roundabout_left">
+   <resourceStyle width="40" x="964" y="260" height="40"/>
   </symbolStyle>
-  <symbolStyle id="127" name="roundabout_left">
+  <symbolStyle id="127" name="roundabout_right">
    <resourceStyle width="40" x="0" y="312" height="40"/>
   </symbolStyle>
-  <symbolStyle id="128" name="roundabout_right">
-   <resourceStyle width="40" x="40" y="312" height="40"/>
+  <symbolStyle id="128" name="school">
+   <resourceStyle width="52" x="40" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="129" name="school">
-   <resourceStyle width="52" x="80" y="312" height="52"/>
+  <symbolStyle id="129" name="shelter-fireplace">
+   <resourceStyle width="52" x="92" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="130" name="shelter-fireplace">
-   <resourceStyle width="52" x="132" y="312" height="52"/>
+  <symbolStyle id="130" name="shelter">
+   <resourceStyle width="52" x="144" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="131" name="shelter">
-   <resourceStyle width="52" x="184" y="312" height="52"/>
+  <symbolStyle id="131" name="shooting-borderless">
+   <resourceStyle width="52" x="196" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="132" name="shooting-borderless">
-   <resourceStyle width="52" x="236" y="312" height="52"/>
+  <symbolStyle id="132" name="shooting">
+   <resourceStyle width="52" x="248" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="133" name="shooting">
-   <resourceStyle width="52" x="288" y="312" height="52"/>
+  <symbolStyle id="133" name="slipway">
+   <resourceStyle width="52" x="300" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="134" name="slipway">
-   <resourceStyle width="52" x="340" y="312" height="52"/>
+  <symbolStyle id="134" name="soccer-borderless">
+   <resourceStyle width="52" x="352" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="135" name="soccer-borderless">
-   <resourceStyle width="52" x="392" y="312" height="52"/>
+  <symbolStyle id="135" name="soccer">
+   <resourceStyle width="52" x="404" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="136" name="soccer">
-   <resourceStyle width="52" x="444" y="312" height="52"/>
+  <symbolStyle id="136" name="speed_trap">
+   <resourceStyle width="40" x="456" y="312" height="40"/>
   </symbolStyle>
-  <symbolStyle id="137" name="speed_trap">
-   <resourceStyle width="40" x="496" y="312" height="40"/>
+  <symbolStyle id="137" name="subway-station-l">
+   <resourceStyle width="52" x="496" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="138" name="subway-station-l">
-   <resourceStyle width="52" x="536" y="312" height="52"/>
+  <symbolStyle id="138" name="subway-station-m">
+   <resourceStyle width="52" x="548" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="139" name="subway-station-m">
-   <resourceStyle width="52" x="588" y="312" height="52"/>
+  <symbolStyle id="139" name="subway-station-s">
+   <resourceStyle width="52" x="600" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="140" name="subway-station-s">
-   <resourceStyle width="52" x="640" y="312" height="52"/>
+  <symbolStyle id="140" name="subway">
+   <resourceStyle width="52" x="652" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="141" name="subway">
-   <resourceStyle width="52" x="692" y="312" height="52"/>
+  <symbolStyle id="141" name="supermarket">
+   <resourceStyle width="52" x="704" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="142" name="supermarket">
-   <resourceStyle width="52" x="744" y="312" height="52"/>
+  <symbolStyle id="142" name="survey_point">
+   <resourceStyle width="20" x="756" y="312" height="20"/>
   </symbolStyle>
-  <symbolStyle id="143" name="survey_point">
-   <resourceStyle width="20" x="796" y="312" height="20"/>
+  <symbolStyle id="143" name="swimming-borderless">
+   <resourceStyle width="52" x="776" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="144" name="swimming-borderless">
-   <resourceStyle width="52" x="816" y="312" height="52"/>
+  <symbolStyle id="144" name="swimming">
+   <resourceStyle width="52" x="828" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="145" name="swimming">
-   <resourceStyle width="52" x="868" y="312" height="52"/>
+  <symbolStyle id="145" name="synagogue">
+   <resourceStyle width="52" x="880" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="146" name="synagogue">
-   <resourceStyle width="52" x="920" y="312" height="52"/>
+  <symbolStyle id="146" name="taxi">
+   <resourceStyle width="52" x="932" y="312" height="52"/>
   </symbolStyle>
-  <symbolStyle id="147" name="taxi">
-   <resourceStyle width="52" x="972" y="312" height="52"/>
-  </symbolStyle>
-  <symbolStyle id="148" name="telephone">
+  <symbolStyle id="147" name="telephone">
    <resourceStyle width="52" x="0" y="364" height="52"/>
   </symbolStyle>
-  <symbolStyle id="149" name="tennis-borderless">
+  <symbolStyle id="148" name="tennis-borderless">
    <resourceStyle width="52" x="52" y="364" height="52"/>
   </symbolStyle>
-  <symbolStyle id="150" name="tennis">
+  <symbolStyle id="149" name="tennis">
    <resourceStyle width="52" x="104" y="364" height="52"/>
   </symbolStyle>
-  <symbolStyle id="151" name="theatre">
+  <symbolStyle id="150" name="theatre">
    <resourceStyle width="52" x="156" y="364" height="52"/>
   </symbolStyle>
-  <symbolStyle id="152" name="toilets">
+  <symbolStyle id="151" name="toilets">
    <resourceStyle width="52" x="208" y="364" height="52"/>
   </symbolStyle>
-  <symbolStyle id="153" name="traffic_signal">
+  <symbolStyle id="152" name="traffic_signal">
    <resourceStyle width="40" x="260" y="364" height="40"/>
   </symbolStyle>
-  <symbolStyle id="154" name="tramway-mini">
+  <symbolStyle id="153" name="tramway-mini">
    <resourceStyle width="52" x="300" y="364" height="52"/>
   </symbolStyle>
-  <symbolStyle id="155" name="tramway">
+  <symbolStyle id="154" name="tramway">
    <resourceStyle width="52" x="352" y="364" height="52"/>
   </symbolStyle>
-  <symbolStyle id="156" name="tree">
+  <symbolStyle id="155" name="tree">
    <resourceStyle width="12" x="404" y="364" height="12"/>
   </symbolStyle>
-  <symbolStyle id="157" name="university">
+  <symbolStyle id="156" name="university">
    <resourceStyle width="52" x="416" y="364" height="52"/>
   </symbolStyle>
-  <symbolStyle id="158" name="viewpoint">
+  <symbolStyle id="157" name="viewpoint">
    <resourceStyle width="36" x="468" y="364" height="36"/>
   </symbolStyle>
-  <symbolStyle id="159" name="vulcan">
+  <symbolStyle id="158" name="vulcan">
    <resourceStyle width="22" x="504" y="364" height="22"/>
   </symbolStyle>
-  <symbolStyle id="160" name="wastewater">
+  <symbolStyle id="159" name="wastewater">
    <resourceStyle width="36" x="526" y="364" height="36"/>
   </symbolStyle>
-  <symbolStyle id="161" name="windmill">
+  <symbolStyle id="160" name="windmill">
    <resourceStyle width="40" x="562" y="364" height="40"/>
   </symbolStyle>
  </page>
diff --git a/data/symbols_hdpi.png b/data/symbols_hdpi.png
index aa2dd82aaa..2ce7b8357d 100644
--- a/data/symbols_hdpi.png
+++ b/data/symbols_hdpi.png
diff --git a/data/symbols_ldpi.png b/data/symbols_ldpi.png
index 8d62610bb3..8dc3207d1d 100644
--- a/data/symbols_ldpi.png
+++ b/data/symbols_ldpi.png
diff --git a/data/symbols_mdpi.png b/data/symbols_mdpi.png
index fb38c2cdaf..dca6c3d318 100644
--- a/data/symbols_mdpi.png
+++ b/data/symbols_mdpi.png
diff --git a/data/symbols_xhdpi.png b/data/symbols_xhdpi.png
index 96c7caf4b7..e0602ddcfa 100644
--- a/data/symbols_xhdpi.png
+++ b/data/symbols_xhdpi.png