yellow pin added

11 files changed, 1117 insertions, 1081 deletions

diff --git a/data/resources-hdpi/basic.skn b/data/resources-hdpi/basic.skn
index 7f555c6edc..2f1ae02895 100644
--- a/data/resources-hdpi/basic.skn
+++ b/data/resources-hdpi/basic.skn
@@ -4,500 +4,503 @@
   <symbolStyle id="1" name="api_pin">
    <resourceStyle width="31" x="0" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="2" name="current-position">
-   <resourceStyle width="40" x="31" y="0" height="40"/>
+  <symbolStyle id="2" name="placemark-blue">
+   <resourceStyle width="31" x="31" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="3" name="placemark-blue">
-   <resourceStyle width="31" x="71" y="0" height="40"/>
+  <symbolStyle id="3" name="placemark-brown">
+   <resourceStyle width="31" x="62" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="4" name="placemark-brown">
-   <resourceStyle width="31" x="102" y="0" height="40"/>
+  <symbolStyle id="4" name="placemark-yellow">
+   <resourceStyle width="31" x="93" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="5" name="placemark-green">
-   <resourceStyle width="31" x="133" y="0" height="40"/>
+  <symbolStyle id="5" name="placemark-red">
+   <resourceStyle width="31" x="124" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="6" name="placemark-orange">
-   <resourceStyle width="31" x="164" y="0" height="40"/>
+  <symbolStyle id="6" name="current-position">
+   <resourceStyle width="40" x="155" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="7" name="placemark-pink">
+  <symbolStyle id="7" name="placemark-purple">
    <resourceStyle width="31" x="195" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="8" name="placemark-purple">
+  <symbolStyle id="8" name="placemark-pink">
    <resourceStyle width="31" x="226" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="9" name="placemark-red">
+  <symbolStyle id="9" name="placemark-orange">
    <resourceStyle width="31" x="257" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="10" name="airport">
-   <resourceStyle width="28" x="288" y="0" height="28"/>
+  <symbolStyle id="10" name="placemark-green">
+   <resourceStyle width="31" x="288" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="11" name="alpine_hut">
-   <resourceStyle width="28" x="316" y="0" height="28"/>
+  <symbolStyle id="11" name="peak">
+   <resourceStyle width="28" x="319" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="12" name="archery-borderless">
-   <resourceStyle width="28" x="344" y="0" height="28"/>
+  <symbolStyle id="12" name="petrolstation">
+   <resourceStyle width="28" x="347" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="13" name="archery">
-   <resourceStyle width="28" x="372" y="0" height="28"/>
+  <symbolStyle id="13" name="pharmacy">
+   <resourceStyle width="28" x="375" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="14" name="arrow">
-   <resourceStyle width="28" x="400" y="0" height="28"/>
+  <symbolStyle id="14" name="playground">
+   <resourceStyle width="28" x="403" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="15" name="athletics-borderless">
-   <resourceStyle width="28" x="428" y="0" height="28"/>
+  <symbolStyle id="15" name="police">
+   <resourceStyle width="28" x="431" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="16" name="athletics">
-   <resourceStyle width="28" x="456" y="0" height="28"/>
+  <symbolStyle id="16" name="postbox">
+   <resourceStyle width="28" x="459" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="17" name="atm">
-   <resourceStyle width="28" x="484" y="0" height="28"/>
-  </symbolStyle>
-  <symbolStyle id="18" name="bakery">
+  <symbolStyle id="17" name="postoffice">
    <resourceStyle width="28" x="0" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="19" name="bar">
+  <symbolStyle id="18" name="pub">
    <resourceStyle width="28" x="28" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="20" name="barrier">
+  <symbolStyle id="19" name="hotel">
    <resourceStyle width="28" x="56" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="21" name="baseball-borderless">
+  <symbolStyle id="20" name="hunting_closed_high">
    <resourceStyle width="28" x="84" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="22" name="baseball">
+  <symbolStyle id="21" name="information-guidepost">
    <resourceStyle width="28" x="112" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="23" name="basketball">
+  <symbolStyle id="22" name="information-office">
    <resourceStyle width="28" x="140" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="24" name="bicycle_rental">
+  <symbolStyle id="23" name="information">
    <resourceStyle width="28" x="168" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="25" name="bird">
+  <symbolStyle id="24" name="kindergarten">
    <resourceStyle width="28" x="196" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="26" name="bowls-borderless">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="28" x="224" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="27" name="bowls">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="28" x="252" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="28" name="bus-mini">
+  <symbolStyle id="27" name="library">
    <resourceStyle width="28" x="280" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="29" name="bus">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="28" x="308" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="30" name="bus_sta">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="28" x="336" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="31" name="cafe">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="28" x="364" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="32" name="campsite">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="28" x="392" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="33" name="cannon">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="28" x="420" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="34" name="car_rental">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="28" x="448" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="35" name="car_repair">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="28" x="476" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="36" name="castle">
+  <symbolStyle id="35" name="peak-mini">
    <resourceStyle width="28" x="0" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="37" name="cinema">
+  <symbolStyle id="36" name="subway-station-l">
    <resourceStyle width="28" x="28" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="38" name="clothes">
+  <symbolStyle id="37" name="subway-station-m">
    <resourceStyle width="28" x="56" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="39" name="cricket-borderless">
+  <symbolStyle id="38" name="subway-station-s">
    <resourceStyle width="28" x="84" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="40" name="cricket">
+  <symbolStyle id="39" name="subway">
    <resourceStyle width="28" x="112" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="41" name="curling-borderless">
+  <symbolStyle id="40" name="supermarket">
    <resourceStyle width="28" x="140" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="42" name="curling">
+  <symbolStyle id="41" name="swimming-borderless">
    <resourceStyle width="28" x="168" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="43" name="diving-borderless">
+  <symbolStyle id="42" name="swimming">
    <resourceStyle width="28" x="196" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="44" name="diving">
+  <symbolStyle id="43" name="synagogue">
    <resourceStyle width="28" x="224" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="45" name="dog_park">
+  <symbolStyle id="44" name="taxi">
    <resourceStyle width="28" x="252" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="46" name="earthquakecamp">
+  <symbolStyle id="45" name="telephone">
    <resourceStyle width="28" x="280" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="47" name="equestrian-borderless">
+  <symbolStyle id="46" name="tennis-borderless">
    <resourceStyle width="28" x="308" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="48" name="equestrian">
+  <symbolStyle id="47" name="tennis">
    <resourceStyle width="28" x="336" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="49" name="fastfood">
+  <symbolStyle id="48" name="theatre">
    <resourceStyle width="28" x="364" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="50" name="firebrigade">
+  <symbolStyle id="49" name="toilets">
    <resourceStyle width="28" x="392" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="51" name="football-borderless">
+  <symbolStyle id="50" name="tramway-mini">
    <resourceStyle width="28" x="420" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="52" name="football">
+  <symbolStyle id="51" name="tramway">
    <resourceStyle width="28" x="448" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="53" name="fountain">
+  <symbolStyle id="52" name="university">
    <resourceStyle width="28" x="476" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="54" name="gate">
+  <symbolStyle id="53" name="pubx">
    <resourceStyle width="28" x="0" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="55" name="golfcourse">
+  <symbolStyle id="54" name="railway-crossing-small">
    <resourceStyle width="28" x="28" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="56" name="gymnastics-borderless">
+  <symbolStyle id="55" name="railway-crossing">
    <resourceStyle width="28" x="56" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="57" name="gymnastics">
+  <symbolStyle id="56" name="railway-station-mini">
    <resourceStyle width="28" x="84" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="58" name="hairdresser">
+  <symbolStyle id="57" name="railway-station">
    <resourceStyle width="28" x="112" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="59" name="handball-borderless">
+  <symbolStyle id="58" name="recycling">
    <resourceStyle width="28" x="140" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="60" name="handball">
+  <symbolStyle id="59" name="religion">
    <resourceStyle width="28" x="168" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="61" name="helipad">
+  <symbolStyle id="60" name="restaurant">
    <resourceStyle width="28" x="196" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="62" name="hospital">
+  <symbolStyle id="61" name="ruins">
    <resourceStyle width="28" x="224" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="63" name="hospital0">
+  <symbolStyle id="62" name="school">
    <resourceStyle width="28" x="252" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="64" name="hostel">
+  <symbolStyle id="63" name="shelter-fireplace">
    <resourceStyle width="28" x="280" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="65" name="hotel">
+  <symbolStyle id="64" name="shelter">
    <resourceStyle width="28" x="308" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="66" name="hunting_closed_high">
+  <symbolStyle id="65" name="shooting-borderless">
    <resourceStyle width="28" x="336" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="67" name="information-guidepost">
+  <symbolStyle id="66" name="shooting">
    <resourceStyle width="28" x="364" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="68" name="information-office">
+  <symbolStyle id="67" name="slipway">
    <resourceStyle width="28" x="392" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="69" name="information">
+  <symbolStyle id="68" name="soccer-borderless">
    <resourceStyle width="28" x="420" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="70" name="kindergarten">
+  <symbolStyle id="69" name="soccer">
    <resourceStyle width="28" x="448" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="71" name="kindergarten2">
+  <symbolStyle id="70" name="equestrian">
    <resourceStyle width="28" x="476" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="72" name="kiosk">
+  <symbolStyle id="71" name="equestrian-borderless">
    <resourceStyle width="28" x="0" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="73" name="library">
+  <symbolStyle id="72" name="earthquakecamp">
    <resourceStyle width="28" x="28" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="74" name="man-made-halfpipe">
+  <symbolStyle id="73" name="bar">
    <resourceStyle width="28" x="56" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="75" name="memorial">
+  <symbolStyle id="74" name="barrier">
    <resourceStyle width="28" x="84" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="76" name="mountain_pass">
+  <symbolStyle id="75" name="dog_park">
    <resourceStyle width="28" x="112" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="77" name="museum">
+  <symbolStyle id="76" name="baseball-borderless">
    <resourceStyle width="28" x="140" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="78" name="parking-mini">
+  <symbolStyle id="77" name="diving">
    <resourceStyle width="28" x="168" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="79" name="parking">
+  <symbolStyle id="78" name="diving-borderless">
    <resourceStyle width="28" x="196" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="80" name="parking_roof">
+  <symbolStyle id="79" name="baseball">
    <resourceStyle width="28" x="224" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="81" name="peak-mini">
+  <symbolStyle id="80" name="curling">
    <resourceStyle width="28" x="252" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="82" name="peak">
+  <symbolStyle id="81" name="curling-borderless">
    <resourceStyle width="28" x="280" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="83" name="petrolstation">
+  <symbolStyle id="82" name="cricket">
    <resourceStyle width="28" x="308" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="84" name="pharmacy">
+  <symbolStyle id="83" name="cricket-borderless">
    <resourceStyle width="28" x="336" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="85" name="playground">
+  <symbolStyle id="84" name="clothes">
    <resourceStyle width="28" x="364" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="86" name="police">
+  <symbolStyle id="85" name="cinema">
    <resourceStyle width="28" x="392" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="87" name="postbox">
+  <symbolStyle id="86" name="basketball">
    <resourceStyle width="28" x="420" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="88" name="postoffice">
+  <symbolStyle id="87" name="bicycle_rental">
    <resourceStyle width="28" x="448" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="89" name="pub">
+  <symbolStyle id="88" name="bird">
    <resourceStyle width="28" x="476" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="90" name="pubx">
+  <symbolStyle id="89" name="bowls-borderless">
    <resourceStyle width="28" x="0" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="91" name="railway-crossing-small">
+  <symbolStyle id="90" name="bowls">
    <resourceStyle width="28" x="28" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="92" name="railway-crossing">
+  <symbolStyle id="91" name="bus-mini">
    <resourceStyle width="28" x="56" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="93" name="railway-station-mini">
+  <symbolStyle id="92" name="castle">
    <resourceStyle width="28" x="84" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="94" name="railway-station">
+  <symbolStyle id="93" name="bus">
    <resourceStyle width="28" x="112" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="95" name="recycling">
+  <symbolStyle id="94" name="car_repair">
    <resourceStyle width="28" x="140" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="96" name="religion">
+  <symbolStyle id="95" name="car_rental">
    <resourceStyle width="28" x="168" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="97" name="restaurant">
+  <symbolStyle id="96" name="cannon">
    <resourceStyle width="28" x="196" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="98" name="ruins">
+  <symbolStyle id="97" name="campsite">
    <resourceStyle width="28" x="224" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="99" name="school">
+  <symbolStyle id="98" name="cafe">
    <resourceStyle width="28" x="252" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="100" name="shelter-fireplace">
+  <symbolStyle id="99" name="bus_sta">
    <resourceStyle width="28" x="280" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="101" name="shelter">
+  <symbolStyle id="100" name="hostel">
    <resourceStyle width="28" x="308" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="102" name="shooting-borderless">
+  <symbolStyle id="101" name="airport">
    <resourceStyle width="28" x="336" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="103" name="shooting">
+  <symbolStyle id="102" name="hospital0">
    <resourceStyle width="28" x="364" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="104" name="slipway">
+  <symbolStyle id="103" name="hospital">
    <resourceStyle width="28" x="392" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="105" name="soccer-borderless">
+  <symbolStyle id="104" name="helipad">
    <resourceStyle width="28" x="420" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="106" name="soccer">
+  <symbolStyle id="105" name="handball">
    <resourceStyle width="28" x="448" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="107" name="subway-station-l">
+  <symbolStyle id="106" name="handball-borderless">
    <resourceStyle width="28" x="476" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="108" name="subway-station-m">
+  <symbolStyle id="107" name="hairdresser">
    <resourceStyle width="28" x="0" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="109" name="subway-station-s">
+  <symbolStyle id="108" name="gymnastics">
    <resourceStyle width="28" x="28" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="110" name="subway">
+  <symbolStyle id="109" name="gymnastics-borderless">
    <resourceStyle width="28" x="56" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="111" name="supermarket">
+  <symbolStyle id="110" name="alpine_hut">
    <resourceStyle width="28" x="84" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="112" name="swimming-borderless">
+  <symbolStyle id="111" name="golfcourse">
    <resourceStyle width="28" x="112" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="113" name="swimming">
+  <symbolStyle id="112" name="gate">
    <resourceStyle width="28" x="140" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="114" name="synagogue">
+  <symbolStyle id="113" name="archery-borderless">
    <resourceStyle width="28" x="168" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="115" name="taxi">
+  <symbolStyle id="114" name="bakery">
    <resourceStyle width="28" x="196" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="116" name="telephone">
+  <symbolStyle id="115" name="atm">
    <resourceStyle width="28" x="224" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="117" name="tennis-borderless">
+  <symbolStyle id="116" name="fastfood">
    <resourceStyle width="28" x="252" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="118" name="tennis">
+  <symbolStyle id="117" name="athletics">
    <resourceStyle width="28" x="280" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="119" name="theatre">
+  <symbolStyle id="118" name="athletics-borderless">
    <resourceStyle width="28" x="308" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="120" name="toilets">
+  <symbolStyle id="119" name="arrow">
    <resourceStyle width="28" x="336" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="121" name="tramway-mini">
+  <symbolStyle id="120" name="firebrigade">
    <resourceStyle width="28" x="364" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="122" name="tramway">
+  <symbolStyle id="121" name="football-borderless">
    <resourceStyle width="28" x="392" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="123" name="university">
+  <symbolStyle id="122" name="archery">
    <resourceStyle width="28" x="420" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="124" name="basketball-borderless">
-   <resourceStyle width="28" x="448" y="180" height="27"/>
+  <symbolStyle id="123" name="football">
+   <resourceStyle width="28" x="448" y="180" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="fountain">
+   <resourceStyle width="28" x="476" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="125" name="khanda">
-   <resourceStyle width="26" x="476" y="180" height="26"/>
+  <symbolStyle id="125" name="basketball-borderless">
+   <resourceStyle width="28" x="0" y="208" height="27"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-permissive">
-   <resourceStyle width="24" x="0" y="208" height="24"/>
+  <symbolStyle id="126" name="khanda">
+   <resourceStyle width="26" x="28" y="208" height="26"/>
   </symbolStyle>
-  <symbolStyle id="127" name="parking-private">
-   <resourceStyle width="24" x="24" y="208" height="24"/>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="24" x="54" y="208" height="24"/>
   </symbolStyle>
-  <symbolStyle id="128" name="bank">
-   <resourceStyle width="22" x="48" y="208" height="22"/>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="24" x="78" y="208" height="24"/>
   </symbolStyle>
-  <symbolStyle id="129" name="church">
-   <resourceStyle width="22" x="70" y="208" height="22"/>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="22" x="102" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="130" name="doctor">
-   <resourceStyle width="22" x="92" y="208" height="22"/>
+  <symbolStyle id="130" name="traffic_signal">
+   <resourceStyle width="22" x="124" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="131" name="drinking_water">
-   <resourceStyle width="22" x="114" y="208" height="22"/>
+  <symbolStyle id="131" name="bank">
+   <resourceStyle width="22" x="146" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="132" name="embassy">
-   <resourceStyle width="22" x="136" y="208" height="22"/>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="22" x="168" y="208" height="22"/>
   </symbolStyle>
   <symbolStyle id="133" name="housenumber">
-   <resourceStyle width="22" x="158" y="208" height="22"/>
+   <resourceStyle width="22" x="190" y="208" height="22"/>
   </symbolStyle>
   <symbolStyle id="134" name="mosque">
-   <resourceStyle width="22" x="180" y="208" height="22"/>
+   <resourceStyle width="22" x="212" y="208" height="22"/>
   </symbolStyle>
   <symbolStyle id="135" name="parking_roof-permissive">
-   <resourceStyle width="22" x="202" y="208" height="22"/>
+   <resourceStyle width="22" x="234" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="136" name="roundabout_left">
-   <resourceStyle width="22" x="224" y="208" height="22"/>
+  <symbolStyle id="136" name="embassy">
+   <resourceStyle width="22" x="256" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="137" name="roundabout_right">
-   <resourceStyle width="22" x="246" y="208" height="22"/>
+  <symbolStyle id="137" name="drinking_water">
+   <resourceStyle width="22" x="278" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="138" name="speed_trap">
-   <resourceStyle width="22" x="268" y="208" height="22"/>
+  <symbolStyle id="138" name="doctor">
+   <resourceStyle width="22" x="300" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="139" name="traffic_signal">
-   <resourceStyle width="22" x="290" y="208" height="22"/>
+  <symbolStyle id="139" name="church">
+   <resourceStyle width="22" x="322" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="140" name="windmill">
-   <resourceStyle width="22" x="312" y="208" height="22"/>
+  <symbolStyle id="140" name="roundabout_right">
+   <resourceStyle width="22" x="344" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="141" name="bureau_de_change">
-   <resourceStyle width="20" x="334" y="208" height="20"/>
+  <symbolStyle id="141" name="roundabout_left">
+   <resourceStyle width="22" x="366" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="142" name="cave_entrance">
-   <resourceStyle width="20" x="354" y="208" height="20"/>
+  <symbolStyle id="142" name="power_wind">
+   <resourceStyle width="20" x="388" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="143" name="lighthouse">
-   <resourceStyle width="20" x="374" y="208" height="20"/>
+  <symbolStyle id="143" name="power_photovoltaic">
+   <resourceStyle width="20" x="408" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="144" name="power_generic">
-   <resourceStyle width="20" x="394" y="208" height="20"/>
+  <symbolStyle id="144" name="power_hydro">
+   <resourceStyle width="20" x="428" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="145" name="power_hydro">
-   <resourceStyle width="20" x="414" y="208" height="20"/>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="20" x="448" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="146" name="power_photovoltaic">
-   <resourceStyle width="20" x="434" y="208" height="20"/>
+  <symbolStyle id="146" name="wastewater">
+   <resourceStyle width="20" x="468" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="147" name="power_wind">
-   <resourceStyle width="20" x="454" y="208" height="20"/>
+  <symbolStyle id="147" name="viewpoint">
+   <resourceStyle width="20" x="488" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="148" name="viewpoint">
-   <resourceStyle width="20" x="474" y="208" height="20"/>
+  <symbolStyle id="148" name="lighthouse">
+   <resourceStyle width="20" x="0" y="235" height="20"/>
   </symbolStyle>
-  <symbolStyle id="149" name="wastewater">
-   <resourceStyle width="20" x="0" y="232" height="20"/>
+  <symbolStyle id="149" name="bureau_de_change">
+   <resourceStyle width="20" x="20" y="235" height="20"/>
   </symbolStyle>
-  <symbolStyle id="150" name="car_sharing">
-   <resourceStyle width="20" x="20" y="232" height="19"/>
+  <symbolStyle id="150" name="cave_entrance">
+   <resourceStyle width="20" x="40" y="235" height="20"/>
   </symbolStyle>
-  <symbolStyle id="151" name="hotel_and_restaurant">
-   <resourceStyle width="17" x="40" y="232" height="17"/>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="20" x="60" y="235" height="19"/>
   </symbolStyle>
-  <symbolStyle id="152" name="bench">
-   <resourceStyle width="16" x="57" y="232" height="16"/>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="17" x="80" y="235" height="17"/>
   </symbolStyle>
-  <symbolStyle id="153" name="park_and_ride-permissive">
-   <resourceStyle width="28" x="73" y="232" height="16"/>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="28" x="97" y="235" height="16"/>
   </symbolStyle>
-  <symbolStyle id="154" name="park_and_ride">
-   <resourceStyle width="28" x="101" y="232" height="16"/>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="28" x="125" y="235" height="16"/>
   </symbolStyle>
-  <symbolStyle id="155" name="parking_fee-permissive">
-   <resourceStyle width="28" x="129" y="232" height="16"/>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="16" x="153" y="235" height="16"/>
   </symbolStyle>
   <symbolStyle id="156" name="parking_fee">
-   <resourceStyle width="28" x="157" y="232" height="16"/>
+   <resourceStyle width="28" x="169" y="235" height="16"/>
   </symbolStyle>
-  <symbolStyle id="157" name="parking_roof_fee-permissive">
-   <resourceStyle width="28" x="185" y="232" height="16"/>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="28" x="197" y="235" height="16"/>
   </symbolStyle>
-  <symbolStyle id="158" name="parking_roof_fee">
-   <resourceStyle width="28" x="213" y="232" height="16"/>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="28" x="225" y="235" height="16"/>
   </symbolStyle>
-  <symbolStyle id="159" name="picnic">
-   <resourceStyle width="16" x="241" y="232" height="16"/>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="28" x="253" y="235" height="16"/>
   </symbolStyle>
-  <symbolStyle id="160" name="building">
-   <resourceStyle width="13" x="257" y="232" height="13"/>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="16" x="281" y="235" height="16"/>
   </symbolStyle>
-  <symbolStyle id="161" name="disused">
-   <resourceStyle width="13" x="270" y="232" height="13"/>
+  <symbolStyle id="161" name="building">
+   <resourceStyle width="13" x="297" y="235" height="13"/>
   </symbolStyle>
-  <symbolStyle id="162" name="power-tower">
-   <resourceStyle width="13" x="283" y="232" height="13"/>
+  <symbolStyle id="162" name="disused">
+   <resourceStyle width="13" x="310" y="235" height="13"/>
   </symbolStyle>
   <symbolStyle id="163" name="vulcan">
-   <resourceStyle width="13" x="296" y="232" height="13"/>
+   <resourceStyle width="13" x="323" y="235" height="13"/>
+  </symbolStyle>
+  <symbolStyle id="164" name="power-tower">
+   <resourceStyle width="13" x="336" y="235" height="13"/>
   </symbolStyle>
-  <symbolStyle id="164" name="survey_point">
-   <resourceStyle width="12" x="309" y="232" height="12"/>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="12" x="349" y="235" height="12"/>
   </symbolStyle>
-  <symbolStyle id="165" name="power-pole">
-   <resourceStyle width="9" x="321" y="232" height="9"/>
+  <symbolStyle id="166" name="power-pole">
+   <resourceStyle width="9" x="361" y="235" height="9"/>
   </symbolStyle>
-  <symbolStyle id="166" name="tree">
-   <resourceStyle width="8" x="330" y="232" height="8"/>
+  <symbolStyle id="167" name="tree">
+   <resourceStyle width="8" x="370" y="235" height="8"/>
   </symbolStyle>
  </page>
 </skin>
diff --git a/data/resources-hdpi/symbols.png b/data/resources-hdpi/symbols.png
index 2f9c8734bd..685e4de267 100644
--- a/data/resources-hdpi/symbols.png
+++ b/data/resources-hdpi/symbols.png
diff --git a/data/resources-ldpi/basic.skn b/data/resources-ldpi/basic.skn
index 6d54c81b1a..d28cfd33bb 100644
--- a/data/resources-ldpi/basic.skn
+++ b/data/resources-ldpi/basic.skn
@@ -1,503 +1,506 @@
 <!DOCTYPE skin>
 <skin>
  <page width="256" height="256" file="symbols.png">
-  <symbolStyle id="1" name="airport">
+  <symbolStyle id="1" name="peak-mini">
    <resourceStyle width="20" x="0" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="2" name="alpine_hut">
+  <symbolStyle id="2" name="peak">
    <resourceStyle width="20" x="20" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="3" name="api_pin">
-   <resourceStyle width="16" x="40" y="0" height="20"/>
+  <symbolStyle id="3" name="petrolstation">
+   <resourceStyle width="20" x="40" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="4" name="archery-borderless">
-   <resourceStyle width="20" x="56" y="0" height="20"/>
+  <symbolStyle id="4" name="pharmacy">
+   <resourceStyle width="20" x="60" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="5" name="archery">
-   <resourceStyle width="20" x="76" y="0" height="20"/>
+  <symbolStyle id="5" name="placemark-blue">
+   <resourceStyle width="16" x="80" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="6" name="arrow">
-   <resourceStyle width="20" x="96" y="0" height="20"/>
+  <symbolStyle id="6" name="placemark-brown">
+   <resourceStyle width="16" x="96" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="7" name="athletics-borderless">
-   <resourceStyle width="20" x="116" y="0" height="20"/>
+  <symbolStyle id="7" name="placemark-green">
+   <resourceStyle width="16" x="112" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="8" name="athletics">
-   <resourceStyle width="20" x="136" y="0" height="20"/>
+  <symbolStyle id="8" name="placemark-orange">
+   <resourceStyle width="16" x="128" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="9" name="atm">
-   <resourceStyle width="20" x="156" y="0" height="20"/>
+  <symbolStyle id="9" name="placemark-pink">
+   <resourceStyle width="16" x="144" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="10" name="bakery">
-   <resourceStyle width="20" x="176" y="0" height="20"/>
+  <symbolStyle id="10" name="placemark-purple">
+   <resourceStyle width="16" x="160" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="11" name="bar">
-   <resourceStyle width="20" x="196" y="0" height="20"/>
+  <symbolStyle id="11" name="placemark-red">
+   <resourceStyle width="16" x="176" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="12" name="barrier">
-   <resourceStyle width="20" x="216" y="0" height="20"/>
+  <symbolStyle id="12" name="placemark-yellow">
+   <resourceStyle width="16" x="192" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="13" name="baseball-borderless">
-   <resourceStyle width="20" x="236" y="0" height="20"/>
+  <symbolStyle id="13" name="playground">
+   <resourceStyle width="20" x="208" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="14" name="baseball">
+  <symbolStyle id="14" name="police">
+   <resourceStyle width="20" x="228" y="0" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="15" name="postbox">
    <resourceStyle width="20" x="0" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="15" name="basketball">
+  <symbolStyle id="16" name="postoffice">
    <resourceStyle width="20" x="20" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="16" name="bicycle_rental">
+  <symbolStyle id="17" name="pub">
    <resourceStyle width="20" x="40" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="17" name="bird">
+  <symbolStyle id="18" name="hostel">
    <resourceStyle width="20" x="60" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="18" name="bowls-borderless">
+  <symbolStyle id="19" name="hotel">
    <resourceStyle width="20" x="80" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="19" name="bowls">
+  <symbolStyle id="20" name="hunting_closed_high">
    <resourceStyle width="20" x="100" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="20" name="bus-mini">
+  <symbolStyle id="21" name="information-guidepost">
    <resourceStyle width="20" x="120" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="21" name="bus">
+  <symbolStyle id="22" name="information-office">
    <resourceStyle width="20" x="140" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="22" name="bus_sta">
+  <symbolStyle id="23" name="information">
    <resourceStyle width="20" x="160" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="23" name="cafe">
+  <symbolStyle id="24" name="kindergarten">
    <resourceStyle width="20" x="180" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="24" name="campsite">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="20" x="200" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="25" name="cannon">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="20" x="220" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="26" name="car_rental">
+  <symbolStyle id="27" name="library">
    <resourceStyle width="20" x="0" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="27" name="car_repair">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="20" x="20" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="28" name="castle">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="20" x="40" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="29" name="cinema">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="20" x="60" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="30" name="clothes">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="20" x="80" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="31" name="cricket-borderless">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="20" x="100" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="32" name="cricket">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="20" x="120" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="33" name="curling-borderless">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="20" x="140" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="34" name="curling">
+  <symbolStyle id="35" name="subway-station-l">
    <resourceStyle width="20" x="160" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="35" name="current-position">
+  <symbolStyle id="36" name="subway-station-m">
    <resourceStyle width="20" x="180" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="36" name="diving-borderless">
+  <symbolStyle id="37" name="subway-station-s">
    <resourceStyle width="20" x="200" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="37" name="diving">
+  <symbolStyle id="38" name="subway">
    <resourceStyle width="20" x="220" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="38" name="dog_park">
+  <symbolStyle id="39" name="supermarket">
    <resourceStyle width="20" x="0" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="39" name="earthquakecamp">
+  <symbolStyle id="40" name="swimming-borderless">
    <resourceStyle width="20" x="20" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="40" name="equestrian-borderless">
+  <symbolStyle id="41" name="swimming">
    <resourceStyle width="20" x="40" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="41" name="equestrian">
+  <symbolStyle id="42" name="synagogue">
    <resourceStyle width="20" x="60" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="42" name="fastfood">
+  <symbolStyle id="43" name="taxi">
    <resourceStyle width="20" x="80" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="43" name="firebrigade">
+  <symbolStyle id="44" name="telephone">
    <resourceStyle width="20" x="100" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="44" name="football-borderless">
+  <symbolStyle id="45" name="tennis-borderless">
    <resourceStyle width="20" x="120" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="45" name="football">
+  <symbolStyle id="46" name="tennis">
    <resourceStyle width="20" x="140" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="46" name="fountain">
+  <symbolStyle id="47" name="theatre">
    <resourceStyle width="20" x="160" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="47" name="gate">
+  <symbolStyle id="48" name="toilets">
    <resourceStyle width="20" x="180" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="48" name="golfcourse">
+  <symbolStyle id="49" name="tramway-mini">
    <resourceStyle width="20" x="200" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="49" name="gymnastics-borderless">
+  <symbolStyle id="50" name="tramway">
    <resourceStyle width="20" x="220" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="50" name="gymnastics">
+  <symbolStyle id="51" name="university">
    <resourceStyle width="20" x="0" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="51" name="hairdresser">
+  <symbolStyle id="52" name="pubx">
    <resourceStyle width="20" x="20" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="52" name="handball-borderless">
+  <symbolStyle id="53" name="railway-crossing-small">
    <resourceStyle width="20" x="40" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="53" name="handball">
+  <symbolStyle id="54" name="railway-crossing">
    <resourceStyle width="20" x="60" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="54" name="helipad">
+  <symbolStyle id="55" name="railway-station-mini">
    <resourceStyle width="20" x="80" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="55" name="hospital">
+  <symbolStyle id="56" name="railway-station">
    <resourceStyle width="20" x="100" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="56" name="hospital0">
+  <symbolStyle id="57" name="recycling">
    <resourceStyle width="20" x="120" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="57" name="hostel">
+  <symbolStyle id="58" name="religion">
    <resourceStyle width="20" x="140" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="58" name="hotel">
+  <symbolStyle id="59" name="restaurant">
    <resourceStyle width="20" x="160" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="59" name="hunting_closed_high">
+  <symbolStyle id="60" name="ruins">
    <resourceStyle width="20" x="180" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="60" name="information-guidepost">
+  <symbolStyle id="61" name="school">
    <resourceStyle width="20" x="200" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="61" name="information-office">
+  <symbolStyle id="62" name="shelter-fireplace">
    <resourceStyle width="20" x="220" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="62" name="information">
+  <symbolStyle id="63" name="shelter">
    <resourceStyle width="20" x="0" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="63" name="kindergarten">
+  <symbolStyle id="64" name="shooting-borderless">
    <resourceStyle width="20" x="20" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="64" name="kindergarten2">
+  <symbolStyle id="65" name="shooting">
    <resourceStyle width="20" x="40" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="65" name="kiosk">
+  <symbolStyle id="66" name="slipway">
    <resourceStyle width="20" x="60" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="66" name="library">
+  <symbolStyle id="67" name="soccer-borderless">
    <resourceStyle width="20" x="80" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="67" name="man-made-halfpipe">
+  <symbolStyle id="68" name="soccer">
    <resourceStyle width="20" x="100" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="68" name="memorial">
+  <symbolStyle id="69" name="bakery">
    <resourceStyle width="20" x="120" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="69" name="mountain_pass">
+  <symbolStyle id="70" name="earthquakecamp">
    <resourceStyle width="20" x="140" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="70" name="museum">
+  <symbolStyle id="71" name="dog_park">
    <resourceStyle width="20" x="160" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="71" name="parking-mini">
+  <symbolStyle id="72" name="bar">
    <resourceStyle width="20" x="180" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="72" name="parking">
+  <symbolStyle id="73" name="barrier">
    <resourceStyle width="20" x="200" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="73" name="parking_roof">
+  <symbolStyle id="74" name="diving">
    <resourceStyle width="20" x="220" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="74" name="peak-mini">
+  <symbolStyle id="75" name="diving-borderless">
    <resourceStyle width="20" x="0" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="75" name="peak">
+  <symbolStyle id="76" name="baseball-borderless">
    <resourceStyle width="20" x="20" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="76" name="petrolstation">
+  <symbolStyle id="77" name="current-position">
    <resourceStyle width="20" x="40" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="77" name="pharmacy">
+  <symbolStyle id="78" name="curling">
    <resourceStyle width="20" x="60" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="78" name="placemark-blue">
-   <resourceStyle width="16" x="80" y="120" height="20"/>
-  </symbolStyle>
-  <symbolStyle id="79" name="placemark-brown">
-   <resourceStyle width="16" x="96" y="120" height="20"/>
-  </symbolStyle>
-  <symbolStyle id="80" name="placemark-green">
-   <resourceStyle width="16" x="112" y="120" height="20"/>
+  <symbolStyle id="79" name="curling-borderless">
+   <resourceStyle width="20" x="80" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="81" name="placemark-orange">
-   <resourceStyle width="16" x="128" y="120" height="20"/>
+  <symbolStyle id="80" name="cricket">
+   <resourceStyle width="20" x="100" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="82" name="placemark-pink">
-   <resourceStyle width="16" x="144" y="120" height="20"/>
+  <symbolStyle id="81" name="cricket-borderless">
+   <resourceStyle width="20" x="120" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="83" name="placemark-purple">
-   <resourceStyle width="16" x="160" y="120" height="20"/>
+  <symbolStyle id="82" name="clothes">
+   <resourceStyle width="20" x="140" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="84" name="placemark-red">
-   <resourceStyle width="16" x="176" y="120" height="20"/>
+  <symbolStyle id="83" name="cinema">
+   <resourceStyle width="20" x="160" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="85" name="playground">
-   <resourceStyle width="20" x="192" y="120" height="20"/>
+  <symbolStyle id="84" name="baseball">
+   <resourceStyle width="20" x="180" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="86" name="police">
-   <resourceStyle width="20" x="212" y="120" height="20"/>
+  <symbolStyle id="85" name="basketball">
+   <resourceStyle width="20" x="200" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="87" name="postbox">
-   <resourceStyle width="20" x="232" y="120" height="20"/>
+  <symbolStyle id="86" name="bicycle_rental">
+   <resourceStyle width="20" x="220" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="88" name="postoffice">
+  <symbolStyle id="87" name="bird">
    <resourceStyle width="20" x="0" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="89" name="pub">
+  <symbolStyle id="88" name="bowls-borderless">
    <resourceStyle width="20" x="20" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="90" name="pubx">
+  <symbolStyle id="89" name="bowls">
    <resourceStyle width="20" x="40" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="91" name="railway-crossing-small">
+  <symbolStyle id="90" name="castle">
    <resourceStyle width="20" x="60" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="92" name="railway-crossing">
+  <symbolStyle id="91" name="bus-mini">
    <resourceStyle width="20" x="80" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="93" name="railway-station-mini">
+  <symbolStyle id="92" name="car_repair">
    <resourceStyle width="20" x="100" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="94" name="railway-station">
+  <symbolStyle id="93" name="car_rental">
    <resourceStyle width="20" x="120" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="95" name="recycling">
+  <symbolStyle id="94" name="cannon">
    <resourceStyle width="20" x="140" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="96" name="religion">
+  <symbolStyle id="95" name="campsite">
    <resourceStyle width="20" x="160" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="97" name="restaurant">
+  <symbolStyle id="96" name="cafe">
    <resourceStyle width="20" x="180" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="98" name="ruins">
+  <symbolStyle id="97" name="bus_sta">
    <resourceStyle width="20" x="200" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="99" name="school">
+  <symbolStyle id="98" name="bus">
    <resourceStyle width="20" x="220" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="100" name="shelter-fireplace">
+  <symbolStyle id="99" name="hospital0">
    <resourceStyle width="20" x="0" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="101" name="shelter">
+  <symbolStyle id="100" name="hospital">
    <resourceStyle width="20" x="20" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="102" name="shooting-borderless">
+  <symbolStyle id="101" name="airport">
    <resourceStyle width="20" x="40" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="103" name="shooting">
+  <symbolStyle id="102" name="helipad">
    <resourceStyle width="20" x="60" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="104" name="slipway">
+  <symbolStyle id="103" name="handball">
    <resourceStyle width="20" x="80" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="105" name="soccer-borderless">
+  <symbolStyle id="104" name="handball-borderless">
    <resourceStyle width="20" x="100" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="106" name="soccer">
+  <symbolStyle id="105" name="hairdresser">
    <resourceStyle width="20" x="120" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="107" name="subway-station-l">
+  <symbolStyle id="106" name="gymnastics">
    <resourceStyle width="20" x="140" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="108" name="subway-station-m">
+  <symbolStyle id="107" name="gymnastics-borderless">
    <resourceStyle width="20" x="160" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="109" name="subway-station-s">
+  <symbolStyle id="108" name="golfcourse">
    <resourceStyle width="20" x="180" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="110" name="subway">
+  <symbolStyle id="109" name="gate">
    <resourceStyle width="20" x="200" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="111" name="supermarket">
+  <symbolStyle id="110" name="alpine_hut">
    <resourceStyle width="20" x="220" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="112" name="swimming-borderless">
+  <symbolStyle id="111" name="fountain">
    <resourceStyle width="20" x="0" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="113" name="swimming">
+  <symbolStyle id="112" name="football">
    <resourceStyle width="20" x="20" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="114" name="synagogue">
-   <resourceStyle width="20" x="40" y="180" height="20"/>
+  <symbolStyle id="113" name="api_pin">
+   <resourceStyle width="16" x="40" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="115" name="taxi">
-   <resourceStyle width="20" x="60" y="180" height="20"/>
+  <symbolStyle id="114" name="atm">
+   <resourceStyle width="20" x="56" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="116" name="telephone">
-   <resourceStyle width="20" x="80" y="180" height="20"/>
+  <symbolStyle id="115" name="athletics">
+   <resourceStyle width="20" x="76" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="117" name="tennis-borderless">
-   <resourceStyle width="20" x="100" y="180" height="20"/>
+  <symbolStyle id="116" name="equestrian-borderless">
+   <resourceStyle width="20" x="96" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="118" name="tennis">
-   <resourceStyle width="20" x="120" y="180" height="20"/>
+  <symbolStyle id="117" name="athletics-borderless">
+   <resourceStyle width="20" x="116" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="119" name="theatre">
-   <resourceStyle width="20" x="140" y="180" height="20"/>
+  <symbolStyle id="118" name="arrow">
+   <resourceStyle width="20" x="136" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="120" name="toilets">
-   <resourceStyle width="20" x="160" y="180" height="20"/>
+  <symbolStyle id="119" name="archery">
+   <resourceStyle width="20" x="156" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="121" name="tramway-mini">
-   <resourceStyle width="20" x="180" y="180" height="20"/>
+  <symbolStyle id="120" name="equestrian">
+   <resourceStyle width="20" x="176" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="122" name="tramway">
-   <resourceStyle width="20" x="200" y="180" height="20"/>
+  <symbolStyle id="121" name="fastfood">
+   <resourceStyle width="20" x="196" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="123" name="university">
-   <resourceStyle width="20" x="220" y="180" height="20"/>
+  <symbolStyle id="122" name="archery-borderless">
+   <resourceStyle width="20" x="216" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="124" name="basketball-borderless">
-   <resourceStyle width="20" x="0" y="200" height="19"/>
+  <symbolStyle id="123" name="firebrigade">
+   <resourceStyle width="20" x="236" y="180" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="football-borderless">
+   <resourceStyle width="20" x="0" y="200" height="20"/>
   </symbolStyle>
   <symbolStyle id="125" name="khanda">
    <resourceStyle width="19" x="20" y="200" height="19"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-permissive">
-   <resourceStyle width="17" x="39" y="200" height="17"/>
+  <symbolStyle id="126" name="basketball-borderless">
+   <resourceStyle width="20" x="39" y="200" height="19"/>
   </symbolStyle>
-  <symbolStyle id="127" name="parking-private">
-   <resourceStyle width="17" x="56" y="200" height="17"/>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="17" x="59" y="200" height="17"/>
   </symbolStyle>
-  <symbolStyle id="128" name="bank">
-   <resourceStyle width="16" x="73" y="200" height="16"/>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="17" x="76" y="200" height="17"/>
   </symbolStyle>
-  <symbolStyle id="129" name="church">
-   <resourceStyle width="16" x="89" y="200" height="16"/>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="16" x="93" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="130" name="doctor">
-   <resourceStyle width="16" x="105" y="200" height="16"/>
+  <symbolStyle id="130" name="bank">
+   <resourceStyle width="16" x="109" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="131" name="drinking_water">
-   <resourceStyle width="16" x="121" y="200" height="16"/>
+  <symbolStyle id="131" name="traffic_signal">
+   <resourceStyle width="16" x="125" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="132" name="embassy">
-   <resourceStyle width="16" x="137" y="200" height="16"/>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="16" x="141" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="133" name="housenumber">
-   <resourceStyle width="16" x="153" y="200" height="16"/>
+  <symbolStyle id="133" name="embassy">
+   <resourceStyle width="16" x="157" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="134" name="mosque">
-   <resourceStyle width="16" x="169" y="200" height="16"/>
+  <symbolStyle id="134" name="drinking_water">
+   <resourceStyle width="16" x="173" y="200" height="16"/>
   </symbolStyle>
   <symbolStyle id="135" name="parking_roof-permissive">
-   <resourceStyle width="16" x="185" y="200" height="16"/>
+   <resourceStyle width="16" x="189" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="136" name="roundabout_left">
-   <resourceStyle width="16" x="201" y="200" height="16"/>
+  <symbolStyle id="136" name="mosque">
+   <resourceStyle width="16" x="205" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="137" name="roundabout_right">
-   <resourceStyle width="16" x="217" y="200" height="16"/>
+  <symbolStyle id="137" name="doctor">
+   <resourceStyle width="16" x="221" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="138" name="speed_trap">
-   <resourceStyle width="16" x="233" y="200" height="16"/>
+  <symbolStyle id="138" name="church">
+   <resourceStyle width="16" x="237" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="139" name="traffic_signal">
-   <resourceStyle width="16" x="0" y="219" height="16"/>
+  <symbolStyle id="139" name="housenumber">
+   <resourceStyle width="16" x="0" y="220" height="16"/>
   </symbolStyle>
-  <symbolStyle id="140" name="windmill">
-   <resourceStyle width="16" x="16" y="219" height="16"/>
+  <symbolStyle id="140" name="roundabout_left">
+   <resourceStyle width="16" x="16" y="220" height="16"/>
   </symbolStyle>
-  <symbolStyle id="141" name="bureau_de_change">
-   <resourceStyle width="15" x="32" y="219" height="15"/>
+  <symbolStyle id="141" name="roundabout_right">
+   <resourceStyle width="16" x="32" y="220" height="16"/>
   </symbolStyle>
-  <symbolStyle id="142" name="cave_entrance">
-   <resourceStyle width="15" x="47" y="219" height="15"/>
+  <symbolStyle id="142" name="power_photovoltaic">
+   <resourceStyle width="15" x="48" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="143" name="lighthouse">
-   <resourceStyle width="15" x="62" y="219" height="15"/>
+  <symbolStyle id="143" name="power_hydro">
+   <resourceStyle width="15" x="63" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="144" name="power_generic">
-   <resourceStyle width="15" x="77" y="219" height="15"/>
+  <symbolStyle id="144" name="wastewater">
+   <resourceStyle width="15" x="78" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="145" name="power_hydro">
-   <resourceStyle width="15" x="92" y="219" height="15"/>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="15" x="93" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="146" name="power_photovoltaic">
-   <resourceStyle width="15" x="107" y="219" height="15"/>
+  <symbolStyle id="146" name="viewpoint">
+   <resourceStyle width="15" x="108" y="220" height="15"/>
   </symbolStyle>
   <symbolStyle id="147" name="power_wind">
-   <resourceStyle width="15" x="122" y="219" height="15"/>
+   <resourceStyle width="15" x="123" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="148" name="viewpoint">
-   <resourceStyle width="15" x="137" y="219" height="15"/>
+  <symbolStyle id="148" name="cave_entrance">
+   <resourceStyle width="15" x="138" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="149" name="wastewater">
-   <resourceStyle width="15" x="152" y="219" height="15"/>
+  <symbolStyle id="149" name="lighthouse">
+   <resourceStyle width="15" x="153" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="150" name="car_sharing">
-   <resourceStyle width="15" x="167" y="219" height="14"/>
+  <symbolStyle id="150" name="bureau_de_change">
+   <resourceStyle width="15" x="168" y="220" height="15"/>
   </symbolStyle>
-  <symbolStyle id="151" name="hotel_and_restaurant">
-   <resourceStyle width="13" x="182" y="219" height="13"/>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="15" x="183" y="220" height="14"/>
   </symbolStyle>
-  <symbolStyle id="152" name="bench">
-   <resourceStyle width="12" x="195" y="219" height="12"/>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="13" x="198" y="220" height="13"/>
   </symbolStyle>
-  <symbolStyle id="153" name="park_and_ride-permissive">
-   <resourceStyle width="20" x="207" y="219" height="12"/>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="20" x="211" y="220" height="12"/>
   </symbolStyle>
-  <symbolStyle id="154" name="park_and_ride">
-   <resourceStyle width="20" x="227" y="219" height="12"/>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="20" x="231" y="220" height="12"/>
   </symbolStyle>
-  <symbolStyle id="155" name="parking_fee-permissive">
-   <resourceStyle width="20" x="0" y="235" height="12"/>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="12" x="0" y="236" height="12"/>
   </symbolStyle>
   <symbolStyle id="156" name="parking_fee">
-   <resourceStyle width="20" x="20" y="235" height="12"/>
+   <resourceStyle width="20" x="12" y="236" height="12"/>
   </symbolStyle>
-  <symbolStyle id="157" name="parking_roof_fee-permissive">
-   <resourceStyle width="20" x="40" y="235" height="12"/>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="20" x="32" y="236" height="12"/>
   </symbolStyle>
-  <symbolStyle id="158" name="parking_roof_fee">
-   <resourceStyle width="20" x="60" y="235" height="12"/>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="20" x="52" y="236" height="12"/>
   </symbolStyle>
-  <symbolStyle id="159" name="picnic">
-   <resourceStyle width="12" x="80" y="235" height="12"/>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="20" x="72" y="236" height="12"/>
   </symbolStyle>
-  <symbolStyle id="160" name="building">
-   <resourceStyle width="10" x="92" y="235" height="10"/>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="12" x="92" y="236" height="12"/>
   </symbolStyle>
   <symbolStyle id="161" name="disused">
-   <resourceStyle width="10" x="102" y="235" height="10"/>
+   <resourceStyle width="10" x="104" y="236" height="10"/>
   </symbolStyle>
   <symbolStyle id="162" name="power-tower">
-   <resourceStyle width="10" x="112" y="235" height="10"/>
+   <resourceStyle width="10" x="114" y="236" height="10"/>
   </symbolStyle>
   <symbolStyle id="163" name="vulcan">
-   <resourceStyle width="10" x="122" y="235" height="10"/>
+   <resourceStyle width="10" x="124" y="236" height="10"/>
   </symbolStyle>
-  <symbolStyle id="164" name="survey_point">
-   <resourceStyle width="9" x="132" y="235" height="9"/>
+  <symbolStyle id="164" name="building">
+   <resourceStyle width="10" x="134" y="236" height="10"/>
   </symbolStyle>
-  <symbolStyle id="165" name="power-pole">
-   <resourceStyle width="7" x="141" y="235" height="7"/>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="9" x="144" y="236" height="9"/>
   </symbolStyle>
   <symbolStyle id="166" name="tree">
-   <resourceStyle width="7" x="148" y="235" height="7"/>
+   <resourceStyle width="7" x="153" y="236" height="7"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="power-pole">
+   <resourceStyle width="7" x="160" y="236" height="7"/>
   </symbolStyle>
  </page>
 </skin>
diff --git a/data/resources-ldpi/symbols.png b/data/resources-ldpi/symbols.png
index 7c6798fed3..b507349876 100644
--- a/data/resources-ldpi/symbols.png
+++ b/data/resources-ldpi/symbols.png
diff --git a/data/resources-mdpi/basic.skn b/data/resources-mdpi/basic.skn
index f44569cd17..2afa66ed88 100644
--- a/data/resources-mdpi/basic.skn
+++ b/data/resources-mdpi/basic.skn
@@ -4,500 +4,503 @@
   <symbolStyle id="1" name="api_pin">
    <resourceStyle width="22" x="0" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="2" name="current-position">
-   <resourceStyle width="28" x="22" y="0" height="28"/>
+  <symbolStyle id="2" name="placemark-blue">
+   <resourceStyle width="22" x="22" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="3" name="placemark-blue">
-   <resourceStyle width="22" x="50" y="0" height="28"/>
+  <symbolStyle id="3" name="placemark-brown">
+   <resourceStyle width="22" x="44" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="4" name="placemark-brown">
-   <resourceStyle width="22" x="72" y="0" height="28"/>
+  <symbolStyle id="4" name="placemark-yellow">
+   <resourceStyle width="22" x="66" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="5" name="placemark-green">
-   <resourceStyle width="22" x="94" y="0" height="28"/>
+  <symbolStyle id="5" name="placemark-red">
+   <resourceStyle width="22" x="88" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="6" name="placemark-orange">
-   <resourceStyle width="22" x="116" y="0" height="28"/>
+  <symbolStyle id="6" name="current-position">
+   <resourceStyle width="28" x="110" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="7" name="placemark-pink">
+  <symbolStyle id="7" name="placemark-purple">
    <resourceStyle width="22" x="138" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="8" name="placemark-purple">
+  <symbolStyle id="8" name="placemark-pink">
    <resourceStyle width="22" x="160" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="9" name="placemark-red">
+  <symbolStyle id="9" name="placemark-orange">
    <resourceStyle width="22" x="182" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="10" name="airport">
-   <resourceStyle width="20" x="204" y="0" height="20"/>
+  <symbolStyle id="10" name="placemark-green">
+   <resourceStyle width="22" x="204" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="11" name="alpine_hut">
-   <resourceStyle width="20" x="224" y="0" height="20"/>
+  <symbolStyle id="11" name="peak">
+   <resourceStyle width="20" x="226" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="12" name="archery-borderless">
-   <resourceStyle width="20" x="244" y="0" height="20"/>
+  <symbolStyle id="12" name="petrolstation">
+   <resourceStyle width="20" x="246" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="13" name="archery">
-   <resourceStyle width="20" x="264" y="0" height="20"/>
+  <symbolStyle id="13" name="pharmacy">
+   <resourceStyle width="20" x="266" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="14" name="arrow">
-   <resourceStyle width="20" x="284" y="0" height="20"/>
+  <symbolStyle id="14" name="playground">
+   <resourceStyle width="20" x="286" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="15" name="athletics-borderless">
-   <resourceStyle width="20" x="304" y="0" height="20"/>
+  <symbolStyle id="15" name="police">
+   <resourceStyle width="20" x="306" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="16" name="athletics">
-   <resourceStyle width="20" x="324" y="0" height="20"/>
+  <symbolStyle id="16" name="postbox">
+   <resourceStyle width="20" x="326" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="17" name="atm">
-   <resourceStyle width="20" x="344" y="0" height="20"/>
+  <symbolStyle id="17" name="postoffice">
+   <resourceStyle width="20" x="346" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="18" name="bakery">
-   <resourceStyle width="20" x="364" y="0" height="20"/>
+  <symbolStyle id="18" name="pub">
+   <resourceStyle width="20" x="366" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="19" name="bar">
-   <resourceStyle width="20" x="384" y="0" height="20"/>
+  <symbolStyle id="19" name="hotel">
+   <resourceStyle width="20" x="386" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="20" name="barrier">
-   <resourceStyle width="20" x="404" y="0" height="20"/>
+  <symbolStyle id="20" name="hunting_closed_high">
+   <resourceStyle width="20" x="406" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="21" name="baseball-borderless">
-   <resourceStyle width="20" x="424" y="0" height="20"/>
+  <symbolStyle id="21" name="information-guidepost">
+   <resourceStyle width="20" x="426" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="22" name="baseball">
-   <resourceStyle width="20" x="444" y="0" height="20"/>
+  <symbolStyle id="22" name="information-office">
+   <resourceStyle width="20" x="446" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="23" name="basketball">
-   <resourceStyle width="20" x="464" y="0" height="20"/>
+  <symbolStyle id="23" name="information">
+   <resourceStyle width="20" x="466" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="24" name="bicycle_rental">
-   <resourceStyle width="20" x="484" y="0" height="20"/>
+  <symbolStyle id="24" name="kindergarten">
+   <resourceStyle width="20" x="486" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="25" name="bird">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="20" x="0" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="26" name="bowls-borderless">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="20" x="20" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="27" name="bowls">
+  <symbolStyle id="27" name="library">
    <resourceStyle width="20" x="40" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="28" name="bus-mini">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="20" x="60" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="29" name="bus">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="20" x="80" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="30" name="bus_sta">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="20" x="100" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="31" name="cafe">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="20" x="120" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="32" name="campsite">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="20" x="140" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="33" name="cannon">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="20" x="160" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="34" name="car_rental">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="20" x="180" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="35" name="car_repair">
+  <symbolStyle id="35" name="peak-mini">
    <resourceStyle width="20" x="200" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="36" name="castle">
+  <symbolStyle id="36" name="subway-station-l">
    <resourceStyle width="20" x="220" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="37" name="cinema">
+  <symbolStyle id="37" name="subway-station-m">
    <resourceStyle width="20" x="240" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="38" name="clothes">
+  <symbolStyle id="38" name="subway-station-s">
    <resourceStyle width="20" x="260" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="39" name="cricket-borderless">
+  <symbolStyle id="39" name="subway">
    <resourceStyle width="20" x="280" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="40" name="cricket">
+  <symbolStyle id="40" name="supermarket">
    <resourceStyle width="20" x="300" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="41" name="curling-borderless">
+  <symbolStyle id="41" name="swimming-borderless">
    <resourceStyle width="20" x="320" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="42" name="curling">
+  <symbolStyle id="42" name="swimming">
    <resourceStyle width="20" x="340" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="43" name="diving-borderless">
+  <symbolStyle id="43" name="synagogue">
    <resourceStyle width="20" x="360" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="44" name="diving">
+  <symbolStyle id="44" name="taxi">
    <resourceStyle width="20" x="380" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="45" name="dog_park">
+  <symbolStyle id="45" name="telephone">
    <resourceStyle width="20" x="400" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="46" name="earthquakecamp">
+  <symbolStyle id="46" name="tennis-borderless">
    <resourceStyle width="20" x="420" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="47" name="equestrian-borderless">
+  <symbolStyle id="47" name="tennis">
    <resourceStyle width="20" x="440" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="48" name="equestrian">
+  <symbolStyle id="48" name="theatre">
    <resourceStyle width="20" x="460" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="49" name="fastfood">
+  <symbolStyle id="49" name="toilets">
    <resourceStyle width="20" x="480" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="50" name="firebrigade">
+  <symbolStyle id="50" name="tramway-mini">
    <resourceStyle width="20" x="0" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="51" name="football-borderless">
+  <symbolStyle id="51" name="tramway">
    <resourceStyle width="20" x="20" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="52" name="football">
+  <symbolStyle id="52" name="university">
    <resourceStyle width="20" x="40" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="53" name="fountain">
+  <symbolStyle id="53" name="pubx">
    <resourceStyle width="20" x="60" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="54" name="gate">
+  <symbolStyle id="54" name="railway-crossing-small">
    <resourceStyle width="20" x="80" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="55" name="golfcourse">
+  <symbolStyle id="55" name="railway-crossing">
    <resourceStyle width="20" x="100" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="56" name="gymnastics-borderless">
+  <symbolStyle id="56" name="railway-station-mini">
    <resourceStyle width="20" x="120" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="57" name="gymnastics">
+  <symbolStyle id="57" name="railway-station">
    <resourceStyle width="20" x="140" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="58" name="hairdresser">
+  <symbolStyle id="58" name="recycling">
    <resourceStyle width="20" x="160" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="59" name="handball-borderless">
+  <symbolStyle id="59" name="religion">
    <resourceStyle width="20" x="180" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="60" name="handball">
+  <symbolStyle id="60" name="restaurant">
    <resourceStyle width="20" x="200" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="61" name="helipad">
+  <symbolStyle id="61" name="ruins">
    <resourceStyle width="20" x="220" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="62" name="hospital">
+  <symbolStyle id="62" name="school">
    <resourceStyle width="20" x="240" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="63" name="hospital0">
+  <symbolStyle id="63" name="shelter-fireplace">
    <resourceStyle width="20" x="260" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="64" name="hostel">
+  <symbolStyle id="64" name="shelter">
    <resourceStyle width="20" x="280" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="65" name="hotel">
+  <symbolStyle id="65" name="shooting-borderless">
    <resourceStyle width="20" x="300" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="66" name="hunting_closed_high">
+  <symbolStyle id="66" name="shooting">
    <resourceStyle width="20" x="320" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="67" name="information-guidepost">
+  <symbolStyle id="67" name="slipway">
    <resourceStyle width="20" x="340" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="68" name="information-office">
+  <symbolStyle id="68" name="soccer-borderless">
    <resourceStyle width="20" x="360" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="69" name="information">
+  <symbolStyle id="69" name="soccer">
    <resourceStyle width="20" x="380" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="70" name="kindergarten">
+  <symbolStyle id="70" name="equestrian">
    <resourceStyle width="20" x="400" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="71" name="kindergarten2">
+  <symbolStyle id="71" name="equestrian-borderless">
    <resourceStyle width="20" x="420" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="72" name="kiosk">
+  <symbolStyle id="72" name="earthquakecamp">
    <resourceStyle width="20" x="440" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="73" name="library">
+  <symbolStyle id="73" name="bar">
    <resourceStyle width="20" x="460" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="74" name="man-made-halfpipe">
+  <symbolStyle id="74" name="barrier">
    <resourceStyle width="20" x="480" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="75" name="memorial">
+  <symbolStyle id="75" name="dog_park">
    <resourceStyle width="20" x="0" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="76" name="mountain_pass">
+  <symbolStyle id="76" name="baseball-borderless">
    <resourceStyle width="20" x="20" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="77" name="museum">
+  <symbolStyle id="77" name="diving">
    <resourceStyle width="20" x="40" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="78" name="parking-mini">
+  <symbolStyle id="78" name="diving-borderless">
    <resourceStyle width="20" x="60" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="79" name="parking">
+  <symbolStyle id="79" name="baseball">
    <resourceStyle width="20" x="80" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="80" name="parking_roof">
+  <symbolStyle id="80" name="curling">
    <resourceStyle width="20" x="100" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="81" name="peak-mini">
+  <symbolStyle id="81" name="curling-borderless">
    <resourceStyle width="20" x="120" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="82" name="peak">
+  <symbolStyle id="82" name="cricket">
    <resourceStyle width="20" x="140" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="83" name="petrolstation">
+  <symbolStyle id="83" name="cricket-borderless">
    <resourceStyle width="20" x="160" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="84" name="pharmacy">
+  <symbolStyle id="84" name="clothes">
    <resourceStyle width="20" x="180" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="85" name="playground">
+  <symbolStyle id="85" name="cinema">
    <resourceStyle width="20" x="200" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="86" name="police">
+  <symbolStyle id="86" name="basketball">
    <resourceStyle width="20" x="220" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="87" name="postbox">
+  <symbolStyle id="87" name="bicycle_rental">
    <resourceStyle width="20" x="240" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="88" name="postoffice">
+  <symbolStyle id="88" name="bird">
    <resourceStyle width="20" x="260" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="89" name="pub">
+  <symbolStyle id="89" name="bowls-borderless">
    <resourceStyle width="20" x="280" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="90" name="pubx">
+  <symbolStyle id="90" name="bowls">
    <resourceStyle width="20" x="300" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="91" name="railway-crossing-small">
+  <symbolStyle id="91" name="bus-mini">
    <resourceStyle width="20" x="320" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="92" name="railway-crossing">
+  <symbolStyle id="92" name="castle">
    <resourceStyle width="20" x="340" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="93" name="railway-station-mini">
+  <symbolStyle id="93" name="bus">
    <resourceStyle width="20" x="360" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="94" name="railway-station">
+  <symbolStyle id="94" name="car_repair">
    <resourceStyle width="20" x="380" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="95" name="recycling">
+  <symbolStyle id="95" name="car_rental">
    <resourceStyle width="20" x="400" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="96" name="religion">
+  <symbolStyle id="96" name="cannon">
    <resourceStyle width="20" x="420" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="97" name="restaurant">
+  <symbolStyle id="97" name="campsite">
    <resourceStyle width="20" x="440" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="98" name="ruins">
+  <symbolStyle id="98" name="cafe">
    <resourceStyle width="20" x="460" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="99" name="school">
+  <symbolStyle id="99" name="bus_sta">
    <resourceStyle width="20" x="480" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="100" name="shelter-fireplace">
+  <symbolStyle id="100" name="hostel">
    <resourceStyle width="20" x="0" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="101" name="shelter">
+  <symbolStyle id="101" name="airport">
    <resourceStyle width="20" x="20" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="102" name="shooting-borderless">
+  <symbolStyle id="102" name="hospital0">
    <resourceStyle width="20" x="40" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="103" name="shooting">
+  <symbolStyle id="103" name="hospital">
    <resourceStyle width="20" x="60" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="104" name="slipway">
+  <symbolStyle id="104" name="helipad">
    <resourceStyle width="20" x="80" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="105" name="soccer-borderless">
+  <symbolStyle id="105" name="handball">
    <resourceStyle width="20" x="100" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="106" name="soccer">
+  <symbolStyle id="106" name="handball-borderless">
    <resourceStyle width="20" x="120" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="107" name="subway-station-l">
+  <symbolStyle id="107" name="hairdresser">
    <resourceStyle width="20" x="140" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="108" name="subway-station-m">
+  <symbolStyle id="108" name="gymnastics">
    <resourceStyle width="20" x="160" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="109" name="subway-station-s">
+  <symbolStyle id="109" name="gymnastics-borderless">
    <resourceStyle width="20" x="180" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="110" name="subway">
+  <symbolStyle id="110" name="alpine_hut">
    <resourceStyle width="20" x="200" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="111" name="supermarket">
+  <symbolStyle id="111" name="golfcourse">
    <resourceStyle width="20" x="220" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="112" name="swimming-borderless">
+  <symbolStyle id="112" name="gate">
    <resourceStyle width="20" x="240" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="113" name="swimming">
+  <symbolStyle id="113" name="archery-borderless">
    <resourceStyle width="20" x="260" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="114" name="synagogue">
+  <symbolStyle id="114" name="bakery">
    <resourceStyle width="20" x="280" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="115" name="taxi">
+  <symbolStyle id="115" name="atm">
    <resourceStyle width="20" x="300" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="116" name="telephone">
+  <symbolStyle id="116" name="fastfood">
    <resourceStyle width="20" x="320" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="117" name="tennis-borderless">
+  <symbolStyle id="117" name="athletics">
    <resourceStyle width="20" x="340" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="118" name="tennis">
+  <symbolStyle id="118" name="athletics-borderless">
    <resourceStyle width="20" x="360" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="119" name="theatre">
+  <symbolStyle id="119" name="arrow">
    <resourceStyle width="20" x="380" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="120" name="toilets">
+  <symbolStyle id="120" name="firebrigade">
    <resourceStyle width="20" x="400" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="121" name="tramway-mini">
+  <symbolStyle id="121" name="football-borderless">
    <resourceStyle width="20" x="420" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="122" name="tramway">
+  <symbolStyle id="122" name="archery">
    <resourceStyle width="20" x="440" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="123" name="university">
+  <symbolStyle id="123" name="football">
    <resourceStyle width="20" x="460" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="124" name="basketball-borderless">
-   <resourceStyle width="20" x="480" y="88" height="19"/>
+  <symbolStyle id="124" name="fountain">
+   <resourceStyle width="20" x="480" y="88" height="20"/>
   </symbolStyle>
   <symbolStyle id="125" name="khanda">
    <resourceStyle width="19" x="0" y="108" height="19"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-permissive">
-   <resourceStyle width="17" x="19" y="108" height="17"/>
+  <symbolStyle id="126" name="basketball-borderless">
+   <resourceStyle width="20" x="19" y="108" height="19"/>
   </symbolStyle>
-  <symbolStyle id="127" name="parking-private">
-   <resourceStyle width="17" x="36" y="108" height="17"/>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="17" x="39" y="108" height="17"/>
   </symbolStyle>
-  <symbolStyle id="128" name="bank">
-   <resourceStyle width="16" x="53" y="108" height="16"/>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="17" x="56" y="108" height="17"/>
   </symbolStyle>
-  <symbolStyle id="129" name="church">
-   <resourceStyle width="16" x="69" y="108" height="16"/>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="16" x="73" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="130" name="doctor">
-   <resourceStyle width="16" x="85" y="108" height="16"/>
+  <symbolStyle id="130" name="traffic_signal">
+   <resourceStyle width="16" x="89" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="131" name="drinking_water">
-   <resourceStyle width="16" x="101" y="108" height="16"/>
+  <symbolStyle id="131" name="bank">
+   <resourceStyle width="16" x="105" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="132" name="embassy">
-   <resourceStyle width="16" x="117" y="108" height="16"/>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="16" x="121" y="108" height="16"/>
   </symbolStyle>
   <symbolStyle id="133" name="housenumber">
-   <resourceStyle width="16" x="133" y="108" height="16"/>
+   <resourceStyle width="16" x="137" y="108" height="16"/>
   </symbolStyle>
   <symbolStyle id="134" name="mosque">
-   <resourceStyle width="16" x="149" y="108" height="16"/>
+   <resourceStyle width="16" x="153" y="108" height="16"/>
   </symbolStyle>
   <symbolStyle id="135" name="parking_roof-permissive">
-   <resourceStyle width="16" x="165" y="108" height="16"/>
+   <resourceStyle width="16" x="169" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="136" name="roundabout_left">
-   <resourceStyle width="16" x="181" y="108" height="16"/>
+  <symbolStyle id="136" name="embassy">
+   <resourceStyle width="16" x="185" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="137" name="roundabout_right">
-   <resourceStyle width="16" x="197" y="108" height="16"/>
+  <symbolStyle id="137" name="drinking_water">
+   <resourceStyle width="16" x="201" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="138" name="speed_trap">
-   <resourceStyle width="16" x="213" y="108" height="16"/>
+  <symbolStyle id="138" name="doctor">
+   <resourceStyle width="16" x="217" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="139" name="traffic_signal">
-   <resourceStyle width="16" x="229" y="108" height="16"/>
+  <symbolStyle id="139" name="church">
+   <resourceStyle width="16" x="233" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="140" name="windmill">
-   <resourceStyle width="16" x="245" y="108" height="16"/>
+  <symbolStyle id="140" name="roundabout_right">
+   <resourceStyle width="16" x="249" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="141" name="bureau_de_change">
-   <resourceStyle width="15" x="261" y="108" height="15"/>
+  <symbolStyle id="141" name="roundabout_left">
+   <resourceStyle width="16" x="265" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="142" name="cave_entrance">
-   <resourceStyle width="15" x="276" y="108" height="15"/>
+  <symbolStyle id="142" name="power_wind">
+   <resourceStyle width="15" x="281" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="143" name="lighthouse">
-   <resourceStyle width="15" x="291" y="108" height="15"/>
+  <symbolStyle id="143" name="power_photovoltaic">
+   <resourceStyle width="15" x="296" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="144" name="power_generic">
-   <resourceStyle width="15" x="306" y="108" height="15"/>
+  <symbolStyle id="144" name="power_hydro">
+   <resourceStyle width="15" x="311" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="145" name="power_hydro">
-   <resourceStyle width="15" x="321" y="108" height="15"/>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="15" x="326" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="146" name="power_photovoltaic">
-   <resourceStyle width="15" x="336" y="108" height="15"/>
+  <symbolStyle id="146" name="wastewater">
+   <resourceStyle width="15" x="341" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="147" name="power_wind">
-   <resourceStyle width="15" x="351" y="108" height="15"/>
+  <symbolStyle id="147" name="viewpoint">
+   <resourceStyle width="15" x="356" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="148" name="viewpoint">
-   <resourceStyle width="15" x="366" y="108" height="15"/>
+  <symbolStyle id="148" name="lighthouse">
+   <resourceStyle width="15" x="371" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="149" name="wastewater">
-   <resourceStyle width="15" x="381" y="108" height="15"/>
+  <symbolStyle id="149" name="bureau_de_change">
+   <resourceStyle width="15" x="386" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="150" name="car_sharing">
-   <resourceStyle width="15" x="396" y="108" height="14"/>
+  <symbolStyle id="150" name="cave_entrance">
+   <resourceStyle width="15" x="401" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="151" name="hotel_and_restaurant">
-   <resourceStyle width="13" x="411" y="108" height="13"/>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="15" x="416" y="108" height="14"/>
   </symbolStyle>
-  <symbolStyle id="152" name="bench">
-   <resourceStyle width="12" x="424" y="108" height="12"/>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="13" x="431" y="108" height="13"/>
   </symbolStyle>
-  <symbolStyle id="153" name="park_and_ride-permissive">
-   <resourceStyle width="20" x="436" y="108" height="12"/>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="20" x="444" y="108" height="12"/>
   </symbolStyle>
-  <symbolStyle id="154" name="park_and_ride">
-   <resourceStyle width="20" x="456" y="108" height="12"/>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="20" x="464" y="108" height="12"/>
   </symbolStyle>
-  <symbolStyle id="155" name="parking_fee-permissive">
-   <resourceStyle width="20" x="476" y="108" height="12"/>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="12" x="484" y="108" height="12"/>
   </symbolStyle>
   <symbolStyle id="156" name="parking_fee">
    <resourceStyle width="20" x="0" y="127" height="12"/>
   </symbolStyle>
-  <symbolStyle id="157" name="parking_roof_fee-permissive">
+  <symbolStyle id="157" name="parking_fee-permissive">
    <resourceStyle width="20" x="20" y="127" height="12"/>
   </symbolStyle>
-  <symbolStyle id="158" name="parking_roof_fee">
+  <symbolStyle id="158" name="park_and_ride">
    <resourceStyle width="20" x="40" y="127" height="12"/>
   </symbolStyle>
-  <symbolStyle id="159" name="picnic">
-   <resourceStyle width="12" x="60" y="127" height="12"/>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="20" x="60" y="127" height="12"/>
   </symbolStyle>
-  <symbolStyle id="160" name="building">
-   <resourceStyle width="10" x="72" y="127" height="10"/>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="12" x="80" y="127" height="12"/>
   </symbolStyle>
-  <symbolStyle id="161" name="disused">
-   <resourceStyle width="10" x="82" y="127" height="10"/>
-  </symbolStyle>
-  <symbolStyle id="162" name="power-tower">
+  <symbolStyle id="161" name="building">
    <resourceStyle width="10" x="92" y="127" height="10"/>
   </symbolStyle>
-  <symbolStyle id="163" name="vulcan">
+  <symbolStyle id="162" name="disused">
    <resourceStyle width="10" x="102" y="127" height="10"/>
   </symbolStyle>
-  <symbolStyle id="164" name="survey_point">
-   <resourceStyle width="9" x="112" y="127" height="9"/>
+  <symbolStyle id="163" name="vulcan">
+   <resourceStyle width="10" x="112" y="127" height="10"/>
   </symbolStyle>
-  <symbolStyle id="165" name="power-pole">
-   <resourceStyle width="7" x="121" y="127" height="7"/>
+  <symbolStyle id="164" name="power-tower">
+   <resourceStyle width="10" x="122" y="127" height="10"/>
+  </symbolStyle>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="9" x="132" y="127" height="9"/>
   </symbolStyle>
   <symbolStyle id="166" name="tree">
-   <resourceStyle width="7" x="128" y="127" height="7"/>
+   <resourceStyle width="7" x="141" y="127" height="7"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="power-pole">
+   <resourceStyle width="7" x="148" y="127" height="7"/>
   </symbolStyle>
  </page>
 </skin>
diff --git a/data/resources-mdpi/symbols.png b/data/resources-mdpi/symbols.png
index 3f1f593d6b..40f35afde8 100644
--- a/data/resources-mdpi/symbols.png
+++ b/data/resources-mdpi/symbols.png
diff --git a/data/resources-xhdpi/basic.skn b/data/resources-xhdpi/basic.skn
index d3c5e4d8bf..e24051cdd7 100644
--- a/data/resources-xhdpi/basic.skn
+++ b/data/resources-xhdpi/basic.skn
@@ -4,500 +4,503 @@
   <symbolStyle id="1" name="api_pin">
    <resourceStyle width="40" x="0" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="2" name="current-position">
-   <resourceStyle width="52" x="40" y="0" height="52"/>
+  <symbolStyle id="2" name="placemark-blue">
+   <resourceStyle width="40" x="40" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="3" name="placemark-blue">
-   <resourceStyle width="40" x="92" y="0" height="52"/>
+  <symbolStyle id="3" name="placemark-brown">
+   <resourceStyle width="40" x="80" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="4" name="placemark-brown">
-   <resourceStyle width="40" x="132" y="0" height="52"/>
+  <symbolStyle id="4" name="placemark-yellow">
+   <resourceStyle width="40" x="120" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="5" name="placemark-green">
-   <resourceStyle width="40" x="172" y="0" height="52"/>
+  <symbolStyle id="5" name="placemark-red">
+   <resourceStyle width="40" x="160" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="6" name="placemark-orange">
-   <resourceStyle width="40" x="212" y="0" height="52"/>
+  <symbolStyle id="6" name="current-position">
+   <resourceStyle width="52" x="200" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="7" name="placemark-pink">
+  <symbolStyle id="7" name="placemark-purple">
    <resourceStyle width="40" x="252" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="8" name="placemark-purple">
+  <symbolStyle id="8" name="placemark-pink">
    <resourceStyle width="40" x="292" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="9" name="placemark-red">
+  <symbolStyle id="9" name="placemark-orange">
    <resourceStyle width="40" x="332" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="10" name="airport">
-   <resourceStyle width="40" x="372" y="0" height="40"/>
+  <symbolStyle id="10" name="placemark-green">
+   <resourceStyle width="40" x="372" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="11" name="alpine_hut">
+  <symbolStyle id="11" name="peak">
    <resourceStyle width="40" x="412" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="12" name="archery-borderless">
+  <symbolStyle id="12" name="petrolstation">
    <resourceStyle width="40" x="452" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="13" name="archery">
+  <symbolStyle id="13" name="pharmacy">
    <resourceStyle width="40" x="0" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="14" name="arrow">
+  <symbolStyle id="14" name="playground">
    <resourceStyle width="40" x="40" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="15" name="athletics-borderless">
+  <symbolStyle id="15" name="police">
    <resourceStyle width="40" x="80" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="16" name="athletics">
+  <symbolStyle id="16" name="postbox">
    <resourceStyle width="40" x="120" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="17" name="atm">
+  <symbolStyle id="17" name="postoffice">
    <resourceStyle width="40" x="160" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="18" name="bakery">
+  <symbolStyle id="18" name="pub">
    <resourceStyle width="40" x="200" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="19" name="bar">
+  <symbolStyle id="19" name="hotel">
    <resourceStyle width="40" x="240" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="20" name="barrier">
+  <symbolStyle id="20" name="hunting_closed_high">
    <resourceStyle width="40" x="280" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="21" name="baseball-borderless">
+  <symbolStyle id="21" name="information-guidepost">
    <resourceStyle width="40" x="320" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="22" name="baseball">
+  <symbolStyle id="22" name="information-office">
    <resourceStyle width="40" x="360" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="23" name="basketball">
+  <symbolStyle id="23" name="information">
    <resourceStyle width="40" x="400" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="24" name="bicycle_rental">
+  <symbolStyle id="24" name="kindergarten">
    <resourceStyle width="40" x="440" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="25" name="bird">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="40" x="0" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="26" name="bowls-borderless">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="40" x="40" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="27" name="bowls">
+  <symbolStyle id="27" name="library">
    <resourceStyle width="40" x="80" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="28" name="bus-mini">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="40" x="120" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="29" name="bus">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="40" x="160" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="30" name="bus_sta">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="40" x="200" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="31" name="cafe">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="40" x="240" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="32" name="campsite">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="40" x="280" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="33" name="cannon">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="40" x="320" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="34" name="car_rental">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="40" x="360" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="35" name="car_repair">
+  <symbolStyle id="35" name="peak-mini">
    <resourceStyle width="40" x="400" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="36" name="castle">
+  <symbolStyle id="36" name="subway-station-l">
    <resourceStyle width="40" x="440" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="37" name="cinema">
+  <symbolStyle id="37" name="subway-station-m">
    <resourceStyle width="40" x="0" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="38" name="clothes">
+  <symbolStyle id="38" name="subway-station-s">
    <resourceStyle width="40" x="40" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="39" name="cricket-borderless">
+  <symbolStyle id="39" name="subway">
    <resourceStyle width="40" x="80" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="40" name="cricket">
+  <symbolStyle id="40" name="supermarket">
    <resourceStyle width="40" x="120" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="41" name="curling-borderless">
+  <symbolStyle id="41" name="swimming-borderless">
    <resourceStyle width="40" x="160" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="42" name="curling">
+  <symbolStyle id="42" name="swimming">
    <resourceStyle width="40" x="200" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="43" name="diving-borderless">
+  <symbolStyle id="43" name="synagogue">
    <resourceStyle width="40" x="240" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="44" name="diving">
+  <symbolStyle id="44" name="taxi">
    <resourceStyle width="40" x="280" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="45" name="dog_park">
+  <symbolStyle id="45" name="telephone">
    <resourceStyle width="40" x="320" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="46" name="earthquakecamp">
+  <symbolStyle id="46" name="tennis-borderless">
    <resourceStyle width="40" x="360" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="47" name="equestrian-borderless">
+  <symbolStyle id="47" name="tennis">
    <resourceStyle width="40" x="400" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="48" name="equestrian">
+  <symbolStyle id="48" name="theatre">
    <resourceStyle width="40" x="440" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="49" name="fastfood">
+  <symbolStyle id="49" name="toilets">
    <resourceStyle width="40" x="0" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="50" name="firebrigade">
+  <symbolStyle id="50" name="tramway-mini">
    <resourceStyle width="40" x="40" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="51" name="football-borderless">
+  <symbolStyle id="51" name="tramway">
    <resourceStyle width="40" x="80" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="52" name="football">
+  <symbolStyle id="52" name="university">
    <resourceStyle width="40" x="120" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="53" name="fountain">
+  <symbolStyle id="53" name="pubx">
    <resourceStyle width="40" x="160" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="54" name="gate">
+  <symbolStyle id="54" name="railway-crossing-small">
    <resourceStyle width="40" x="200" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="55" name="golfcourse">
+  <symbolStyle id="55" name="railway-crossing">
    <resourceStyle width="40" x="240" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="56" name="gymnastics-borderless">
+  <symbolStyle id="56" name="railway-station-mini">
    <resourceStyle width="40" x="280" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="57" name="gymnastics">
+  <symbolStyle id="57" name="railway-station">
    <resourceStyle width="40" x="320" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="58" name="hairdresser">
+  <symbolStyle id="58" name="recycling">
    <resourceStyle width="40" x="360" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="59" name="handball-borderless">
+  <symbolStyle id="59" name="religion">
    <resourceStyle width="40" x="400" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="60" name="handball">
+  <symbolStyle id="60" name="restaurant">
    <resourceStyle width="40" x="440" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="61" name="helipad">
+  <symbolStyle id="61" name="ruins">
    <resourceStyle width="40" x="0" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="62" name="hospital">
+  <symbolStyle id="62" name="school">
    <resourceStyle width="40" x="40" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="63" name="hospital0">
+  <symbolStyle id="63" name="shelter-fireplace">
    <resourceStyle width="40" x="80" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="64" name="hostel">
+  <symbolStyle id="64" name="shelter">
    <resourceStyle width="40" x="120" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="65" name="hotel">
+  <symbolStyle id="65" name="shooting-borderless">
    <resourceStyle width="40" x="160" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="66" name="hunting_closed_high">
+  <symbolStyle id="66" name="shooting">
    <resourceStyle width="40" x="200" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="67" name="information-guidepost">
+  <symbolStyle id="67" name="slipway">
    <resourceStyle width="40" x="240" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="68" name="information-office">
+  <symbolStyle id="68" name="soccer-borderless">
    <resourceStyle width="40" x="280" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="69" name="information">
+  <symbolStyle id="69" name="soccer">
    <resourceStyle width="40" x="320" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="70" name="kindergarten">
+  <symbolStyle id="70" name="equestrian">
    <resourceStyle width="40" x="360" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="71" name="kindergarten2">
+  <symbolStyle id="71" name="equestrian-borderless">
    <resourceStyle width="40" x="400" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="72" name="kiosk">
+  <symbolStyle id="72" name="earthquakecamp">
    <resourceStyle width="40" x="440" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="73" name="library">
+  <symbolStyle id="73" name="bar">
    <resourceStyle width="40" x="0" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="74" name="man-made-halfpipe">
+  <symbolStyle id="74" name="barrier">
    <resourceStyle width="40" x="40" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="75" name="memorial">
+  <symbolStyle id="75" name="dog_park">
    <resourceStyle width="40" x="80" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="76" name="mountain_pass">
+  <symbolStyle id="76" name="baseball-borderless">
    <resourceStyle width="40" x="120" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="77" name="museum">
+  <symbolStyle id="77" name="diving">
    <resourceStyle width="40" x="160" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="78" name="parking-mini">
+  <symbolStyle id="78" name="diving-borderless">
    <resourceStyle width="40" x="200" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="79" name="parking">
+  <symbolStyle id="79" name="baseball">
    <resourceStyle width="40" x="240" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="80" name="parking_roof">
+  <symbolStyle id="80" name="curling">
    <resourceStyle width="40" x="280" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="81" name="peak-mini">
+  <symbolStyle id="81" name="curling-borderless">
    <resourceStyle width="40" x="320" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="82" name="peak">
+  <symbolStyle id="82" name="cricket">
    <resourceStyle width="40" x="360" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="83" name="petrolstation">
+  <symbolStyle id="83" name="cricket-borderless">
    <resourceStyle width="40" x="400" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="84" name="pharmacy">
+  <symbolStyle id="84" name="clothes">
    <resourceStyle width="40" x="440" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="85" name="playground">
+  <symbolStyle id="85" name="cinema">
    <resourceStyle width="40" x="0" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="86" name="police">
+  <symbolStyle id="86" name="basketball">
    <resourceStyle width="40" x="40" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="87" name="postbox">
+  <symbolStyle id="87" name="bicycle_rental">
    <resourceStyle width="40" x="80" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="88" name="postoffice">
+  <symbolStyle id="88" name="bird">
    <resourceStyle width="40" x="120" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="89" name="pub">
+  <symbolStyle id="89" name="bowls-borderless">
    <resourceStyle width="40" x="160" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="90" name="pubx">
+  <symbolStyle id="90" name="bowls">
    <resourceStyle width="40" x="200" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="91" name="railway-crossing-small">
+  <symbolStyle id="91" name="bus-mini">
    <resourceStyle width="40" x="240" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="92" name="railway-crossing">
+  <symbolStyle id="92" name="castle">
    <resourceStyle width="40" x="280" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="93" name="railway-station-mini">
+  <symbolStyle id="93" name="bus">
    <resourceStyle width="40" x="320" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="94" name="railway-station">
+  <symbolStyle id="94" name="car_repair">
    <resourceStyle width="40" x="360" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="95" name="recycling">
+  <symbolStyle id="95" name="car_rental">
    <resourceStyle width="40" x="400" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="96" name="religion">
+  <symbolStyle id="96" name="cannon">
    <resourceStyle width="40" x="440" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="97" name="restaurant">
+  <symbolStyle id="97" name="campsite">
    <resourceStyle width="40" x="0" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="98" name="ruins">
+  <symbolStyle id="98" name="cafe">
    <resourceStyle width="40" x="40" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="99" name="school">
+  <symbolStyle id="99" name="bus_sta">
    <resourceStyle width="40" x="80" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="100" name="shelter-fireplace">
+  <symbolStyle id="100" name="hostel">
    <resourceStyle width="40" x="120" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="101" name="shelter">
+  <symbolStyle id="101" name="airport">
    <resourceStyle width="40" x="160" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="102" name="shooting-borderless">
+  <symbolStyle id="102" name="hospital0">
    <resourceStyle width="40" x="200" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="103" name="shooting">
+  <symbolStyle id="103" name="hospital">
    <resourceStyle width="40" x="240" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="104" name="slipway">
+  <symbolStyle id="104" name="helipad">
    <resourceStyle width="40" x="280" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="105" name="soccer-borderless">
+  <symbolStyle id="105" name="handball">
    <resourceStyle width="40" x="320" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="106" name="soccer">
+  <symbolStyle id="106" name="handball-borderless">
    <resourceStyle width="40" x="360" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="107" name="subway-station-l">
+  <symbolStyle id="107" name="hairdresser">
    <resourceStyle width="40" x="400" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="108" name="subway-station-m">
+  <symbolStyle id="108" name="gymnastics">
    <resourceStyle width="40" x="440" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="109" name="subway-station-s">
+  <symbolStyle id="109" name="gymnastics-borderless">
    <resourceStyle width="40" x="0" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="110" name="subway">
+  <symbolStyle id="110" name="alpine_hut">
    <resourceStyle width="40" x="40" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="111" name="supermarket">
+  <symbolStyle id="111" name="golfcourse">
    <resourceStyle width="40" x="80" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="112" name="swimming-borderless">
+  <symbolStyle id="112" name="gate">
    <resourceStyle width="40" x="120" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="113" name="swimming">
+  <symbolStyle id="113" name="archery-borderless">
    <resourceStyle width="40" x="160" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="114" name="synagogue">
+  <symbolStyle id="114" name="bakery">
    <resourceStyle width="40" x="200" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="115" name="taxi">
+  <symbolStyle id="115" name="atm">
    <resourceStyle width="40" x="240" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="116" name="telephone">
+  <symbolStyle id="116" name="fastfood">
    <resourceStyle width="40" x="280" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="117" name="tennis-borderless">
+  <symbolStyle id="117" name="athletics">
    <resourceStyle width="40" x="320" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="118" name="tennis">
+  <symbolStyle id="118" name="athletics-borderless">
    <resourceStyle width="40" x="360" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="119" name="theatre">
+  <symbolStyle id="119" name="arrow">
    <resourceStyle width="40" x="400" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="120" name="toilets">
+  <symbolStyle id="120" name="firebrigade">
    <resourceStyle width="40" x="440" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="121" name="tramway-mini">
+  <symbolStyle id="121" name="football-borderless">
    <resourceStyle width="40" x="0" y="412" height="40"/>
   </symbolStyle>
-  <symbolStyle id="122" name="tramway">
+  <symbolStyle id="122" name="archery">
    <resourceStyle width="40" x="40" y="412" height="40"/>
   </symbolStyle>
-  <symbolStyle id="123" name="university">
+  <symbolStyle id="123" name="football">
    <resourceStyle width="40" x="80" y="412" height="40"/>
   </symbolStyle>
-  <symbolStyle id="124" name="basketball-borderless">
-   <resourceStyle width="40" x="120" y="412" height="38"/>
+  <symbolStyle id="124" name="fountain">
+   <resourceStyle width="40" x="120" y="412" height="40"/>
   </symbolStyle>
-  <symbolStyle id="125" name="khanda">
-   <resourceStyle width="37" x="160" y="412" height="37"/>
+  <symbolStyle id="125" name="basketball-borderless">
+   <resourceStyle width="40" x="160" y="412" height="38"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-permissive">
-   <resourceStyle width="34" x="197" y="412" height="34"/>
+  <symbolStyle id="126" name="khanda">
+   <resourceStyle width="37" x="200" y="412" height="37"/>
   </symbolStyle>
-  <symbolStyle id="127" name="parking-private">
-   <resourceStyle width="34" x="231" y="412" height="34"/>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="34" x="237" y="412" height="34"/>
   </symbolStyle>
-  <symbolStyle id="128" name="bank">
-   <resourceStyle width="31" x="265" y="412" height="31"/>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="34" x="271" y="412" height="34"/>
   </symbolStyle>
-  <symbolStyle id="129" name="church">
-   <resourceStyle width="31" x="296" y="412" height="31"/>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="31" x="305" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="130" name="doctor">
-   <resourceStyle width="31" x="327" y="412" height="31"/>
+  <symbolStyle id="130" name="traffic_signal">
+   <resourceStyle width="31" x="336" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="131" name="drinking_water">
-   <resourceStyle width="31" x="358" y="412" height="31"/>
+  <symbolStyle id="131" name="bank">
+   <resourceStyle width="31" x="367" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="132" name="embassy">
-   <resourceStyle width="31" x="389" y="412" height="31"/>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="31" x="398" y="412" height="31"/>
   </symbolStyle>
   <symbolStyle id="133" name="housenumber">
-   <resourceStyle width="31" x="420" y="412" height="31"/>
+   <resourceStyle width="31" x="429" y="412" height="31"/>
   </symbolStyle>
   <symbolStyle id="134" name="mosque">
-   <resourceStyle width="31" x="451" y="412" height="31"/>
+   <resourceStyle width="31" x="460" y="412" height="31"/>
   </symbolStyle>
   <symbolStyle id="135" name="parking_roof-permissive">
    <resourceStyle width="31" x="0" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="136" name="roundabout_left">
+  <symbolStyle id="136" name="embassy">
    <resourceStyle width="31" x="31" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="137" name="roundabout_right">
+  <symbolStyle id="137" name="drinking_water">
    <resourceStyle width="31" x="62" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="138" name="speed_trap">
+  <symbolStyle id="138" name="doctor">
    <resourceStyle width="31" x="93" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="139" name="traffic_signal">
+  <symbolStyle id="139" name="church">
    <resourceStyle width="31" x="124" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="140" name="windmill">
+  <symbolStyle id="140" name="roundabout_right">
    <resourceStyle width="31" x="155" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="141" name="bureau_de_change">
-   <resourceStyle width="28" x="186" y="452" height="28"/>
+  <symbolStyle id="141" name="roundabout_left">
+   <resourceStyle width="31" x="186" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="142" name="cave_entrance">
-   <resourceStyle width="28" x="214" y="452" height="28"/>
+  <symbolStyle id="142" name="power_wind">
+   <resourceStyle width="28" x="217" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="143" name="lighthouse">
-   <resourceStyle width="28" x="242" y="452" height="28"/>
+  <symbolStyle id="143" name="power_photovoltaic">
+   <resourceStyle width="28" x="245" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="144" name="power_generic">
-   <resourceStyle width="28" x="270" y="452" height="28"/>
+  <symbolStyle id="144" name="power_hydro">
+   <resourceStyle width="28" x="273" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="145" name="power_hydro">
-   <resourceStyle width="28" x="298" y="452" height="28"/>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="28" x="301" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="146" name="power_photovoltaic">
-   <resourceStyle width="28" x="326" y="452" height="28"/>
+  <symbolStyle id="146" name="wastewater">
+   <resourceStyle width="28" x="329" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="147" name="power_wind">
-   <resourceStyle width="28" x="354" y="452" height="28"/>
+  <symbolStyle id="147" name="viewpoint">
+   <resourceStyle width="28" x="357" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="148" name="viewpoint">
-   <resourceStyle width="28" x="382" y="452" height="28"/>
+  <symbolStyle id="148" name="lighthouse">
+   <resourceStyle width="28" x="385" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="149" name="wastewater">
-   <resourceStyle width="28" x="410" y="452" height="28"/>
+  <symbolStyle id="149" name="bureau_de_change">
+   <resourceStyle width="28" x="413" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="150" name="car_sharing">
-   <resourceStyle width="28" x="438" y="452" height="27"/>
+  <symbolStyle id="150" name="cave_entrance">
+   <resourceStyle width="28" x="441" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="151" name="hotel_and_restaurant">
-   <resourceStyle width="24" x="466" y="452" height="24"/>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="28" x="469" y="452" height="27"/>
   </symbolStyle>
-  <symbolStyle id="152" name="bench">
-   <resourceStyle width="22" x="490" y="452" height="22"/>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="24" x="0" y="483" height="24"/>
   </symbolStyle>
-  <symbolStyle id="153" name="park_and_ride-permissive">
-   <resourceStyle width="40" x="0" y="483" height="22"/>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="40" x="24" y="483" height="22"/>
   </symbolStyle>
-  <symbolStyle id="154" name="park_and_ride">
-   <resourceStyle width="40" x="40" y="483" height="22"/>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="40" x="64" y="483" height="22"/>
   </symbolStyle>
-  <symbolStyle id="155" name="parking_fee-permissive">
-   <resourceStyle width="40" x="80" y="483" height="22"/>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="22" x="104" y="483" height="22"/>
   </symbolStyle>
   <symbolStyle id="156" name="parking_fee">
-   <resourceStyle width="40" x="120" y="483" height="22"/>
+   <resourceStyle width="40" x="126" y="483" height="22"/>
   </symbolStyle>
-  <symbolStyle id="157" name="parking_roof_fee-permissive">
-   <resourceStyle width="40" x="160" y="483" height="22"/>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="40" x="166" y="483" height="22"/>
   </symbolStyle>
-  <symbolStyle id="158" name="parking_roof_fee">
-   <resourceStyle width="40" x="200" y="483" height="22"/>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="40" x="206" y="483" height="22"/>
   </symbolStyle>
-  <symbolStyle id="159" name="picnic">
-   <resourceStyle width="22" x="240" y="483" height="22"/>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="40" x="246" y="483" height="22"/>
   </symbolStyle>
-  <symbolStyle id="160" name="building">
-   <resourceStyle width="18" x="262" y="483" height="18"/>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="22" x="286" y="483" height="22"/>
   </symbolStyle>
-  <symbolStyle id="161" name="disused">
-   <resourceStyle width="18" x="280" y="483" height="18"/>
+  <symbolStyle id="161" name="building">
+   <resourceStyle width="18" x="308" y="483" height="18"/>
   </symbolStyle>
-  <symbolStyle id="162" name="power-tower">
-   <resourceStyle width="18" x="298" y="483" height="18"/>
+  <symbolStyle id="162" name="disused">
+   <resourceStyle width="18" x="326" y="483" height="18"/>
   </symbolStyle>
   <symbolStyle id="163" name="vulcan">
-   <resourceStyle width="18" x="316" y="483" height="18"/>
+   <resourceStyle width="18" x="344" y="483" height="18"/>
   </symbolStyle>
-  <symbolStyle id="164" name="survey_point">
-   <resourceStyle width="16" x="334" y="483" height="16"/>
+  <symbolStyle id="164" name="power-tower">
+   <resourceStyle width="18" x="362" y="483" height="18"/>
   </symbolStyle>
-  <symbolStyle id="165" name="power-pole">
-   <resourceStyle width="12" x="350" y="483" height="12"/>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="16" x="380" y="483" height="16"/>
   </symbolStyle>
-  <symbolStyle id="166" name="tree">
-   <resourceStyle width="10" x="362" y="483" height="10"/>
+  <symbolStyle id="166" name="power-pole">
+   <resourceStyle width="12" x="396" y="483" height="12"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="tree">
+   <resourceStyle width="10" x="408" y="483" height="10"/>
   </symbolStyle>
  </page>
 </skin>
diff --git a/data/resources-xhdpi/symbols.png b/data/resources-xhdpi/symbols.png
index 3e5ea3e9d8..17df96394a 100644
--- a/data/resources-xhdpi/symbols.png
+++ b/data/resources-xhdpi/symbols.png
diff --git a/data/resources-xxhdpi/basic.skn b/data/resources-xxhdpi/basic.skn
index 8d9580cefb..23526606d7 100644
--- a/data/resources-xxhdpi/basic.skn
+++ b/data/resources-xxhdpi/basic.skn
@@ -4,500 +4,503 @@
   <symbolStyle id="1" name="api_pin">
    <resourceStyle width="58" x="0" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="2" name="current-position">
-   <resourceStyle width="76" x="58" y="0" height="76"/>
+  <symbolStyle id="2" name="placemark-blue">
+   <resourceStyle width="58" x="58" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="3" name="placemark-blue">
-   <resourceStyle width="58" x="134" y="0" height="76"/>
+  <symbolStyle id="3" name="placemark-brown">
+   <resourceStyle width="58" x="116" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="4" name="placemark-brown">
-   <resourceStyle width="58" x="192" y="0" height="76"/>
+  <symbolStyle id="4" name="placemark-yellow">
+   <resourceStyle width="58" x="174" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="5" name="placemark-green">
-   <resourceStyle width="58" x="250" y="0" height="76"/>
+  <symbolStyle id="5" name="placemark-red">
+   <resourceStyle width="58" x="232" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="6" name="placemark-orange">
-   <resourceStyle width="58" x="308" y="0" height="76"/>
+  <symbolStyle id="6" name="current-position">
+   <resourceStyle width="76" x="290" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="7" name="placemark-pink">
+  <symbolStyle id="7" name="placemark-purple">
    <resourceStyle width="58" x="366" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="8" name="placemark-purple">
+  <symbolStyle id="8" name="placemark-pink">
    <resourceStyle width="58" x="424" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="9" name="placemark-red">
+  <symbolStyle id="9" name="placemark-orange">
    <resourceStyle width="58" x="482" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="10" name="airport">
-   <resourceStyle width="52" x="540" y="0" height="52"/>
+  <symbolStyle id="10" name="placemark-green">
+   <resourceStyle width="58" x="540" y="0" height="76"/>
   </symbolStyle>
-  <symbolStyle id="11" name="alpine_hut">
-   <resourceStyle width="52" x="592" y="0" height="52"/>
+  <symbolStyle id="11" name="peak">
+   <resourceStyle width="52" x="598" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="12" name="archery-borderless">
-   <resourceStyle width="52" x="644" y="0" height="52"/>
+  <symbolStyle id="12" name="petrolstation">
+   <resourceStyle width="52" x="650" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="13" name="archery">
-   <resourceStyle width="52" x="696" y="0" height="52"/>
+  <symbolStyle id="13" name="pharmacy">
+   <resourceStyle width="52" x="702" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="14" name="arrow">
-   <resourceStyle width="52" x="748" y="0" height="52"/>
+  <symbolStyle id="14" name="playground">
+   <resourceStyle width="52" x="754" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="15" name="athletics-borderless">
-   <resourceStyle width="52" x="800" y="0" height="52"/>
+  <symbolStyle id="15" name="police">
+   <resourceStyle width="52" x="806" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="16" name="athletics">
-   <resourceStyle width="52" x="852" y="0" height="52"/>
+  <symbolStyle id="16" name="postbox">
+   <resourceStyle width="52" x="858" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="17" name="atm">
-   <resourceStyle width="52" x="904" y="0" height="52"/>
+  <symbolStyle id="17" name="postoffice">
+   <resourceStyle width="52" x="910" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="18" name="bakery">
-   <resourceStyle width="52" x="956" y="0" height="52"/>
+  <symbolStyle id="18" name="pub">
+   <resourceStyle width="52" x="962" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="19" name="bar">
+  <symbolStyle id="19" name="hotel">
    <resourceStyle width="52" x="0" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="20" name="barrier">
+  <symbolStyle id="20" name="hunting_closed_high">
    <resourceStyle width="52" x="52" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="21" name="baseball-borderless">
+  <symbolStyle id="21" name="information-guidepost">
    <resourceStyle width="52" x="104" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="22" name="baseball">
+  <symbolStyle id="22" name="information-office">
    <resourceStyle width="52" x="156" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="23" name="basketball">
+  <symbolStyle id="23" name="information">
    <resourceStyle width="52" x="208" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="24" name="bicycle_rental">
+  <symbolStyle id="24" name="kindergarten">
    <resourceStyle width="52" x="260" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="25" name="bird">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="52" x="312" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="26" name="bowls-borderless">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="52" x="364" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="27" name="bowls">
+  <symbolStyle id="27" name="library">
    <resourceStyle width="52" x="416" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="28" name="bus-mini">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="52" x="468" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="29" name="bus">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="52" x="520" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="30" name="bus_sta">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="52" x="572" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="31" name="cafe">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="52" x="624" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="32" name="campsite">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="52" x="676" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="33" name="cannon">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="52" x="728" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="34" name="car_rental">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="52" x="780" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="35" name="car_repair">
+  <symbolStyle id="35" name="peak-mini">
    <resourceStyle width="52" x="832" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="36" name="castle">
+  <symbolStyle id="36" name="subway-station-l">
    <resourceStyle width="52" x="884" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="37" name="cinema">
+  <symbolStyle id="37" name="subway-station-m">
    <resourceStyle width="52" x="936" y="76" height="52"/>
   </symbolStyle>
-  <symbolStyle id="38" name="clothes">
+  <symbolStyle id="38" name="subway-station-s">
    <resourceStyle width="52" x="0" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="39" name="cricket-borderless">
+  <symbolStyle id="39" name="subway">
    <resourceStyle width="52" x="52" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="40" name="cricket">
+  <symbolStyle id="40" name="supermarket">
    <resourceStyle width="52" x="104" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="41" name="curling-borderless">
+  <symbolStyle id="41" name="swimming-borderless">
    <resourceStyle width="52" x="156" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="42" name="curling">
+  <symbolStyle id="42" name="swimming">
    <resourceStyle width="52" x="208" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="43" name="diving-borderless">
+  <symbolStyle id="43" name="synagogue">
    <resourceStyle width="52" x="260" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="44" name="diving">
+  <symbolStyle id="44" name="taxi">
    <resourceStyle width="52" x="312" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="45" name="dog_park">
+  <symbolStyle id="45" name="telephone">
    <resourceStyle width="52" x="364" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="46" name="earthquakecamp">
+  <symbolStyle id="46" name="tennis-borderless">
    <resourceStyle width="52" x="416" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="47" name="equestrian-borderless">
+  <symbolStyle id="47" name="tennis">
    <resourceStyle width="52" x="468" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="48" name="equestrian">
+  <symbolStyle id="48" name="theatre">
    <resourceStyle width="52" x="520" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="49" name="fastfood">
+  <symbolStyle id="49" name="toilets">
    <resourceStyle width="52" x="572" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="50" name="firebrigade">
+  <symbolStyle id="50" name="tramway-mini">
    <resourceStyle width="52" x="624" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="51" name="football-borderless">
+  <symbolStyle id="51" name="tramway">
    <resourceStyle width="52" x="676" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="52" name="football">
+  <symbolStyle id="52" name="university">
    <resourceStyle width="52" x="728" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="53" name="fountain">
+  <symbolStyle id="53" name="pubx">
    <resourceStyle width="52" x="780" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="54" name="gate">
+  <symbolStyle id="54" name="railway-crossing-small">
    <resourceStyle width="52" x="832" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="55" name="golfcourse">
+  <symbolStyle id="55" name="railway-crossing">
    <resourceStyle width="52" x="884" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="56" name="gymnastics-borderless">
+  <symbolStyle id="56" name="railway-station-mini">
    <resourceStyle width="52" x="936" y="128" height="52"/>
   </symbolStyle>
-  <symbolStyle id="57" name="gymnastics">
+  <symbolStyle id="57" name="railway-station">
    <resourceStyle width="52" x="0" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="58" name="hairdresser">
+  <symbolStyle id="58" name="recycling">
    <resourceStyle width="52" x="52" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="59" name="handball-borderless">
+  <symbolStyle id="59" name="religion">
    <resourceStyle width="52" x="104" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="60" name="handball">
+  <symbolStyle id="60" name="restaurant">
    <resourceStyle width="52" x="156" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="61" name="helipad">
+  <symbolStyle id="61" name="ruins">
    <resourceStyle width="52" x="208" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="62" name="hospital">
+  <symbolStyle id="62" name="school">
    <resourceStyle width="52" x="260" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="63" name="hospital0">
+  <symbolStyle id="63" name="shelter-fireplace">
    <resourceStyle width="52" x="312" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="64" name="hostel">
+  <symbolStyle id="64" name="shelter">
    <resourceStyle width="52" x="364" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="65" name="hotel">
+  <symbolStyle id="65" name="shooting-borderless">
    <resourceStyle width="52" x="416" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="66" name="hunting_closed_high">
+  <symbolStyle id="66" name="shooting">
    <resourceStyle width="52" x="468" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="67" name="information-guidepost">
+  <symbolStyle id="67" name="slipway">
    <resourceStyle width="52" x="520" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="68" name="information-office">
+  <symbolStyle id="68" name="soccer-borderless">
    <resourceStyle width="52" x="572" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="69" name="information">
+  <symbolStyle id="69" name="soccer">
    <resourceStyle width="52" x="624" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="70" name="kindergarten">
+  <symbolStyle id="70" name="equestrian">
    <resourceStyle width="52" x="676" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="71" name="kindergarten2">
+  <symbolStyle id="71" name="equestrian-borderless">
    <resourceStyle width="52" x="728" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="72" name="kiosk">
+  <symbolStyle id="72" name="earthquakecamp">
    <resourceStyle width="52" x="780" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="73" name="library">
+  <symbolStyle id="73" name="bar">
    <resourceStyle width="52" x="832" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="74" name="man-made-halfpipe">
+  <symbolStyle id="74" name="barrier">
    <resourceStyle width="52" x="884" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="75" name="memorial">
+  <symbolStyle id="75" name="dog_park">
    <resourceStyle width="52" x="936" y="180" height="52"/>
   </symbolStyle>
-  <symbolStyle id="76" name="mountain_pass">
+  <symbolStyle id="76" name="baseball-borderless">
    <resourceStyle width="52" x="0" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="77" name="museum">
+  <symbolStyle id="77" name="diving">
    <resourceStyle width="52" x="52" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="78" name="parking-mini">
+  <symbolStyle id="78" name="diving-borderless">
    <resourceStyle width="52" x="104" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="79" name="parking">
+  <symbolStyle id="79" name="baseball">
    <resourceStyle width="52" x="156" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="80" name="parking_roof">
+  <symbolStyle id="80" name="curling">
    <resourceStyle width="52" x="208" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="81" name="peak-mini">
+  <symbolStyle id="81" name="curling-borderless">
    <resourceStyle width="52" x="260" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="82" name="peak">
+  <symbolStyle id="82" name="cricket">
    <resourceStyle width="52" x="312" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="83" name="petrolstation">
+  <symbolStyle id="83" name="cricket-borderless">
    <resourceStyle width="52" x="364" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="84" name="pharmacy">
+  <symbolStyle id="84" name="clothes">
    <resourceStyle width="52" x="416" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="85" name="playground">
+  <symbolStyle id="85" name="cinema">
    <resourceStyle width="52" x="468" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="86" name="police">
+  <symbolStyle id="86" name="basketball">
    <resourceStyle width="52" x="520" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="87" name="postbox">
+  <symbolStyle id="87" name="bicycle_rental">
    <resourceStyle width="52" x="572" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="88" name="postoffice">
+  <symbolStyle id="88" name="bird">
    <resourceStyle width="52" x="624" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="89" name="pub">
+  <symbolStyle id="89" name="bowls-borderless">
    <resourceStyle width="52" x="676" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="90" name="pubx">
+  <symbolStyle id="90" name="bowls">
    <resourceStyle width="52" x="728" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="91" name="railway-crossing-small">
+  <symbolStyle id="91" name="bus-mini">
    <resourceStyle width="52" x="780" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="92" name="railway-crossing">
+  <symbolStyle id="92" name="castle">
    <resourceStyle width="52" x="832" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="93" name="railway-station-mini">
+  <symbolStyle id="93" name="bus">
    <resourceStyle width="52" x="884" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="94" name="railway-station">
+  <symbolStyle id="94" name="car_repair">
    <resourceStyle width="52" x="936" y="232" height="52"/>
   </symbolStyle>
-  <symbolStyle id="95" name="recycling">
+  <symbolStyle id="95" name="car_rental">
    <resourceStyle width="52" x="0" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="96" name="religion">
+  <symbolStyle id="96" name="cannon">
    <resourceStyle width="52" x="52" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="97" name="restaurant">
+  <symbolStyle id="97" name="campsite">
    <resourceStyle width="52" x="104" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="98" name="ruins">
+  <symbolStyle id="98" name="cafe">
    <resourceStyle width="52" x="156" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="99" name="school">
+  <symbolStyle id="99" name="bus_sta">
    <resourceStyle width="52" x="208" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="100" name="shelter-fireplace">
+  <symbolStyle id="100" name="hostel">
    <resourceStyle width="52" x="260" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="101" name="shelter">
+  <symbolStyle id="101" name="airport">
    <resourceStyle width="52" x="312" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="102" name="shooting-borderless">
+  <symbolStyle id="102" name="hospital0">
    <resourceStyle width="52" x="364" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="103" name="shooting">
+  <symbolStyle id="103" name="hospital">
    <resourceStyle width="52" x="416" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="104" name="slipway">
+  <symbolStyle id="104" name="helipad">
    <resourceStyle width="52" x="468" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="105" name="soccer-borderless">
+  <symbolStyle id="105" name="handball">
    <resourceStyle width="52" x="520" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="106" name="soccer">
+  <symbolStyle id="106" name="handball-borderless">
    <resourceStyle width="52" x="572" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="107" name="subway-station-l">
+  <symbolStyle id="107" name="hairdresser">
    <resourceStyle width="52" x="624" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="108" name="subway-station-m">
+  <symbolStyle id="108" name="gymnastics">
    <resourceStyle width="52" x="676" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="109" name="subway-station-s">
+  <symbolStyle id="109" name="gymnastics-borderless">
    <resourceStyle width="52" x="728" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="110" name="subway">
+  <symbolStyle id="110" name="alpine_hut">
    <resourceStyle width="52" x="780" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="111" name="supermarket">
+  <symbolStyle id="111" name="golfcourse">
    <resourceStyle width="52" x="832" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="112" name="swimming-borderless">
+  <symbolStyle id="112" name="gate">
    <resourceStyle width="52" x="884" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="113" name="swimming">
+  <symbolStyle id="113" name="archery-borderless">
    <resourceStyle width="52" x="936" y="284" height="52"/>
   </symbolStyle>
-  <symbolStyle id="114" name="synagogue">
+  <symbolStyle id="114" name="bakery">
    <resourceStyle width="52" x="0" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="115" name="taxi">
+  <symbolStyle id="115" name="atm">
    <resourceStyle width="52" x="52" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="116" name="telephone">
+  <symbolStyle id="116" name="fastfood">
    <resourceStyle width="52" x="104" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="117" name="tennis-borderless">
+  <symbolStyle id="117" name="athletics">
    <resourceStyle width="52" x="156" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="118" name="tennis">
+  <symbolStyle id="118" name="athletics-borderless">
    <resourceStyle width="52" x="208" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="119" name="theatre">
+  <symbolStyle id="119" name="arrow">
    <resourceStyle width="52" x="260" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="120" name="toilets">
+  <symbolStyle id="120" name="firebrigade">
    <resourceStyle width="52" x="312" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="121" name="tramway-mini">
+  <symbolStyle id="121" name="football-borderless">
    <resourceStyle width="52" x="364" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="122" name="tramway">
+  <symbolStyle id="122" name="archery">
    <resourceStyle width="52" x="416" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="123" name="university">
+  <symbolStyle id="123" name="football">
    <resourceStyle width="52" x="468" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="124" name="basketball-borderless">
-   <resourceStyle width="52" x="520" y="336" height="50"/>
+  <symbolStyle id="124" name="fountain">
+   <resourceStyle width="52" x="520" y="336" height="52"/>
   </symbolStyle>
-  <symbolStyle id="125" name="khanda">
-   <resourceStyle width="48" x="572" y="336" height="48"/>
+  <symbolStyle id="125" name="basketball-borderless">
+   <resourceStyle width="52" x="572" y="336" height="50"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-permissive">
-   <resourceStyle width="44" x="620" y="336" height="44"/>
+  <symbolStyle id="126" name="khanda">
+   <resourceStyle width="48" x="624" y="336" height="48"/>
   </symbolStyle>
-  <symbolStyle id="127" name="parking-private">
-   <resourceStyle width="44" x="664" y="336" height="44"/>
+  <symbolStyle id="127" name="parking-permissive">
+   <resourceStyle width="44" x="672" y="336" height="44"/>
   </symbolStyle>
-  <symbolStyle id="128" name="bank">
-   <resourceStyle width="40" x="708" y="336" height="40"/>
+  <symbolStyle id="128" name="parking-private">
+   <resourceStyle width="44" x="716" y="336" height="44"/>
   </symbolStyle>
-  <symbolStyle id="129" name="church">
-   <resourceStyle width="40" x="748" y="336" height="40"/>
+  <symbolStyle id="129" name="speed_trap">
+   <resourceStyle width="40" x="760" y="336" height="40"/>
   </symbolStyle>
-  <symbolStyle id="130" name="doctor">
-   <resourceStyle width="40" x="788" y="336" height="40"/>
+  <symbolStyle id="130" name="traffic_signal">
+   <resourceStyle width="40" x="800" y="336" height="40"/>
   </symbolStyle>
-  <symbolStyle id="131" name="drinking_water">
-   <resourceStyle width="40" x="828" y="336" height="40"/>
+  <symbolStyle id="131" name="bank">
+   <resourceStyle width="40" x="840" y="336" height="40"/>
   </symbolStyle>
-  <symbolStyle id="132" name="embassy">
-   <resourceStyle width="40" x="868" y="336" height="40"/>
+  <symbolStyle id="132" name="windmill">
+   <resourceStyle width="40" x="880" y="336" height="40"/>
   </symbolStyle>
   <symbolStyle id="133" name="housenumber">
-   <resourceStyle width="40" x="908" y="336" height="40"/>
+   <resourceStyle width="40" x="920" y="336" height="40"/>
   </symbolStyle>
   <symbolStyle id="134" name="mosque">
-   <resourceStyle width="40" x="948" y="336" height="40"/>
+   <resourceStyle width="40" x="960" y="336" height="40"/>
   </symbolStyle>
   <symbolStyle id="135" name="parking_roof-permissive">
    <resourceStyle width="40" x="0" y="388" height="40"/>
   </symbolStyle>
-  <symbolStyle id="136" name="roundabout_left">
+  <symbolStyle id="136" name="embassy">
    <resourceStyle width="40" x="40" y="388" height="40"/>
   </symbolStyle>
-  <symbolStyle id="137" name="roundabout_right">
+  <symbolStyle id="137" name="drinking_water">
    <resourceStyle width="40" x="80" y="388" height="40"/>
   </symbolStyle>
-  <symbolStyle id="138" name="speed_trap">
+  <symbolStyle id="138" name="doctor">
    <resourceStyle width="40" x="120" y="388" height="40"/>
   </symbolStyle>
-  <symbolStyle id="139" name="traffic_signal">
+  <symbolStyle id="139" name="church">
    <resourceStyle width="40" x="160" y="388" height="40"/>
   </symbolStyle>
-  <symbolStyle id="140" name="windmill">
+  <symbolStyle id="140" name="roundabout_right">
    <resourceStyle width="40" x="200" y="388" height="40"/>
   </symbolStyle>
-  <symbolStyle id="141" name="bureau_de_change">
-   <resourceStyle width="36" x="240" y="388" height="36"/>
+  <symbolStyle id="141" name="roundabout_left">
+   <resourceStyle width="40" x="240" y="388" height="40"/>
   </symbolStyle>
-  <symbolStyle id="142" name="cave_entrance">
-   <resourceStyle width="36" x="276" y="388" height="36"/>
+  <symbolStyle id="142" name="power_wind">
+   <resourceStyle width="36" x="280" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="143" name="lighthouse">
-   <resourceStyle width="36" x="312" y="388" height="36"/>
+  <symbolStyle id="143" name="power_photovoltaic">
+   <resourceStyle width="36" x="316" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="144" name="power_generic">
-   <resourceStyle width="36" x="348" y="388" height="36"/>
+  <symbolStyle id="144" name="power_hydro">
+   <resourceStyle width="36" x="352" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="145" name="power_hydro">
-   <resourceStyle width="36" x="384" y="388" height="36"/>
+  <symbolStyle id="145" name="power_generic">
+   <resourceStyle width="36" x="388" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="146" name="power_photovoltaic">
-   <resourceStyle width="36" x="420" y="388" height="36"/>
+  <symbolStyle id="146" name="wastewater">
+   <resourceStyle width="36" x="424" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="147" name="power_wind">
-   <resourceStyle width="36" x="456" y="388" height="36"/>
+  <symbolStyle id="147" name="viewpoint">
+   <resourceStyle width="36" x="460" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="148" name="viewpoint">
-   <resourceStyle width="36" x="492" y="388" height="36"/>
+  <symbolStyle id="148" name="lighthouse">
+   <resourceStyle width="36" x="496" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="149" name="wastewater">
-   <resourceStyle width="36" x="528" y="388" height="36"/>
+  <symbolStyle id="149" name="bureau_de_change">
+   <resourceStyle width="36" x="532" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="150" name="car_sharing">
-   <resourceStyle width="36" x="564" y="388" height="34"/>
+  <symbolStyle id="150" name="cave_entrance">
+   <resourceStyle width="36" x="568" y="388" height="36"/>
   </symbolStyle>
-  <symbolStyle id="151" name="hotel_and_restaurant">
-   <resourceStyle width="30" x="600" y="388" height="30"/>
+  <symbolStyle id="151" name="car_sharing">
+   <resourceStyle width="36" x="604" y="388" height="34"/>
   </symbolStyle>
-  <symbolStyle id="152" name="bench">
-   <resourceStyle width="28" x="630" y="388" height="28"/>
+  <symbolStyle id="152" name="hotel_and_restaurant">
+   <resourceStyle width="30" x="640" y="388" height="30"/>
   </symbolStyle>
-  <symbolStyle id="153" name="park_and_ride-permissive">
-   <resourceStyle width="52" x="658" y="388" height="28"/>
+  <symbolStyle id="153" name="parking_roof_fee">
+   <resourceStyle width="52" x="670" y="388" height="28"/>
   </symbolStyle>
-  <symbolStyle id="154" name="park_and_ride">
-   <resourceStyle width="52" x="710" y="388" height="28"/>
+  <symbolStyle id="154" name="parking_roof_fee-permissive">
+   <resourceStyle width="52" x="722" y="388" height="28"/>
   </symbolStyle>
-  <symbolStyle id="155" name="parking_fee-permissive">
-   <resourceStyle width="52" x="762" y="388" height="28"/>
+  <symbolStyle id="155" name="picnic">
+   <resourceStyle width="28" x="774" y="388" height="28"/>
   </symbolStyle>
   <symbolStyle id="156" name="parking_fee">
-   <resourceStyle width="52" x="814" y="388" height="28"/>
+   <resourceStyle width="52" x="802" y="388" height="28"/>
   </symbolStyle>
-  <symbolStyle id="157" name="parking_roof_fee-permissive">
-   <resourceStyle width="52" x="866" y="388" height="28"/>
+  <symbolStyle id="157" name="parking_fee-permissive">
+   <resourceStyle width="52" x="854" y="388" height="28"/>
   </symbolStyle>
-  <symbolStyle id="158" name="parking_roof_fee">
-   <resourceStyle width="52" x="918" y="388" height="28"/>
+  <symbolStyle id="158" name="park_and_ride">
+   <resourceStyle width="52" x="906" y="388" height="28"/>
   </symbolStyle>
-  <symbolStyle id="159" name="picnic">
-   <resourceStyle width="28" x="970" y="388" height="28"/>
+  <symbolStyle id="159" name="park_and_ride-permissive">
+   <resourceStyle width="52" x="958" y="388" height="28"/>
   </symbolStyle>
-  <symbolStyle id="160" name="building">
-   <resourceStyle width="22" x="998" y="388" height="22"/>
+  <symbolStyle id="160" name="bench">
+   <resourceStyle width="28" x="0" y="428" height="28"/>
   </symbolStyle>
-  <symbolStyle id="161" name="disused">
-   <resourceStyle width="22" x="0" y="428" height="22"/>
+  <symbolStyle id="161" name="building">
+   <resourceStyle width="22" x="28" y="428" height="22"/>
   </symbolStyle>
-  <symbolStyle id="162" name="power-tower">
-   <resourceStyle width="22" x="22" y="428" height="22"/>
+  <symbolStyle id="162" name="disused">
+   <resourceStyle width="22" x="50" y="428" height="22"/>
   </symbolStyle>
   <symbolStyle id="163" name="vulcan">
-   <resourceStyle width="22" x="44" y="428" height="22"/>
+   <resourceStyle width="22" x="72" y="428" height="22"/>
   </symbolStyle>
-  <symbolStyle id="164" name="survey_point">
-   <resourceStyle width="20" x="66" y="428" height="20"/>
+  <symbolStyle id="164" name="power-tower">
+   <resourceStyle width="22" x="94" y="428" height="22"/>
   </symbolStyle>
-  <symbolStyle id="165" name="power-pole">
-   <resourceStyle width="14" x="86" y="428" height="14"/>
+  <symbolStyle id="165" name="survey_point">
+   <resourceStyle width="20" x="116" y="428" height="20"/>
   </symbolStyle>
-  <symbolStyle id="166" name="tree">
-   <resourceStyle width="12" x="100" y="428" height="12"/>
+  <symbolStyle id="166" name="power-pole">
+   <resourceStyle width="14" x="136" y="428" height="14"/>
+  </symbolStyle>
+  <symbolStyle id="167" name="tree">
+   <resourceStyle width="12" x="150" y="428" height="12"/>
   </symbolStyle>
  </page>
 </skin>
diff --git a/data/resources-xxhdpi/symbols.png b/data/resources-xxhdpi/symbols.png
index 4570eaf5da..094c35db93 100644
--- a/data/resources-xxhdpi/symbols.png
+++ b/data/resources-xxhdpi/symbols.png
diff --git a/data/styles/symbols/placemark-yellow.svg b/data/styles/symbols/placemark-yellow.svg
new file mode 100644
index 0000000000..60c81f322c
--- /dev/null
+++ b/data/styles/symbols/placemark-yellow.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="48px" height="64px" viewBox="0 0 48 64" enable-background="new 0 0 48 64" xml:space="preserve">
+<ellipse transform="matrix(0.168 0.9858 -0.9858 0.168 82.1781 21.0924)" opacity="0.5" fill="#808285" enable-background="new    " cx="28.594" cy="59.229" rx="2.5" ry="7.5"/>
+<polygon opacity="0.6" fill="#6D6E71" enable-background="new    " points="32,60 23,61 19,32 31,31 "/>
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-877.5933" y1="2455.8281" x2="-869.2554" y2="2456.5789" gradientTransform="matrix(1 0 0 -1 898.7251 2502.3555)">
+	<stop  offset="0" style="stop-color:#E6E6E6"/>
+	<stop  offset="1" style="stop-color:#C4C4C4"/>
+</linearGradient>
+<polygon fill="url(#SVGID_1_)" points="30,59 25,60 21,33 29,32 "/>
+<circle opacity="0.8" fill="#F4E206" enable-background="new    " cx="24" cy="21.917" r="20"/>
+<radialGradient id="SVGID_2_" cx="-875.2017" cy="2481.46" r="18.0152" fx="-883.8695" fy="2474.9109" gradientTransform="matrix(0.4111 0.9116 0.9116 -0.4111 -1877.5171 1839.0408)" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#FFFFE8"/>
+	<stop  offset="0.248" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.3718" style="stop-color:#FFFFBE"/>
+	<stop  offset="1" style="stop-color:#FFFF00"/>
+</radialGradient>
+<circle fill="url(#SVGID_2_)" cx="24" cy="21.916" r="18.015"/>
+</svg>