[android] support for XXHDPI screens

10 files changed, 1055 insertions, 555 deletions

diff --git a/data/resources-hdpi/basic.skn b/data/resources-hdpi/basic.skn
index f317d1f166..db3164d14c 100644
--- a/data/resources-hdpi/basic.skn
+++ b/data/resources-hdpi/basic.skn
@@ -1,256 +1,256 @@
 <!DOCTYPE skin>
 <skin>
  <page width="512" height="256" file="symbols.png">
-  <symbolStyle id="1" name="placemark-red">
+  <symbolStyle id="1" name="placemark-blue">
    <resourceStyle width="31" x="0" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="2" name="placemark-purple">
+  <symbolStyle id="2" name="placemark-brown">
    <resourceStyle width="31" x="31" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="3" name="current-position">
-   <resourceStyle width="40" x="62" y="0" height="40"/>
+  <symbolStyle id="3" name="placemark-red">
+   <resourceStyle width="31" x="62" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="4" name="placemark-pink">
-   <resourceStyle width="31" x="102" y="0" height="40"/>
+  <symbolStyle id="4" name="current-position">
+   <resourceStyle width="40" x="93" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="5" name="placemark-orange">
+  <symbolStyle id="5" name="placemark-purple">
    <resourceStyle width="31" x="133" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="6" name="placemark-green">
+  <symbolStyle id="6" name="placemark-pink">
    <resourceStyle width="31" x="164" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="7" name="placemark-brown">
+  <symbolStyle id="7" name="placemark-orange">
    <resourceStyle width="31" x="195" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="8" name="placemark-blue">
+  <symbolStyle id="8" name="placemark-green">
    <resourceStyle width="31" x="226" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="9" name="pub">
+  <symbolStyle id="9" name="peak">
    <resourceStyle width="28" x="257" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="10" name="postoffice">
+  <symbolStyle id="10" name="peak-mini">
    <resourceStyle width="28" x="285" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="11" name="postbox">
+  <symbolStyle id="11" name="petrolstation">
    <resourceStyle width="28" x="313" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="12" name="police">
+  <symbolStyle id="12" name="pharmacy">
    <resourceStyle width="28" x="341" y="0" height="28"/>
   </symbolStyle>
   <symbolStyle id="13" name="playground">
    <resourceStyle width="28" x="369" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="14" name="pharmacy">
+  <symbolStyle id="14" name="police">
    <resourceStyle width="28" x="397" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="15" name="petrolstation">
+  <symbolStyle id="15" name="postbox">
    <resourceStyle width="28" x="425" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="16" name="peak">
+  <symbolStyle id="16" name="postoffice">
    <resourceStyle width="28" x="453" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="17" name="hotel">
+  <symbolStyle id="17" name="pub">
    <resourceStyle width="28" x="481" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="18" name="hunting_closed_high">
+  <symbolStyle id="18" name="library">
    <resourceStyle width="28" x="0" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="19" name="information-guidepost">
+  <symbolStyle id="19" name="hotel">
    <resourceStyle width="28" x="28" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="20" name="information-office">
+  <symbolStyle id="20" name="hunting_closed_high">
    <resourceStyle width="28" x="56" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="21" name="information">
+  <symbolStyle id="21" name="information-guidepost">
    <resourceStyle width="28" x="84" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="22" name="kindergarten">
+  <symbolStyle id="22" name="information-office">
    <resourceStyle width="28" x="112" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="23" name="kindergarten2">
+  <symbolStyle id="23" name="information">
    <resourceStyle width="28" x="140" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="24" name="kiosk">
+  <symbolStyle id="24" name="kindergarten">
    <resourceStyle width="28" x="168" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="25" name="library">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="28" x="196" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="26" name="man-made-halfpipe">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="28" x="224" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="27" name="memorial">
+  <symbolStyle id="27" name="pubx">
    <resourceStyle width="28" x="252" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="28" name="mountain_pass">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="28" x="280" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="29" name="museum">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="28" x="308" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="30" name="parking-mini">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="28" x="336" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="31" name="parking">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="28" x="364" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="32" name="parking_roof">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="28" x="392" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="33" name="peak-mini">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="28" x="420" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="34" name="subway-station-l">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="28" x="448" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="35" name="subway-station-m">
+  <symbolStyle id="35" name="telephone">
    <resourceStyle width="28" x="476" y="40" height="28"/>
   </symbolStyle>
-  <symbolStyle id="36" name="subway-station-s">
+  <symbolStyle id="36" name="subway-station-m">
    <resourceStyle width="28" x="0" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="37" name="subway">
+  <symbolStyle id="37" name="subway-station-s">
    <resourceStyle width="28" x="28" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="38" name="supermarket">
+  <symbolStyle id="38" name="subway">
    <resourceStyle width="28" x="56" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="39" name="swimming-borderless">
+  <symbolStyle id="39" name="supermarket">
    <resourceStyle width="28" x="84" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="40" name="swimming">
+  <symbolStyle id="40" name="swimming-borderless">
    <resourceStyle width="28" x="112" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="41" name="synagogue">
+  <symbolStyle id="41" name="swimming">
    <resourceStyle width="28" x="140" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="42" name="taxi">
+  <symbolStyle id="42" name="synagogue">
    <resourceStyle width="28" x="168" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="43" name="telephone">
+  <symbolStyle id="43" name="taxi">
    <resourceStyle width="28" x="196" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="44" name="tennis-borderless">
+  <symbolStyle id="44" name="subway-station-l">
    <resourceStyle width="28" x="224" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="45" name="tennis">
+  <symbolStyle id="45" name="tennis-borderless">
    <resourceStyle width="28" x="252" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="46" name="theatre">
+  <symbolStyle id="46" name="tennis">
    <resourceStyle width="28" x="280" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="47" name="toilets">
+  <symbolStyle id="47" name="theatre">
    <resourceStyle width="28" x="308" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="48" name="tramway-mini">
+  <symbolStyle id="48" name="toilets">
    <resourceStyle width="28" x="336" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="49" name="tramway">
+  <symbolStyle id="49" name="tramway-mini">
    <resourceStyle width="28" x="364" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="50" name="university">
+  <symbolStyle id="50" name="tramway">
    <resourceStyle width="28" x="392" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="51" name="pubx">
+  <symbolStyle id="51" name="university">
    <resourceStyle width="28" x="420" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="52" name="railway-crossing-small">
+  <symbolStyle id="52" name="school">
    <resourceStyle width="28" x="448" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="53" name="railway-crossing">
+  <symbolStyle id="53" name="railway-crossing-small">
    <resourceStyle width="28" x="476" y="68" height="28"/>
   </symbolStyle>
-  <symbolStyle id="54" name="railway-station-mini">
+  <symbolStyle id="54" name="railway-crossing">
    <resourceStyle width="28" x="0" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="55" name="railway-station">
+  <symbolStyle id="55" name="railway-station-mini">
    <resourceStyle width="28" x="28" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="56" name="recycling">
+  <symbolStyle id="56" name="railway-station">
    <resourceStyle width="28" x="56" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="57" name="religion">
+  <symbolStyle id="57" name="recycling">
    <resourceStyle width="28" x="84" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="58" name="restaurant">
+  <symbolStyle id="58" name="religion">
    <resourceStyle width="28" x="112" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="59" name="ruins">
+  <symbolStyle id="59" name="restaurant">
    <resourceStyle width="28" x="140" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="60" name="school">
+  <symbolStyle id="60" name="ruins">
    <resourceStyle width="28" x="168" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="61" name="shelter-fireplace">
+  <symbolStyle id="61" name="airport">
    <resourceStyle width="28" x="196" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="62" name="shelter">
+  <symbolStyle id="62" name="shelter-fireplace">
    <resourceStyle width="28" x="224" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="63" name="shooting-borderless">
+  <symbolStyle id="63" name="shelter">
    <resourceStyle width="28" x="252" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="64" name="shooting">
+  <symbolStyle id="64" name="shooting-borderless">
    <resourceStyle width="28" x="280" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="65" name="slipway">
+  <symbolStyle id="65" name="shooting">
    <resourceStyle width="28" x="308" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="66" name="soccer-borderless">
+  <symbolStyle id="66" name="slipway">
    <resourceStyle width="28" x="336" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="67" name="soccer">
+  <symbolStyle id="67" name="soccer-borderless">
    <resourceStyle width="28" x="364" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="68" name="bakery">
+  <symbolStyle id="68" name="soccer">
    <resourceStyle width="28" x="392" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="69" name="equestrian-borderless">
+  <symbolStyle id="69" name="basketball">
    <resourceStyle width="28" x="420" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="70" name="earthquakecamp">
+  <symbolStyle id="70" name="equestrian">
    <resourceStyle width="28" x="448" y="96" height="28"/>
   </symbolStyle>
   <symbolStyle id="71" name="bar">
    <resourceStyle width="28" x="476" y="96" height="28"/>
   </symbolStyle>
-  <symbolStyle id="72" name="barrier">
+  <symbolStyle id="72" name="earthquakecamp">
    <resourceStyle width="28" x="0" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="73" name="dog_park">
+  <symbolStyle id="73" name="barrier">
    <resourceStyle width="28" x="28" y="124" height="28"/>
   </symbolStyle>
   <symbolStyle id="74" name="baseball-borderless">
    <resourceStyle width="28" x="56" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="75" name="diving">
+  <symbolStyle id="75" name="dog_park">
    <resourceStyle width="28" x="84" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="76" name="diving-borderless">
+  <symbolStyle id="76" name="baseball">
    <resourceStyle width="28" x="112" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="77" name="baseball">
+  <symbolStyle id="77" name="diving">
    <resourceStyle width="28" x="140" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="78" name="curling">
+  <symbolStyle id="78" name="diving-borderless">
    <resourceStyle width="28" x="168" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="79" name="curling-borderless">
+  <symbolStyle id="79" name="curling">
    <resourceStyle width="28" x="196" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="80" name="cricket">
+  <symbolStyle id="80" name="curling-borderless">
    <resourceStyle width="28" x="224" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="81" name="cricket-borderless">
+  <symbolStyle id="81" name="cricket">
    <resourceStyle width="28" x="252" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="82" name="clothes">
+  <symbolStyle id="82" name="cricket-borderless">
    <resourceStyle width="28" x="280" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="83" name="cinema">
+  <symbolStyle id="83" name="clothes">
    <resourceStyle width="28" x="308" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="84" name="basketball">
+  <symbolStyle id="84" name="equestrian-borderless">
    <resourceStyle width="28" x="336" y="124" height="28"/>
   </symbolStyle>
   <symbolStyle id="85" name="bicycle_rental">
@@ -265,106 +265,106 @@
   <symbolStyle id="88" name="bowls">
    <resourceStyle width="28" x="448" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="89" name="bus-mini">
+  <symbolStyle id="89" name="cinema">
    <resourceStyle width="28" x="476" y="124" height="28"/>
   </symbolStyle>
-  <symbolStyle id="90" name="castle">
+  <symbolStyle id="90" name="bus-mini">
    <resourceStyle width="28" x="0" y="152" height="28"/>
   </symbolStyle>
   <symbolStyle id="91" name="bus">
    <resourceStyle width="28" x="28" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="92" name="car_repair">
+  <symbolStyle id="92" name="castle">
    <resourceStyle width="28" x="56" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="93" name="car_rental">
+  <symbolStyle id="93" name="bus_sta">
    <resourceStyle width="28" x="84" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="94" name="cannon">
+  <symbolStyle id="94" name="car_repair">
    <resourceStyle width="28" x="112" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="95" name="campsite">
+  <symbolStyle id="95" name="car_rental">
    <resourceStyle width="28" x="140" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="96" name="cafe">
+  <symbolStyle id="96" name="cannon">
    <resourceStyle width="28" x="168" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="97" name="bus_sta">
+  <symbolStyle id="97" name="campsite">
    <resourceStyle width="28" x="196" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="98" name="hostel">
+  <symbolStyle id="98" name="cafe">
    <resourceStyle width="28" x="224" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="99" name="hospital0">
+  <symbolStyle id="99" name="archery">
    <resourceStyle width="28" x="252" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="100" name="airport">
+  <symbolStyle id="100" name="hostel">
    <resourceStyle width="28" x="280" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="101" name="hospital">
+  <symbolStyle id="101" name="alpine_hut">
    <resourceStyle width="28" x="308" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="102" name="helipad">
+  <symbolStyle id="102" name="hospital0">
    <resourceStyle width="28" x="336" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="103" name="handball">
+  <symbolStyle id="103" name="hospital">
    <resourceStyle width="28" x="364" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="104" name="handball-borderless">
+  <symbolStyle id="104" name="helipad">
    <resourceStyle width="28" x="392" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="105" name="hairdresser">
+  <symbolStyle id="105" name="handball">
    <resourceStyle width="28" x="420" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="106" name="gymnastics">
+  <symbolStyle id="106" name="handball-borderless">
    <resourceStyle width="28" x="448" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="107" name="gymnastics-borderless">
+  <symbolStyle id="107" name="hairdresser">
    <resourceStyle width="28" x="476" y="152" height="28"/>
   </symbolStyle>
-  <symbolStyle id="108" name="golfcourse">
+  <symbolStyle id="108" name="gymnastics">
    <resourceStyle width="28" x="0" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="109" name="alpine_hut">
+  <symbolStyle id="109" name="gymnastics-borderless">
    <resourceStyle width="28" x="28" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="110" name="gate">
+  <symbolStyle id="110" name="archery-borderless">
    <resourceStyle width="28" x="56" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="111" name="fountain">
+  <symbolStyle id="111" name="golfcourse">
    <resourceStyle width="28" x="84" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="112" name="atm">
+  <symbolStyle id="112" name="gate">
    <resourceStyle width="28" x="112" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="113" name="equestrian">
+  <symbolStyle id="113" name="fountain">
    <resourceStyle width="28" x="140" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="114" name="athletics">
+  <symbolStyle id="114" name="bakery">
    <resourceStyle width="28" x="168" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="115" name="athletics-borderless">
+  <symbolStyle id="115" name="fastfood">
    <resourceStyle width="28" x="196" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="116" name="arrow">
+  <symbolStyle id="116" name="atm">
    <resourceStyle width="28" x="224" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="117" name="fastfood">
+  <symbolStyle id="117" name="arrow">
    <resourceStyle width="28" x="252" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="118" name="firebrigade">
+  <symbolStyle id="118" name="football-borderless">
    <resourceStyle width="28" x="280" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="119" name="archery">
+  <symbolStyle id="119" name="athletics">
    <resourceStyle width="28" x="308" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="120" name="football-borderless">
+  <symbolStyle id="120" name="football">
    <resourceStyle width="28" x="336" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="121" name="football">
+  <symbolStyle id="121" name="firebrigade">
    <resourceStyle width="28" x="364" y="180" height="28"/>
   </symbolStyle>
-  <symbolStyle id="122" name="archery-borderless">
+  <symbolStyle id="122" name="athletics-borderless">
    <resourceStyle width="28" x="392" y="180" height="28"/>
   </symbolStyle>
   <symbolStyle id="123" name="basketball-borderless">
@@ -373,10 +373,10 @@
   <symbolStyle id="124" name="khanda">
    <resourceStyle width="26" x="448" y="180" height="26"/>
   </symbolStyle>
-  <symbolStyle id="125" name="parking-permissive">
+  <symbolStyle id="125" name="parking-private">
    <resourceStyle width="24" x="474" y="180" height="24"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-private">
+  <symbolStyle id="126" name="parking-permissive">
    <resourceStyle width="24" x="0" y="208" height="24"/>
   </symbolStyle>
   <symbolStyle id="127" name="speed_trap">
@@ -391,43 +391,43 @@
   <symbolStyle id="130" name="windmill">
    <resourceStyle width="22" x="90" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="131" name="embassy">
+  <symbolStyle id="131" name="roundabout_right">
    <resourceStyle width="22" x="112" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="132" name="drinking_water">
+  <symbolStyle id="132" name="housenumber">
    <resourceStyle width="22" x="134" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="133" name="parking_roof-permissive">
+  <symbolStyle id="133" name="mosque">
    <resourceStyle width="22" x="156" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="134" name="mosque">
+  <symbolStyle id="134" name="parking_roof-permissive">
    <resourceStyle width="22" x="178" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="135" name="doctor">
+  <symbolStyle id="135" name="embassy">
    <resourceStyle width="22" x="200" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="136" name="housenumber">
+  <symbolStyle id="136" name="drinking_water">
    <resourceStyle width="22" x="222" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="137" name="church">
+  <symbolStyle id="137" name="doctor">
    <resourceStyle width="22" x="244" y="208" height="22"/>
   </symbolStyle>
   <symbolStyle id="138" name="roundabout_left">
    <resourceStyle width="22" x="266" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="139" name="roundabout_right">
+  <symbolStyle id="139" name="church">
    <resourceStyle width="22" x="288" y="208" height="22"/>
   </symbolStyle>
-  <symbolStyle id="140" name="power_wind">
+  <symbolStyle id="140" name="power_photovoltaic">
    <resourceStyle width="20" x="310" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="141" name="power_photovoltaic">
+  <symbolStyle id="141" name="power_hydro">
    <resourceStyle width="20" x="330" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="142" name="power_hydro">
+  <symbolStyle id="142" name="power_generic">
    <resourceStyle width="20" x="350" y="208" height="20"/>
   </symbolStyle>
-  <symbolStyle id="143" name="power_generic">
+  <symbolStyle id="143" name="power_wind">
    <resourceStyle width="20" x="370" y="208" height="20"/>
   </symbolStyle>
   <symbolStyle id="144" name="wastewater">
@@ -475,16 +475,16 @@
   <symbolStyle id="158" name="bench">
    <resourceStyle width="16" x="201" y="232" height="16"/>
   </symbolStyle>
-  <symbolStyle id="159" name="disused">
+  <symbolStyle id="159" name="building">
    <resourceStyle width="13" x="217" y="232" height="13"/>
   </symbolStyle>
-  <symbolStyle id="160" name="power-tower">
+  <symbolStyle id="160" name="disused">
    <resourceStyle width="13" x="230" y="232" height="13"/>
   </symbolStyle>
   <symbolStyle id="161" name="vulcan">
    <resourceStyle width="13" x="243" y="232" height="13"/>
   </symbolStyle>
-  <symbolStyle id="162" name="building">
+  <symbolStyle id="162" name="power-tower">
    <resourceStyle width="13" x="256" y="232" height="13"/>
   </symbolStyle>
   <symbolStyle id="163" name="survey_point">
diff --git a/data/resources-hdpi/symbols.png b/data/resources-hdpi/symbols.png
index e52fefdf29..cf4948da93 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 8f17dfe27f..59714c14b0 100644
--- a/data/resources-ldpi/basic.skn
+++ b/data/resources-ldpi/basic.skn
@@ -1,232 +1,232 @@
 <!DOCTYPE skin>
 <skin>
  <page width="256" height="256" file="symbols.png">
-  <symbolStyle id="1" name="pub">
-   <resourceStyle width="20" x="0" y="0" height="20"/>
+  <symbolStyle id="1" name="placemark-purple">
+   <resourceStyle width="16" x="0" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="2" name="postoffice">
-   <resourceStyle width="20" x="20" y="0" height="20"/>
+  <symbolStyle id="2" name="peak">
+   <resourceStyle width="20" x="16" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="3" name="postbox">
-   <resourceStyle width="20" x="40" y="0" height="20"/>
+  <symbolStyle id="3" name="petrolstation">
+   <resourceStyle width="20" x="36" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="4" name="police">
-   <resourceStyle width="20" x="60" y="0" height="20"/>
+  <symbolStyle id="4" name="pharmacy">
+   <resourceStyle width="20" x="56" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="5" name="playground">
-   <resourceStyle width="20" x="80" y="0" height="20"/>
+  <symbolStyle id="5" name="placemark-blue">
+   <resourceStyle width="16" x="76" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="6" name="placemark-red">
-   <resourceStyle width="16" x="100" y="0" height="20"/>
+  <symbolStyle id="6" name="placemark-brown">
+   <resourceStyle width="16" x="92" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="7" name="placemark-purple">
-   <resourceStyle width="16" x="116" y="0" height="20"/>
+  <symbolStyle id="7" name="placemark-green">
+   <resourceStyle width="16" x="108" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="8" name="placemark-pink">
-   <resourceStyle width="16" x="132" y="0" height="20"/>
+  <symbolStyle id="8" name="placemark-orange">
+   <resourceStyle width="16" x="124" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="9" name="placemark-orange">
-   <resourceStyle width="16" x="148" y="0" height="20"/>
+  <symbolStyle id="9" name="placemark-pink">
+   <resourceStyle width="16" x="140" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="10" name="placemark-green">
-   <resourceStyle width="16" x="164" y="0" height="20"/>
+  <symbolStyle id="10" name="peak-mini">
+   <resourceStyle width="20" x="156" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="11" name="placemark-brown">
-   <resourceStyle width="16" x="180" y="0" height="20"/>
+  <symbolStyle id="11" name="placemark-red">
+   <resourceStyle width="16" x="176" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="12" name="placemark-blue">
-   <resourceStyle width="16" x="196" y="0" height="20"/>
+  <symbolStyle id="12" name="playground">
+   <resourceStyle width="20" x="192" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="13" name="pharmacy">
+  <symbolStyle id="13" name="police">
    <resourceStyle width="20" x="212" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="14" name="petrolstation">
+  <symbolStyle id="14" name="postbox">
    <resourceStyle width="20" x="232" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="15" name="peak">
+  <symbolStyle id="15" name="postoffice">
    <resourceStyle width="20" x="0" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="16" name="peak-mini">
+  <symbolStyle id="16" name="pub">
    <resourceStyle width="20" x="20" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="17" name="hostel">
+  <symbolStyle id="17" name="pubx">
    <resourceStyle width="20" x="40" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="18" name="hotel">
+  <symbolStyle id="18" name="library">
    <resourceStyle width="20" x="60" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="19" name="hunting_closed_high">
+  <symbolStyle id="19" name="hotel">
    <resourceStyle width="20" x="80" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="20" name="information-guidepost">
+  <symbolStyle id="20" name="hunting_closed_high">
    <resourceStyle width="20" x="100" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="21" name="information-office">
+  <symbolStyle id="21" name="information-guidepost">
    <resourceStyle width="20" x="120" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="22" name="information">
+  <symbolStyle id="22" name="information-office">
    <resourceStyle width="20" x="140" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="23" name="kindergarten">
+  <symbolStyle id="23" name="information">
    <resourceStyle width="20" x="160" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="24" name="kindergarten2">
+  <symbolStyle id="24" name="kindergarten">
    <resourceStyle width="20" x="180" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="25" name="kiosk">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="20" x="200" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="26" name="library">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="20" x="220" y="20" height="20"/>
   </symbolStyle>
-  <symbolStyle id="27" name="man-made-halfpipe">
+  <symbolStyle id="27" name="railway-crossing-small">
    <resourceStyle width="20" x="0" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="28" name="memorial">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="20" x="20" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="29" name="mountain_pass">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="20" x="40" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="30" name="museum">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="20" x="60" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="31" name="parking-mini">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="20" x="80" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="32" name="parking">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="20" x="100" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="33" name="parking_roof">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="20" x="120" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="34" name="subway-station-l">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="20" x="140" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="35" name="subway-station-m">
+  <symbolStyle id="35" name="telephone">
    <resourceStyle width="20" x="160" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="36" name="subway-station-s">
+  <symbolStyle id="36" name="subway-station-m">
    <resourceStyle width="20" x="180" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="37" name="subway">
+  <symbolStyle id="37" name="subway-station-s">
    <resourceStyle width="20" x="200" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="38" name="supermarket">
+  <symbolStyle id="38" name="subway">
    <resourceStyle width="20" x="220" y="40" height="20"/>
   </symbolStyle>
-  <symbolStyle id="39" name="swimming-borderless">
+  <symbolStyle id="39" name="supermarket">
    <resourceStyle width="20" x="0" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="40" name="swimming">
+  <symbolStyle id="40" name="swimming-borderless">
    <resourceStyle width="20" x="20" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="41" name="synagogue">
+  <symbolStyle id="41" name="swimming">
    <resourceStyle width="20" x="40" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="42" name="taxi">
+  <symbolStyle id="42" name="synagogue">
    <resourceStyle width="20" x="60" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="43" name="telephone">
+  <symbolStyle id="43" name="taxi">
    <resourceStyle width="20" x="80" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="44" name="tennis-borderless">
+  <symbolStyle id="44" name="subway-station-l">
    <resourceStyle width="20" x="100" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="45" name="tennis">
+  <symbolStyle id="45" name="tennis-borderless">
    <resourceStyle width="20" x="120" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="46" name="theatre">
+  <symbolStyle id="46" name="tennis">
    <resourceStyle width="20" x="140" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="47" name="toilets">
+  <symbolStyle id="47" name="theatre">
    <resourceStyle width="20" x="160" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="48" name="tramway-mini">
+  <symbolStyle id="48" name="toilets">
    <resourceStyle width="20" x="180" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="49" name="tramway">
+  <symbolStyle id="49" name="tramway-mini">
    <resourceStyle width="20" x="200" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="50" name="university">
+  <symbolStyle id="50" name="tramway">
    <resourceStyle width="20" x="220" y="60" height="20"/>
   </symbolStyle>
-  <symbolStyle id="51" name="pubx">
+  <symbolStyle id="51" name="university">
    <resourceStyle width="20" x="0" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="52" name="railway-crossing-small">
+  <symbolStyle id="52" name="airport">
    <resourceStyle width="20" x="20" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="53" name="railway-crossing">
+  <symbolStyle id="53" name="soccer">
    <resourceStyle width="20" x="40" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="54" name="railway-station-mini">
+  <symbolStyle id="54" name="soccer-borderless">
    <resourceStyle width="20" x="60" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="55" name="railway-station">
+  <symbolStyle id="55" name="slipway">
    <resourceStyle width="20" x="80" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="56" name="recycling">
+  <symbolStyle id="56" name="shooting">
    <resourceStyle width="20" x="100" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="57" name="religion">
+  <symbolStyle id="57" name="shooting-borderless">
    <resourceStyle width="20" x="120" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="58" name="restaurant">
+  <symbolStyle id="58" name="shelter">
    <resourceStyle width="20" x="140" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="59" name="ruins">
+  <symbolStyle id="59" name="shelter-fireplace">
    <resourceStyle width="20" x="160" y="80" height="20"/>
   </symbolStyle>
   <symbolStyle id="60" name="school">
    <resourceStyle width="20" x="180" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="61" name="shelter-fireplace">
+  <symbolStyle id="61" name="ruins">
    <resourceStyle width="20" x="200" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="62" name="shelter">
+  <symbolStyle id="62" name="restaurant">
    <resourceStyle width="20" x="220" y="80" height="20"/>
   </symbolStyle>
-  <symbolStyle id="63" name="shooting-borderless">
+  <symbolStyle id="63" name="religion">
    <resourceStyle width="20" x="0" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="64" name="shooting">
+  <symbolStyle id="64" name="recycling">
    <resourceStyle width="20" x="20" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="65" name="slipway">
+  <symbolStyle id="65" name="railway-station">
    <resourceStyle width="20" x="40" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="66" name="soccer-borderless">
+  <symbolStyle id="66" name="railway-station-mini">
    <resourceStyle width="20" x="60" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="67" name="soccer">
+  <symbolStyle id="67" name="railway-crossing">
    <resourceStyle width="20" x="80" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="68" name="bakery">
+  <symbolStyle id="68" name="basketball">
    <resourceStyle width="20" x="100" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="69" name="earthquakecamp">
+  <symbolStyle id="69" name="bar">
    <resourceStyle width="20" x="120" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="70" name="bar">
+  <symbolStyle id="70" name="earthquakecamp">
    <resourceStyle width="20" x="140" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="71" name="dog_park">
+  <symbolStyle id="71" name="barrier">
    <resourceStyle width="20" x="160" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="72" name="barrier">
+  <symbolStyle id="72" name="baseball-borderless">
    <resourceStyle width="20" x="180" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="73" name="baseball-borderless">
+  <symbolStyle id="73" name="dog_park">
    <resourceStyle width="20" x="200" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="74" name="diving">
+  <symbolStyle id="74" name="baseball">
    <resourceStyle width="20" x="220" y="100" height="20"/>
   </symbolStyle>
-  <symbolStyle id="75" name="diving-borderless">
+  <symbolStyle id="75" name="diving">
    <resourceStyle width="20" x="0" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="76" name="baseball">
+  <symbolStyle id="76" name="diving-borderless">
    <resourceStyle width="20" x="20" y="120" height="20"/>
   </symbolStyle>
   <symbolStyle id="77" name="current-position">
@@ -247,136 +247,136 @@
   <symbolStyle id="82" name="clothes">
    <resourceStyle width="20" x="140" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="83" name="cinema">
+  <symbolStyle id="83" name="equestrian-borderless">
    <resourceStyle width="20" x="160" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="84" name="basketball">
+  <symbolStyle id="84" name="bicycle_rental">
    <resourceStyle width="20" x="180" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="85" name="bicycle_rental">
+  <symbolStyle id="85" name="bird">
    <resourceStyle width="20" x="200" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="86" name="bird">
+  <symbolStyle id="86" name="bowls-borderless">
    <resourceStyle width="20" x="220" y="120" height="20"/>
   </symbolStyle>
-  <symbolStyle id="87" name="bowls-borderless">
+  <symbolStyle id="87" name="bowls">
    <resourceStyle width="20" x="0" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="88" name="bowls">
+  <symbolStyle id="88" name="cinema">
    <resourceStyle width="20" x="20" y="140" height="20"/>
   </symbolStyle>
   <symbolStyle id="89" name="bus-mini">
    <resourceStyle width="20" x="40" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="90" name="castle">
+  <symbolStyle id="90" name="bus">
    <resourceStyle width="20" x="60" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="91" name="bus">
+  <symbolStyle id="91" name="castle">
    <resourceStyle width="20" x="80" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="92" name="car_repair">
+  <symbolStyle id="92" name="bus_sta">
    <resourceStyle width="20" x="100" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="93" name="car_rental">
+  <symbolStyle id="93" name="car_repair">
    <resourceStyle width="20" x="120" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="94" name="cannon">
+  <symbolStyle id="94" name="car_rental">
    <resourceStyle width="20" x="140" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="95" name="campsite">
+  <symbolStyle id="95" name="cannon">
    <resourceStyle width="20" x="160" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="96" name="cafe">
+  <symbolStyle id="96" name="campsite">
    <resourceStyle width="20" x="180" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="97" name="bus_sta">
+  <symbolStyle id="97" name="cafe">
    <resourceStyle width="20" x="200" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="98" name="hospital0">
+  <symbolStyle id="98" name="archery">
    <resourceStyle width="20" x="220" y="140" height="20"/>
   </symbolStyle>
-  <symbolStyle id="99" name="hospital">
+  <symbolStyle id="99" name="hospital0">
    <resourceStyle width="20" x="0" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="100" name="airport">
+  <symbolStyle id="100" name="hostel">
    <resourceStyle width="20" x="20" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="101" name="helipad">
+  <symbolStyle id="101" name="alpine_hut">
    <resourceStyle width="20" x="40" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="102" name="handball">
+  <symbolStyle id="102" name="hospital">
    <resourceStyle width="20" x="60" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="103" name="handball-borderless">
+  <symbolStyle id="103" name="helipad">
    <resourceStyle width="20" x="80" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="104" name="hairdresser">
+  <symbolStyle id="104" name="handball">
    <resourceStyle width="20" x="100" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="105" name="gymnastics">
+  <symbolStyle id="105" name="handball-borderless">
    <resourceStyle width="20" x="120" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="106" name="gymnastics-borderless">
+  <symbolStyle id="106" name="hairdresser">
    <resourceStyle width="20" x="140" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="107" name="golfcourse">
+  <symbolStyle id="107" name="gymnastics">
    <resourceStyle width="20" x="160" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="108" name="gate">
+  <symbolStyle id="108" name="gymnastics-borderless">
    <resourceStyle width="20" x="180" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="109" name="alpine_hut">
+  <symbolStyle id="109" name="golfcourse">
    <resourceStyle width="20" x="200" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="110" name="fountain">
+  <symbolStyle id="110" name="archery-borderless">
    <resourceStyle width="20" x="220" y="160" height="20"/>
   </symbolStyle>
-  <symbolStyle id="111" name="football">
+  <symbolStyle id="111" name="gate">
    <resourceStyle width="20" x="0" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="112" name="atm">
+  <symbolStyle id="112" name="fountain">
    <resourceStyle width="20" x="20" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="113" name="equestrian-borderless">
+  <symbolStyle id="113" name="bakery">
    <resourceStyle width="20" x="40" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="114" name="athletics">
+  <symbolStyle id="114" name="football-borderless">
    <resourceStyle width="20" x="60" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="115" name="athletics-borderless">
+  <symbolStyle id="115" name="equestrian">
    <resourceStyle width="20" x="80" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="116" name="arrow">
+  <symbolStyle id="116" name="atm">
    <resourceStyle width="20" x="100" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="117" name="equestrian">
+  <symbolStyle id="117" name="arrow">
    <resourceStyle width="20" x="120" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="118" name="fastfood">
+  <symbolStyle id="118" name="firebrigade">
    <resourceStyle width="20" x="140" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="119" name="archery">
+  <symbolStyle id="119" name="athletics">
    <resourceStyle width="20" x="160" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="120" name="firebrigade">
+  <symbolStyle id="120" name="football">
    <resourceStyle width="20" x="180" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="121" name="football-borderless">
+  <symbolStyle id="121" name="fastfood">
    <resourceStyle width="20" x="200" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="122" name="archery-borderless">
+  <symbolStyle id="122" name="athletics-borderless">
    <resourceStyle width="20" x="220" y="180" height="20"/>
   </symbolStyle>
-  <symbolStyle id="123" name="khanda">
-   <resourceStyle width="19" x="0" y="200" height="19"/>
+  <symbolStyle id="123" name="basketball-borderless">
+   <resourceStyle width="20" x="0" y="200" height="19"/>
   </symbolStyle>
-  <symbolStyle id="124" name="basketball-borderless">
-   <resourceStyle width="20" x="19" y="200" height="19"/>
+  <symbolStyle id="124" name="khanda">
+   <resourceStyle width="19" x="20" y="200" height="19"/>
   </symbolStyle>
-  <symbolStyle id="125" name="parking-permissive">
+  <symbolStyle id="125" name="parking-private">
    <resourceStyle width="17" x="39" y="200" height="17"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-private">
+  <symbolStyle id="126" name="parking-permissive">
    <resourceStyle width="17" x="56" y="200" height="17"/>
   </symbolStyle>
   <symbolStyle id="127" name="speed_trap">
@@ -385,58 +385,58 @@
   <symbolStyle id="128" name="traffic_signal">
    <resourceStyle width="16" x="89" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="129" name="windmill">
+  <symbolStyle id="129" name="bank">
    <resourceStyle width="16" x="105" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="130" name="bank">
+  <symbolStyle id="130" name="windmill">
    <resourceStyle width="16" x="121" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="131" name="embassy">
+  <symbolStyle id="131" name="roundabout_left">
    <resourceStyle width="16" x="137" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="132" name="drinking_water">
+  <symbolStyle id="132" name="embassy">
    <resourceStyle width="16" x="153" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="133" name="parking_roof-permissive">
+  <symbolStyle id="133" name="drinking_water">
    <resourceStyle width="16" x="169" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="134" name="mosque">
+  <symbolStyle id="134" name="church">
    <resourceStyle width="16" x="185" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="135" name="doctor">
+  <symbolStyle id="135" name="parking_roof-permissive">
    <resourceStyle width="16" x="201" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="136" name="housenumber">
+  <symbolStyle id="136" name="roundabout_right">
    <resourceStyle width="16" x="217" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="137" name="church">
+  <symbolStyle id="137" name="mosque">
    <resourceStyle width="16" x="233" y="200" height="16"/>
   </symbolStyle>
-  <symbolStyle id="138" name="roundabout_left">
+  <symbolStyle id="138" name="doctor">
    <resourceStyle width="16" x="0" y="219" height="16"/>
   </symbolStyle>
-  <symbolStyle id="139" name="roundabout_right">
+  <symbolStyle id="139" name="housenumber">
    <resourceStyle width="16" x="16" y="219" height="16"/>
   </symbolStyle>
-  <symbolStyle id="140" name="power_wind">
+  <symbolStyle id="140" name="power_generic">
    <resourceStyle width="15" x="32" y="219" height="15"/>
   </symbolStyle>
-  <symbolStyle id="141" name="power_photovoltaic">
+  <symbolStyle id="141" name="lighthouse">
    <resourceStyle width="15" x="47" y="219" height="15"/>
   </symbolStyle>
-  <symbolStyle id="142" name="power_hydro">
+  <symbolStyle id="142" name="viewpoint">
    <resourceStyle width="15" x="62" y="219" height="15"/>
   </symbolStyle>
-  <symbolStyle id="143" name="power_generic">
+  <symbolStyle id="143" name="wastewater">
    <resourceStyle width="15" x="77" y="219" height="15"/>
   </symbolStyle>
-  <symbolStyle id="144" name="wastewater">
+  <symbolStyle id="144" name="power_hydro">
    <resourceStyle width="15" x="92" y="219" height="15"/>
   </symbolStyle>
-  <symbolStyle id="145" name="viewpoint">
+  <symbolStyle id="145" name="power_photovoltaic">
    <resourceStyle width="15" x="107" y="219" height="15"/>
   </symbolStyle>
-  <symbolStyle id="146" name="lighthouse">
+  <symbolStyle id="146" name="power_wind">
    <resourceStyle width="15" x="122" y="219" height="15"/>
   </symbolStyle>
   <symbolStyle id="147" name="bureau_de_change">
@@ -478,10 +478,10 @@
   <symbolStyle id="159" name="disused">
    <resourceStyle width="10" x="92" y="235" height="10"/>
   </symbolStyle>
-  <symbolStyle id="160" name="power-tower">
+  <symbolStyle id="160" name="vulcan">
    <resourceStyle width="10" x="102" y="235" height="10"/>
   </symbolStyle>
-  <symbolStyle id="161" name="vulcan">
+  <symbolStyle id="161" name="power-tower">
    <resourceStyle width="10" x="112" y="235" height="10"/>
   </symbolStyle>
   <symbolStyle id="162" name="building">
diff --git a/data/resources-ldpi/symbols.png b/data/resources-ldpi/symbols.png
index ac4814c914..20d14f1034 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 90f169499b..98f1e161e3 100644
--- a/data/resources-mdpi/basic.skn
+++ b/data/resources-mdpi/basic.skn
@@ -1,256 +1,256 @@
 <!DOCTYPE skin>
 <skin>
  <page width="512" height="256" file="symbols.png">
-  <symbolStyle id="1" name="placemark-red">
+  <symbolStyle id="1" name="placemark-blue">
    <resourceStyle width="22" x="0" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="2" name="placemark-purple">
+  <symbolStyle id="2" name="placemark-brown">
    <resourceStyle width="22" x="22" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="3" name="current-position">
-   <resourceStyle width="28" x="44" y="0" height="28"/>
+  <symbolStyle id="3" name="placemark-red">
+   <resourceStyle width="22" x="44" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="4" name="placemark-pink">
-   <resourceStyle width="22" x="72" y="0" height="28"/>
+  <symbolStyle id="4" name="current-position">
+   <resourceStyle width="28" x="66" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="5" name="placemark-orange">
+  <symbolStyle id="5" name="placemark-purple">
    <resourceStyle width="22" x="94" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="6" name="placemark-green">
+  <symbolStyle id="6" name="placemark-pink">
    <resourceStyle width="22" x="116" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="7" name="placemark-brown">
+  <symbolStyle id="7" name="placemark-orange">
    <resourceStyle width="22" x="138" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="8" name="placemark-blue">
+  <symbolStyle id="8" name="placemark-green">
    <resourceStyle width="22" x="160" y="0" height="28"/>
   </symbolStyle>
-  <symbolStyle id="9" name="pub">
+  <symbolStyle id="9" name="peak">
    <resourceStyle width="20" x="182" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="10" name="postoffice">
+  <symbolStyle id="10" name="peak-mini">
    <resourceStyle width="20" x="202" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="11" name="postbox">
+  <symbolStyle id="11" name="petrolstation">
    <resourceStyle width="20" x="222" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="12" name="police">
+  <symbolStyle id="12" name="pharmacy">
    <resourceStyle width="20" x="242" y="0" height="20"/>
   </symbolStyle>
   <symbolStyle id="13" name="playground">
    <resourceStyle width="20" x="262" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="14" name="pharmacy">
+  <symbolStyle id="14" name="police">
    <resourceStyle width="20" x="282" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="15" name="petrolstation">
+  <symbolStyle id="15" name="postbox">
    <resourceStyle width="20" x="302" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="16" name="peak">
+  <symbolStyle id="16" name="postoffice">
    <resourceStyle width="20" x="322" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="17" name="hotel">
+  <symbolStyle id="17" name="pub">
    <resourceStyle width="20" x="342" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="18" name="hunting_closed_high">
+  <symbolStyle id="18" name="library">
    <resourceStyle width="20" x="362" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="19" name="information-guidepost">
+  <symbolStyle id="19" name="hotel">
    <resourceStyle width="20" x="382" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="20" name="information-office">
+  <symbolStyle id="20" name="hunting_closed_high">
    <resourceStyle width="20" x="402" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="21" name="information">
+  <symbolStyle id="21" name="information-guidepost">
    <resourceStyle width="20" x="422" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="22" name="kindergarten">
+  <symbolStyle id="22" name="information-office">
    <resourceStyle width="20" x="442" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="23" name="kindergarten2">
+  <symbolStyle id="23" name="information">
    <resourceStyle width="20" x="462" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="24" name="kiosk">
+  <symbolStyle id="24" name="kindergarten">
    <resourceStyle width="20" x="482" y="0" height="20"/>
   </symbolStyle>
-  <symbolStyle id="25" name="library">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="20" x="0" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="26" name="man-made-halfpipe">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="20" x="20" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="27" name="memorial">
+  <symbolStyle id="27" name="pubx">
    <resourceStyle width="20" x="40" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="28" name="mountain_pass">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="20" x="60" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="29" name="museum">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="20" x="80" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="30" name="parking-mini">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="20" x="100" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="31" name="parking">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="20" x="120" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="32" name="parking_roof">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="20" x="140" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="33" name="peak-mini">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="20" x="160" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="34" name="subway-station-l">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="20" x="180" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="35" name="subway-station-m">
+  <symbolStyle id="35" name="telephone">
    <resourceStyle width="20" x="200" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="36" name="subway-station-s">
+  <symbolStyle id="36" name="subway-station-m">
    <resourceStyle width="20" x="220" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="37" name="subway">
+  <symbolStyle id="37" name="subway-station-s">
    <resourceStyle width="20" x="240" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="38" name="supermarket">
+  <symbolStyle id="38" name="subway">
    <resourceStyle width="20" x="260" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="39" name="swimming-borderless">
+  <symbolStyle id="39" name="supermarket">
    <resourceStyle width="20" x="280" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="40" name="swimming">
+  <symbolStyle id="40" name="swimming-borderless">
    <resourceStyle width="20" x="300" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="41" name="synagogue">
+  <symbolStyle id="41" name="swimming">
    <resourceStyle width="20" x="320" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="42" name="taxi">
+  <symbolStyle id="42" name="synagogue">
    <resourceStyle width="20" x="340" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="43" name="telephone">
+  <symbolStyle id="43" name="taxi">
    <resourceStyle width="20" x="360" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="44" name="tennis-borderless">
+  <symbolStyle id="44" name="subway-station-l">
    <resourceStyle width="20" x="380" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="45" name="tennis">
+  <symbolStyle id="45" name="tennis-borderless">
    <resourceStyle width="20" x="400" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="46" name="theatre">
+  <symbolStyle id="46" name="tennis">
    <resourceStyle width="20" x="420" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="47" name="toilets">
+  <symbolStyle id="47" name="theatre">
    <resourceStyle width="20" x="440" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="48" name="tramway-mini">
+  <symbolStyle id="48" name="toilets">
    <resourceStyle width="20" x="460" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="49" name="tramway">
+  <symbolStyle id="49" name="tramway-mini">
    <resourceStyle width="20" x="480" y="28" height="20"/>
   </symbolStyle>
-  <symbolStyle id="50" name="university">
+  <symbolStyle id="50" name="tramway">
    <resourceStyle width="20" x="0" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="51" name="pubx">
+  <symbolStyle id="51" name="university">
    <resourceStyle width="20" x="20" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="52" name="railway-crossing-small">
+  <symbolStyle id="52" name="school">
    <resourceStyle width="20" x="40" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="53" name="railway-crossing">
+  <symbolStyle id="53" name="railway-crossing-small">
    <resourceStyle width="20" x="60" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="54" name="railway-station-mini">
+  <symbolStyle id="54" name="railway-crossing">
    <resourceStyle width="20" x="80" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="55" name="railway-station">
+  <symbolStyle id="55" name="railway-station-mini">
    <resourceStyle width="20" x="100" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="56" name="recycling">
+  <symbolStyle id="56" name="railway-station">
    <resourceStyle width="20" x="120" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="57" name="religion">
+  <symbolStyle id="57" name="recycling">
    <resourceStyle width="20" x="140" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="58" name="restaurant">
+  <symbolStyle id="58" name="religion">
    <resourceStyle width="20" x="160" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="59" name="ruins">
+  <symbolStyle id="59" name="restaurant">
    <resourceStyle width="20" x="180" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="60" name="school">
+  <symbolStyle id="60" name="ruins">
    <resourceStyle width="20" x="200" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="61" name="shelter-fireplace">
+  <symbolStyle id="61" name="airport">
    <resourceStyle width="20" x="220" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="62" name="shelter">
+  <symbolStyle id="62" name="shelter-fireplace">
    <resourceStyle width="20" x="240" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="63" name="shooting-borderless">
+  <symbolStyle id="63" name="shelter">
    <resourceStyle width="20" x="260" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="64" name="shooting">
+  <symbolStyle id="64" name="shooting-borderless">
    <resourceStyle width="20" x="280" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="65" name="slipway">
+  <symbolStyle id="65" name="shooting">
    <resourceStyle width="20" x="300" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="66" name="soccer-borderless">
+  <symbolStyle id="66" name="slipway">
    <resourceStyle width="20" x="320" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="67" name="soccer">
+  <symbolStyle id="67" name="soccer-borderless">
    <resourceStyle width="20" x="340" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="68" name="bakery">
+  <symbolStyle id="68" name="soccer">
    <resourceStyle width="20" x="360" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="69" name="equestrian-borderless">
+  <symbolStyle id="69" name="basketball">
    <resourceStyle width="20" x="380" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="70" name="earthquakecamp">
+  <symbolStyle id="70" name="equestrian">
    <resourceStyle width="20" x="400" y="48" height="20"/>
   </symbolStyle>
   <symbolStyle id="71" name="bar">
    <resourceStyle width="20" x="420" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="72" name="barrier">
+  <symbolStyle id="72" name="earthquakecamp">
    <resourceStyle width="20" x="440" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="73" name="dog_park">
+  <symbolStyle id="73" name="barrier">
    <resourceStyle width="20" x="460" y="48" height="20"/>
   </symbolStyle>
   <symbolStyle id="74" name="baseball-borderless">
    <resourceStyle width="20" x="480" y="48" height="20"/>
   </symbolStyle>
-  <symbolStyle id="75" name="diving">
+  <symbolStyle id="75" name="dog_park">
    <resourceStyle width="20" x="0" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="76" name="diving-borderless">
+  <symbolStyle id="76" name="baseball">
    <resourceStyle width="20" x="20" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="77" name="baseball">
+  <symbolStyle id="77" name="diving">
    <resourceStyle width="20" x="40" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="78" name="curling">
+  <symbolStyle id="78" name="diving-borderless">
    <resourceStyle width="20" x="60" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="79" name="curling-borderless">
+  <symbolStyle id="79" name="curling">
    <resourceStyle width="20" x="80" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="80" name="cricket">
+  <symbolStyle id="80" name="curling-borderless">
    <resourceStyle width="20" x="100" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="81" name="cricket-borderless">
+  <symbolStyle id="81" name="cricket">
    <resourceStyle width="20" x="120" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="82" name="clothes">
+  <symbolStyle id="82" name="cricket-borderless">
    <resourceStyle width="20" x="140" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="83" name="cinema">
+  <symbolStyle id="83" name="clothes">
    <resourceStyle width="20" x="160" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="84" name="basketball">
+  <symbolStyle id="84" name="equestrian-borderless">
    <resourceStyle width="20" x="180" y="68" height="20"/>
   </symbolStyle>
   <symbolStyle id="85" name="bicycle_rental">
@@ -265,118 +265,118 @@
   <symbolStyle id="88" name="bowls">
    <resourceStyle width="20" x="260" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="89" name="bus-mini">
+  <symbolStyle id="89" name="cinema">
    <resourceStyle width="20" x="280" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="90" name="castle">
+  <symbolStyle id="90" name="bus-mini">
    <resourceStyle width="20" x="300" y="68" height="20"/>
   </symbolStyle>
   <symbolStyle id="91" name="bus">
    <resourceStyle width="20" x="320" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="92" name="car_repair">
+  <symbolStyle id="92" name="castle">
    <resourceStyle width="20" x="340" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="93" name="car_rental">
+  <symbolStyle id="93" name="bus_sta">
    <resourceStyle width="20" x="360" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="94" name="cannon">
+  <symbolStyle id="94" name="car_repair">
    <resourceStyle width="20" x="380" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="95" name="campsite">
+  <symbolStyle id="95" name="car_rental">
    <resourceStyle width="20" x="400" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="96" name="cafe">
+  <symbolStyle id="96" name="cannon">
    <resourceStyle width="20" x="420" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="97" name="bus_sta">
+  <symbolStyle id="97" name="campsite">
    <resourceStyle width="20" x="440" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="98" name="hostel">
+  <symbolStyle id="98" name="cafe">
    <resourceStyle width="20" x="460" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="99" name="hospital0">
+  <symbolStyle id="99" name="archery">
    <resourceStyle width="20" x="480" y="68" height="20"/>
   </symbolStyle>
-  <symbolStyle id="100" name="airport">
+  <symbolStyle id="100" name="hostel">
    <resourceStyle width="20" x="0" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="101" name="hospital">
+  <symbolStyle id="101" name="alpine_hut">
    <resourceStyle width="20" x="20" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="102" name="helipad">
+  <symbolStyle id="102" name="hospital0">
    <resourceStyle width="20" x="40" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="103" name="handball">
+  <symbolStyle id="103" name="hospital">
    <resourceStyle width="20" x="60" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="104" name="handball-borderless">
+  <symbolStyle id="104" name="helipad">
    <resourceStyle width="20" x="80" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="105" name="hairdresser">
+  <symbolStyle id="105" name="handball">
    <resourceStyle width="20" x="100" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="106" name="gymnastics">
+  <symbolStyle id="106" name="handball-borderless">
    <resourceStyle width="20" x="120" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="107" name="gymnastics-borderless">
+  <symbolStyle id="107" name="hairdresser">
    <resourceStyle width="20" x="140" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="108" name="golfcourse">
+  <symbolStyle id="108" name="gymnastics">
    <resourceStyle width="20" x="160" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="109" name="alpine_hut">
+  <symbolStyle id="109" name="gymnastics-borderless">
    <resourceStyle width="20" x="180" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="110" name="gate">
+  <symbolStyle id="110" name="archery-borderless">
    <resourceStyle width="20" x="200" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="111" name="fountain">
+  <symbolStyle id="111" name="golfcourse">
    <resourceStyle width="20" x="220" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="112" name="atm">
+  <symbolStyle id="112" name="gate">
    <resourceStyle width="20" x="240" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="113" name="equestrian">
+  <symbolStyle id="113" name="fountain">
    <resourceStyle width="20" x="260" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="114" name="athletics">
+  <symbolStyle id="114" name="bakery">
    <resourceStyle width="20" x="280" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="115" name="athletics-borderless">
+  <symbolStyle id="115" name="fastfood">
    <resourceStyle width="20" x="300" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="116" name="arrow">
+  <symbolStyle id="116" name="atm">
    <resourceStyle width="20" x="320" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="117" name="fastfood">
+  <symbolStyle id="117" name="arrow">
    <resourceStyle width="20" x="340" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="118" name="firebrigade">
+  <symbolStyle id="118" name="football-borderless">
    <resourceStyle width="20" x="360" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="119" name="archery">
+  <symbolStyle id="119" name="athletics">
    <resourceStyle width="20" x="380" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="120" name="football-borderless">
+  <symbolStyle id="120" name="football">
    <resourceStyle width="20" x="400" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="121" name="football">
+  <symbolStyle id="121" name="firebrigade">
    <resourceStyle width="20" x="420" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="122" name="archery-borderless">
+  <symbolStyle id="122" name="athletics-borderless">
    <resourceStyle width="20" x="440" y="88" height="20"/>
   </symbolStyle>
-  <symbolStyle id="123" name="khanda">
-   <resourceStyle width="19" x="460" y="88" height="19"/>
+  <symbolStyle id="123" name="basketball-borderless">
+   <resourceStyle width="20" x="460" y="88" height="19"/>
   </symbolStyle>
-  <symbolStyle id="124" name="basketball-borderless">
-   <resourceStyle width="20" x="479" y="88" height="19"/>
+  <symbolStyle id="124" name="khanda">
+   <resourceStyle width="19" x="480" y="88" height="19"/>
   </symbolStyle>
-  <symbolStyle id="125" name="parking-permissive">
+  <symbolStyle id="125" name="parking-private">
    <resourceStyle width="17" x="0" y="108" height="17"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-private">
+  <symbolStyle id="126" name="parking-permissive">
    <resourceStyle width="17" x="17" y="108" height="17"/>
   </symbolStyle>
   <symbolStyle id="127" name="speed_trap">
@@ -391,43 +391,43 @@
   <symbolStyle id="130" name="windmill">
    <resourceStyle width="16" x="82" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="131" name="embassy">
+  <symbolStyle id="131" name="roundabout_right">
    <resourceStyle width="16" x="98" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="132" name="drinking_water">
+  <symbolStyle id="132" name="housenumber">
    <resourceStyle width="16" x="114" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="133" name="parking_roof-permissive">
+  <symbolStyle id="133" name="mosque">
    <resourceStyle width="16" x="130" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="134" name="mosque">
+  <symbolStyle id="134" name="parking_roof-permissive">
    <resourceStyle width="16" x="146" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="135" name="doctor">
+  <symbolStyle id="135" name="embassy">
    <resourceStyle width="16" x="162" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="136" name="housenumber">
+  <symbolStyle id="136" name="drinking_water">
    <resourceStyle width="16" x="178" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="137" name="church">
+  <symbolStyle id="137" name="doctor">
    <resourceStyle width="16" x="194" y="108" height="16"/>
   </symbolStyle>
   <symbolStyle id="138" name="roundabout_left">
    <resourceStyle width="16" x="210" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="139" name="roundabout_right">
+  <symbolStyle id="139" name="church">
    <resourceStyle width="16" x="226" y="108" height="16"/>
   </symbolStyle>
-  <symbolStyle id="140" name="power_wind">
+  <symbolStyle id="140" name="power_photovoltaic">
    <resourceStyle width="15" x="242" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="141" name="power_photovoltaic">
+  <symbolStyle id="141" name="power_hydro">
    <resourceStyle width="15" x="257" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="142" name="power_hydro">
+  <symbolStyle id="142" name="power_generic">
    <resourceStyle width="15" x="272" y="108" height="15"/>
   </symbolStyle>
-  <symbolStyle id="143" name="power_generic">
+  <symbolStyle id="143" name="power_wind">
    <resourceStyle width="15" x="287" y="108" height="15"/>
   </symbolStyle>
   <symbolStyle id="144" name="wastewater">
@@ -475,16 +475,16 @@
   <symbolStyle id="158" name="bench">
    <resourceStyle width="12" x="40" y="125" height="12"/>
   </symbolStyle>
-  <symbolStyle id="159" name="disused">
+  <symbolStyle id="159" name="building">
    <resourceStyle width="10" x="52" y="125" height="10"/>
   </symbolStyle>
-  <symbolStyle id="160" name="power-tower">
+  <symbolStyle id="160" name="disused">
    <resourceStyle width="10" x="62" y="125" height="10"/>
   </symbolStyle>
   <symbolStyle id="161" name="vulcan">
    <resourceStyle width="10" x="72" y="125" height="10"/>
   </symbolStyle>
-  <symbolStyle id="162" name="building">
+  <symbolStyle id="162" name="power-tower">
    <resourceStyle width="10" x="82" y="125" height="10"/>
   </symbolStyle>
   <symbolStyle id="163" name="survey_point">
diff --git a/data/resources-mdpi/symbols.png b/data/resources-mdpi/symbols.png
index 140df29e80..15a3e865a1 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 5dbf92d546..aca1a8e6a5 100644
--- a/data/resources-xhdpi/basic.skn
+++ b/data/resources-xhdpi/basic.skn
@@ -1,256 +1,256 @@
 <!DOCTYPE skin>
 <skin>
  <page width="512" height="512" file="symbols.png">
-  <symbolStyle id="1" name="placemark-red">
+  <symbolStyle id="1" name="placemark-blue">
    <resourceStyle width="40" x="0" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="2" name="placemark-purple">
+  <symbolStyle id="2" name="placemark-brown">
    <resourceStyle width="40" x="40" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="3" name="current-position">
-   <resourceStyle width="52" x="80" y="0" height="52"/>
+  <symbolStyle id="3" name="placemark-red">
+   <resourceStyle width="40" x="80" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="4" name="placemark-pink">
-   <resourceStyle width="40" x="132" y="0" height="52"/>
+  <symbolStyle id="4" name="current-position">
+   <resourceStyle width="52" x="120" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="5" name="placemark-orange">
+  <symbolStyle id="5" name="placemark-purple">
    <resourceStyle width="40" x="172" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="6" name="placemark-green">
+  <symbolStyle id="6" name="placemark-pink">
    <resourceStyle width="40" x="212" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="7" name="placemark-brown">
+  <symbolStyle id="7" name="placemark-orange">
    <resourceStyle width="40" x="252" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="8" name="placemark-blue">
+  <symbolStyle id="8" name="placemark-green">
    <resourceStyle width="40" x="292" y="0" height="52"/>
   </symbolStyle>
-  <symbolStyle id="9" name="pub">
+  <symbolStyle id="9" name="peak">
    <resourceStyle width="40" x="332" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="10" name="postoffice">
+  <symbolStyle id="10" name="peak-mini">
    <resourceStyle width="40" x="372" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="11" name="postbox">
+  <symbolStyle id="11" name="petrolstation">
    <resourceStyle width="40" x="412" y="0" height="40"/>
   </symbolStyle>
-  <symbolStyle id="12" name="police">
+  <symbolStyle id="12" name="pharmacy">
    <resourceStyle width="40" x="452" y="0" height="40"/>
   </symbolStyle>
   <symbolStyle id="13" name="playground">
    <resourceStyle width="40" x="0" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="14" name="pharmacy">
+  <symbolStyle id="14" name="police">
    <resourceStyle width="40" x="40" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="15" name="petrolstation">
+  <symbolStyle id="15" name="postbox">
    <resourceStyle width="40" x="80" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="16" name="peak">
+  <symbolStyle id="16" name="postoffice">
    <resourceStyle width="40" x="120" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="17" name="hotel">
+  <symbolStyle id="17" name="pub">
    <resourceStyle width="40" x="160" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="18" name="hunting_closed_high">
+  <symbolStyle id="18" name="library">
    <resourceStyle width="40" x="200" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="19" name="information-guidepost">
+  <symbolStyle id="19" name="hotel">
    <resourceStyle width="40" x="240" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="20" name="information-office">
+  <symbolStyle id="20" name="hunting_closed_high">
    <resourceStyle width="40" x="280" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="21" name="information">
+  <symbolStyle id="21" name="information-guidepost">
    <resourceStyle width="40" x="320" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="22" name="kindergarten">
+  <symbolStyle id="22" name="information-office">
    <resourceStyle width="40" x="360" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="23" name="kindergarten2">
+  <symbolStyle id="23" name="information">
    <resourceStyle width="40" x="400" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="24" name="kiosk">
+  <symbolStyle id="24" name="kindergarten">
    <resourceStyle width="40" x="440" y="52" height="40"/>
   </symbolStyle>
-  <symbolStyle id="25" name="library">
+  <symbolStyle id="25" name="kindergarten2">
    <resourceStyle width="40" x="0" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="26" name="man-made-halfpipe">
+  <symbolStyle id="26" name="kiosk">
    <resourceStyle width="40" x="40" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="27" name="memorial">
+  <symbolStyle id="27" name="pubx">
    <resourceStyle width="40" x="80" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="28" name="mountain_pass">
+  <symbolStyle id="28" name="man-made-halfpipe">
    <resourceStyle width="40" x="120" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="29" name="museum">
+  <symbolStyle id="29" name="memorial">
    <resourceStyle width="40" x="160" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="30" name="parking-mini">
+  <symbolStyle id="30" name="mountain_pass">
    <resourceStyle width="40" x="200" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="31" name="parking">
+  <symbolStyle id="31" name="museum">
    <resourceStyle width="40" x="240" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="32" name="parking_roof">
+  <symbolStyle id="32" name="parking-mini">
    <resourceStyle width="40" x="280" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="33" name="peak-mini">
+  <symbolStyle id="33" name="parking">
    <resourceStyle width="40" x="320" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="34" name="subway-station-l">
+  <symbolStyle id="34" name="parking_roof">
    <resourceStyle width="40" x="360" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="35" name="subway-station-m">
+  <symbolStyle id="35" name="telephone">
    <resourceStyle width="40" x="400" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="36" name="subway-station-s">
+  <symbolStyle id="36" name="subway-station-m">
    <resourceStyle width="40" x="440" y="92" height="40"/>
   </symbolStyle>
-  <symbolStyle id="37" name="subway">
+  <symbolStyle id="37" name="subway-station-s">
    <resourceStyle width="40" x="0" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="38" name="supermarket">
+  <symbolStyle id="38" name="subway">
    <resourceStyle width="40" x="40" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="39" name="swimming-borderless">
+  <symbolStyle id="39" name="supermarket">
    <resourceStyle width="40" x="80" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="40" name="swimming">
+  <symbolStyle id="40" name="swimming-borderless">
    <resourceStyle width="40" x="120" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="41" name="synagogue">
+  <symbolStyle id="41" name="swimming">
    <resourceStyle width="40" x="160" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="42" name="taxi">
+  <symbolStyle id="42" name="synagogue">
    <resourceStyle width="40" x="200" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="43" name="telephone">
+  <symbolStyle id="43" name="taxi">
    <resourceStyle width="40" x="240" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="44" name="tennis-borderless">
+  <symbolStyle id="44" name="subway-station-l">
    <resourceStyle width="40" x="280" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="45" name="tennis">
+  <symbolStyle id="45" name="tennis-borderless">
    <resourceStyle width="40" x="320" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="46" name="theatre">
+  <symbolStyle id="46" name="tennis">
    <resourceStyle width="40" x="360" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="47" name="toilets">
+  <symbolStyle id="47" name="theatre">
    <resourceStyle width="40" x="400" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="48" name="tramway-mini">
+  <symbolStyle id="48" name="toilets">
    <resourceStyle width="40" x="440" y="132" height="40"/>
   </symbolStyle>
-  <symbolStyle id="49" name="tramway">
+  <symbolStyle id="49" name="tramway-mini">
    <resourceStyle width="40" x="0" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="50" name="university">
+  <symbolStyle id="50" name="tramway">
    <resourceStyle width="40" x="40" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="51" name="pubx">
+  <symbolStyle id="51" name="university">
    <resourceStyle width="40" x="80" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="52" name="railway-crossing-small">
+  <symbolStyle id="52" name="school">
    <resourceStyle width="40" x="120" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="53" name="railway-crossing">
+  <symbolStyle id="53" name="railway-crossing-small">
    <resourceStyle width="40" x="160" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="54" name="railway-station-mini">
+  <symbolStyle id="54" name="railway-crossing">
    <resourceStyle width="40" x="200" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="55" name="railway-station">
+  <symbolStyle id="55" name="railway-station-mini">
    <resourceStyle width="40" x="240" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="56" name="recycling">
+  <symbolStyle id="56" name="railway-station">
    <resourceStyle width="40" x="280" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="57" name="religion">
+  <symbolStyle id="57" name="recycling">
    <resourceStyle width="40" x="320" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="58" name="restaurant">
+  <symbolStyle id="58" name="religion">
    <resourceStyle width="40" x="360" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="59" name="ruins">
+  <symbolStyle id="59" name="restaurant">
    <resourceStyle width="40" x="400" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="60" name="school">
+  <symbolStyle id="60" name="ruins">
    <resourceStyle width="40" x="440" y="172" height="40"/>
   </symbolStyle>
-  <symbolStyle id="61" name="shelter-fireplace">
+  <symbolStyle id="61" name="airport">
    <resourceStyle width="40" x="0" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="62" name="shelter">
+  <symbolStyle id="62" name="shelter-fireplace">
    <resourceStyle width="40" x="40" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="63" name="shooting-borderless">
+  <symbolStyle id="63" name="shelter">
    <resourceStyle width="40" x="80" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="64" name="shooting">
+  <symbolStyle id="64" name="shooting-borderless">
    <resourceStyle width="40" x="120" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="65" name="slipway">
+  <symbolStyle id="65" name="shooting">
    <resourceStyle width="40" x="160" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="66" name="soccer-borderless">
+  <symbolStyle id="66" name="slipway">
    <resourceStyle width="40" x="200" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="67" name="soccer">
+  <symbolStyle id="67" name="soccer-borderless">
    <resourceStyle width="40" x="240" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="68" name="bakery">
+  <symbolStyle id="68" name="soccer">
    <resourceStyle width="40" x="280" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="69" name="equestrian-borderless">
+  <symbolStyle id="69" name="basketball">
    <resourceStyle width="40" x="320" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="70" name="earthquakecamp">
+  <symbolStyle id="70" name="equestrian">
    <resourceStyle width="40" x="360" y="212" height="40"/>
   </symbolStyle>
   <symbolStyle id="71" name="bar">
    <resourceStyle width="40" x="400" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="72" name="barrier">
+  <symbolStyle id="72" name="earthquakecamp">
    <resourceStyle width="40" x="440" y="212" height="40"/>
   </symbolStyle>
-  <symbolStyle id="73" name="dog_park">
+  <symbolStyle id="73" name="barrier">
    <resourceStyle width="40" x="0" y="252" height="40"/>
   </symbolStyle>
   <symbolStyle id="74" name="baseball-borderless">
    <resourceStyle width="40" x="40" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="75" name="diving">
+  <symbolStyle id="75" name="dog_park">
    <resourceStyle width="40" x="80" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="76" name="diving-borderless">
+  <symbolStyle id="76" name="baseball">
    <resourceStyle width="40" x="120" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="77" name="baseball">
+  <symbolStyle id="77" name="diving">
    <resourceStyle width="40" x="160" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="78" name="curling">
+  <symbolStyle id="78" name="diving-borderless">
    <resourceStyle width="40" x="200" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="79" name="curling-borderless">
+  <symbolStyle id="79" name="curling">
    <resourceStyle width="40" x="240" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="80" name="cricket">
+  <symbolStyle id="80" name="curling-borderless">
    <resourceStyle width="40" x="280" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="81" name="cricket-borderless">
+  <symbolStyle id="81" name="cricket">
    <resourceStyle width="40" x="320" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="82" name="clothes">
+  <symbolStyle id="82" name="cricket-borderless">
    <resourceStyle width="40" x="360" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="83" name="cinema">
+  <symbolStyle id="83" name="clothes">
    <resourceStyle width="40" x="400" y="252" height="40"/>
   </symbolStyle>
-  <symbolStyle id="84" name="basketball">
+  <symbolStyle id="84" name="equestrian-borderless">
    <resourceStyle width="40" x="440" y="252" height="40"/>
   </symbolStyle>
   <symbolStyle id="85" name="bicycle_rental">
@@ -265,106 +265,106 @@
   <symbolStyle id="88" name="bowls">
    <resourceStyle width="40" x="120" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="89" name="bus-mini">
+  <symbolStyle id="89" name="cinema">
    <resourceStyle width="40" x="160" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="90" name="castle">
+  <symbolStyle id="90" name="bus-mini">
    <resourceStyle width="40" x="200" y="292" height="40"/>
   </symbolStyle>
   <symbolStyle id="91" name="bus">
    <resourceStyle width="40" x="240" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="92" name="car_repair">
+  <symbolStyle id="92" name="castle">
    <resourceStyle width="40" x="280" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="93" name="car_rental">
+  <symbolStyle id="93" name="bus_sta">
    <resourceStyle width="40" x="320" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="94" name="cannon">
+  <symbolStyle id="94" name="car_repair">
    <resourceStyle width="40" x="360" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="95" name="campsite">
+  <symbolStyle id="95" name="car_rental">
    <resourceStyle width="40" x="400" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="96" name="cafe">
+  <symbolStyle id="96" name="cannon">
    <resourceStyle width="40" x="440" y="292" height="40"/>
   </symbolStyle>
-  <symbolStyle id="97" name="bus_sta">
+  <symbolStyle id="97" name="campsite">
    <resourceStyle width="40" x="0" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="98" name="hostel">
+  <symbolStyle id="98" name="cafe">
    <resourceStyle width="40" x="40" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="99" name="hospital0">
+  <symbolStyle id="99" name="archery">
    <resourceStyle width="40" x="80" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="100" name="airport">
+  <symbolStyle id="100" name="hostel">
    <resourceStyle width="40" x="120" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="101" name="hospital">
+  <symbolStyle id="101" name="alpine_hut">
    <resourceStyle width="40" x="160" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="102" name="helipad">
+  <symbolStyle id="102" name="hospital0">
    <resourceStyle width="40" x="200" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="103" name="handball">
+  <symbolStyle id="103" name="hospital">
    <resourceStyle width="40" x="240" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="104" name="handball-borderless">
+  <symbolStyle id="104" name="helipad">
    <resourceStyle width="40" x="280" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="105" name="hairdresser">
+  <symbolStyle id="105" name="handball">
    <resourceStyle width="40" x="320" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="106" name="gymnastics">
+  <symbolStyle id="106" name="handball-borderless">
    <resourceStyle width="40" x="360" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="107" name="gymnastics-borderless">
+  <symbolStyle id="107" name="hairdresser">
    <resourceStyle width="40" x="400" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="108" name="golfcourse">
+  <symbolStyle id="108" name="gymnastics">
    <resourceStyle width="40" x="440" y="332" height="40"/>
   </symbolStyle>
-  <symbolStyle id="109" name="alpine_hut">
+  <symbolStyle id="109" name="gymnastics-borderless">
    <resourceStyle width="40" x="0" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="110" name="gate">
+  <symbolStyle id="110" name="archery-borderless">
    <resourceStyle width="40" x="40" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="111" name="fountain">
+  <symbolStyle id="111" name="golfcourse">
    <resourceStyle width="40" x="80" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="112" name="atm">
+  <symbolStyle id="112" name="gate">
    <resourceStyle width="40" x="120" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="113" name="equestrian">
+  <symbolStyle id="113" name="fountain">
    <resourceStyle width="40" x="160" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="114" name="athletics">
+  <symbolStyle id="114" name="bakery">
    <resourceStyle width="40" x="200" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="115" name="athletics-borderless">
+  <symbolStyle id="115" name="fastfood">
    <resourceStyle width="40" x="240" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="116" name="arrow">
+  <symbolStyle id="116" name="atm">
    <resourceStyle width="40" x="280" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="117" name="fastfood">
+  <symbolStyle id="117" name="arrow">
    <resourceStyle width="40" x="320" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="118" name="firebrigade">
+  <symbolStyle id="118" name="football-borderless">
    <resourceStyle width="40" x="360" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="119" name="archery">
+  <symbolStyle id="119" name="athletics">
    <resourceStyle width="40" x="400" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="120" name="football-borderless">
+  <symbolStyle id="120" name="football">
    <resourceStyle width="40" x="440" y="372" height="40"/>
   </symbolStyle>
-  <symbolStyle id="121" name="football">
+  <symbolStyle id="121" name="firebrigade">
    <resourceStyle width="40" x="0" y="412" height="40"/>
   </symbolStyle>
-  <symbolStyle id="122" name="archery-borderless">
+  <symbolStyle id="122" name="athletics-borderless">
    <resourceStyle width="40" x="40" y="412" height="40"/>
   </symbolStyle>
   <symbolStyle id="123" name="basketball-borderless">
@@ -373,10 +373,10 @@
   <symbolStyle id="124" name="khanda">
    <resourceStyle width="37" x="120" y="412" height="37"/>
   </symbolStyle>
-  <symbolStyle id="125" name="parking-permissive">
+  <symbolStyle id="125" name="parking-private">
    <resourceStyle width="34" x="157" y="412" height="34"/>
   </symbolStyle>
-  <symbolStyle id="126" name="parking-private">
+  <symbolStyle id="126" name="parking-permissive">
    <resourceStyle width="34" x="191" y="412" height="34"/>
   </symbolStyle>
   <symbolStyle id="127" name="speed_trap">
@@ -391,43 +391,43 @@
   <symbolStyle id="130" name="windmill">
    <resourceStyle width="31" x="318" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="131" name="embassy">
+  <symbolStyle id="131" name="roundabout_right">
    <resourceStyle width="31" x="349" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="132" name="drinking_water">
+  <symbolStyle id="132" name="housenumber">
    <resourceStyle width="31" x="380" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="133" name="parking_roof-permissive">
+  <symbolStyle id="133" name="mosque">
    <resourceStyle width="31" x="411" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="134" name="mosque">
+  <symbolStyle id="134" name="parking_roof-permissive">
    <resourceStyle width="31" x="442" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="135" name="doctor">
+  <symbolStyle id="135" name="embassy">
    <resourceStyle width="31" x="473" y="412" height="31"/>
   </symbolStyle>
-  <symbolStyle id="136" name="housenumber">
+  <symbolStyle id="136" name="drinking_water">
    <resourceStyle width="31" x="0" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="137" name="church">
+  <symbolStyle id="137" name="doctor">
    <resourceStyle width="31" x="31" y="452" height="31"/>
   </symbolStyle>
   <symbolStyle id="138" name="roundabout_left">
    <resourceStyle width="31" x="62" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="139" name="roundabout_right">
+  <symbolStyle id="139" name="church">
    <resourceStyle width="31" x="93" y="452" height="31"/>
   </symbolStyle>
-  <symbolStyle id="140" name="power_wind">
+  <symbolStyle id="140" name="power_photovoltaic">
    <resourceStyle width="28" x="124" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="141" name="power_photovoltaic">
+  <symbolStyle id="141" name="power_hydro">
    <resourceStyle width="28" x="152" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="142" name="power_hydro">
+  <symbolStyle id="142" name="power_generic">
    <resourceStyle width="28" x="180" y="452" height="28"/>
   </symbolStyle>
-  <symbolStyle id="143" name="power_generic">
+  <symbolStyle id="143" name="power_wind">
    <resourceStyle width="28" x="208" y="452" height="28"/>
   </symbolStyle>
   <symbolStyle id="144" name="wastewater">
@@ -475,16 +475,16 @@
   <symbolStyle id="158" name="bench">
    <resourceStyle width="22" x="182" y="483" height="22"/>
   </symbolStyle>
-  <symbolStyle id="159" name="disused">
+  <symbolStyle id="159" name="building">
    <resourceStyle width="18" x="204" y="483" height="18"/>
   </symbolStyle>
-  <symbolStyle id="160" name="power-tower">
+  <symbolStyle id="160" name="disused">
    <resourceStyle width="18" x="222" y="483" height="18"/>
   </symbolStyle>
   <symbolStyle id="161" name="vulcan">
    <resourceStyle width="18" x="240" y="483" height="18"/>
   </symbolStyle>
-  <symbolStyle id="162" name="building">
+  <symbolStyle id="162" name="power-tower">
    <resourceStyle width="18" x="258" y="483" height="18"/>
   </symbolStyle>
   <symbolStyle id="163" name="survey_point">
diff --git a/data/resources-xhdpi/symbols.png b/data/resources-xhdpi/symbols.png
index b09d46bf92..0ff39aa92f 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
new file mode 100644
index 0000000000..460112a24c
--- /dev/null
+++ b/data/resources-xxhdpi/basic.skn
@@ -0,0 +1,500 @@
+<!DOCTYPE skin>
+<skin>
+ <page width="1024" height="512" file="symbols.png">
+  <symbolStyle id="1" name="placemark-blue">
+   <resourceStyle width="58" x="0" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="2" name="placemark-brown">
+   <resourceStyle width="58" x="58" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="3" name="placemark-red">
+   <resourceStyle width="58" x="116" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="4" name="current-position">
+   <resourceStyle width="76" x="174" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="5" name="placemark-purple">
+   <resourceStyle width="58" x="250" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="6" name="placemark-pink">
+   <resourceStyle width="58" x="308" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="7" name="placemark-orange">
+   <resourceStyle width="58" x="366" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="8" name="placemark-green">
+   <resourceStyle width="58" x="424" y="0" height="76"/>
+  </symbolStyle>
+  <symbolStyle id="9" name="peak">
+   <resourceStyle width="52" x="482" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="10" name="peak-mini">
+   <resourceStyle width="52" x="534" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="11" name="petrolstation">
+   <resourceStyle width="52" x="586" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="12" name="pharmacy">
+   <resourceStyle width="52" x="638" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="13" name="playground">
+   <resourceStyle width="52" x="690" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="14" name="police">
+   <resourceStyle width="52" x="742" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="15" name="postbox">
+   <resourceStyle width="52" x="794" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="16" name="postoffice">
+   <resourceStyle width="52" x="846" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="17" name="pub">
+   <resourceStyle width="52" x="898" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="18" name="library">
+   <resourceStyle width="52" x="950" y="0" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="19" name="hotel">
+   <resourceStyle width="52" x="0" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="20" name="hunting_closed_high">
+   <resourceStyle width="52" x="52" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="21" name="information-guidepost">
+   <resourceStyle width="52" x="104" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="22" name="information-office">
+   <resourceStyle width="52" x="156" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="23" name="information">
+   <resourceStyle width="52" x="208" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="24" name="kindergarten">
+   <resourceStyle width="52" x="260" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="25" name="kindergarten2">
+   <resourceStyle width="52" x="312" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="26" name="kiosk">
+   <resourceStyle width="52" x="364" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="27" name="pubx">
+   <resourceStyle width="52" x="416" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="28" name="man-made-halfpipe">
+   <resourceStyle width="52" x="468" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="29" name="memorial">
+   <resourceStyle width="52" x="520" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="30" name="mountain_pass">
+   <resourceStyle width="52" x="572" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="31" name="museum">
+   <resourceStyle width="52" x="624" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="32" name="parking-mini">
+   <resourceStyle width="52" x="676" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="33" name="parking">
+   <resourceStyle width="52" x="728" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="34" name="parking_roof">
+   <resourceStyle width="52" x="780" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="35" name="telephone">
+   <resourceStyle width="52" x="832" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="36" name="subway-station-m">
+   <resourceStyle width="52" x="884" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="37" name="subway-station-s">
+   <resourceStyle width="52" x="936" y="76" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="38" name="subway">
+   <resourceStyle width="52" x="0" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="39" name="supermarket">
+   <resourceStyle width="52" x="52" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="40" name="swimming-borderless">
+   <resourceStyle width="52" x="104" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="41" name="swimming">
+   <resourceStyle width="52" x="156" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="42" name="synagogue">
+   <resourceStyle width="52" x="208" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="43" name="taxi">
+   <resourceStyle width="52" x="260" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="44" name="subway-station-l">
+   <resourceStyle width="52" x="312" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="45" name="tennis-borderless">
+   <resourceStyle width="52" x="364" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="46" name="tennis">
+   <resourceStyle width="52" x="416" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="47" name="theatre">
+   <resourceStyle width="52" x="468" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="48" name="toilets">
+   <resourceStyle width="52" x="520" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="49" name="tramway-mini">
+   <resourceStyle width="52" x="572" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="50" name="tramway">
+   <resourceStyle width="52" x="624" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="51" name="university">
+   <resourceStyle width="52" x="676" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="52" name="school">
+   <resourceStyle width="52" x="728" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="53" name="railway-crossing-small">
+   <resourceStyle width="52" x="780" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="54" name="railway-crossing">
+   <resourceStyle width="52" x="832" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="55" name="railway-station-mini">
+   <resourceStyle width="52" x="884" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="56" name="railway-station">
+   <resourceStyle width="52" x="936" y="128" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="57" name="recycling">
+   <resourceStyle width="52" x="0" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="58" name="religion">
+   <resourceStyle width="52" x="52" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="59" name="restaurant">
+   <resourceStyle width="52" x="104" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="60" name="ruins">
+   <resourceStyle width="52" x="156" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="61" name="airport">
+   <resourceStyle width="52" x="208" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="62" name="shelter-fireplace">
+   <resourceStyle width="52" x="260" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="63" name="shelter">
+   <resourceStyle width="52" x="312" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="64" name="shooting-borderless">
+   <resourceStyle width="52" x="364" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="65" name="shooting">
+   <resourceStyle width="52" x="416" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="66" name="slipway">
+   <resourceStyle width="52" x="468" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="67" name="soccer-borderless">
+   <resourceStyle width="52" x="520" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="68" name="soccer">
+   <resourceStyle width="52" x="572" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="69" name="basketball">
+   <resourceStyle width="52" x="624" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="70" name="equestrian">
+   <resourceStyle width="52" x="676" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="71" name="bar">
+   <resourceStyle width="52" x="728" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="72" name="earthquakecamp">
+   <resourceStyle width="52" x="780" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="73" name="barrier">
+   <resourceStyle width="52" x="832" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="74" name="baseball-borderless">
+   <resourceStyle width="52" x="884" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="75" name="dog_park">
+   <resourceStyle width="52" x="936" y="180" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="76" name="baseball">
+   <resourceStyle width="52" x="0" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="77" name="diving">
+   <resourceStyle width="52" x="52" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="78" name="diving-borderless">
+   <resourceStyle width="52" x="104" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="79" name="curling">
+   <resourceStyle width="52" x="156" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="80" name="curling-borderless">
+   <resourceStyle width="52" x="208" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="81" name="cricket">
+   <resourceStyle width="52" x="260" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="82" name="cricket-borderless">
+   <resourceStyle width="52" x="312" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="83" name="clothes">
+   <resourceStyle width="52" x="364" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="84" name="equestrian-borderless">
+   <resourceStyle width="52" x="416" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="85" name="bicycle_rental">
+   <resourceStyle width="52" x="468" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="86" name="bird">
+   <resourceStyle width="52" x="520" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="87" name="bowls-borderless">
+   <resourceStyle width="52" x="572" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="88" name="bowls">
+   <resourceStyle width="52" x="624" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="89" name="cinema">
+   <resourceStyle width="52" x="676" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="90" name="bus-mini">
+   <resourceStyle width="52" x="728" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="91" name="bus">
+   <resourceStyle width="52" x="780" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="92" name="castle">
+   <resourceStyle width="52" x="832" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="93" name="bus_sta">
+   <resourceStyle width="52" x="884" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="94" name="car_repair">
+   <resourceStyle width="52" x="936" y="232" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="95" name="car_rental">
+   <resourceStyle width="52" x="0" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="96" name="cannon">
+   <resourceStyle width="52" x="52" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="97" name="campsite">
+   <resourceStyle width="52" x="104" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="98" name="cafe">
+   <resourceStyle width="52" x="156" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="99" name="archery">
+   <resourceStyle width="52" x="208" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="100" name="hostel">
+   <resourceStyle width="52" x="260" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="101" name="alpine_hut">
+   <resourceStyle width="52" x="312" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="102" name="hospital0">
+   <resourceStyle width="52" x="364" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="103" name="hospital">
+   <resourceStyle width="52" x="416" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="104" name="helipad">
+   <resourceStyle width="52" x="468" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="105" name="handball">
+   <resourceStyle width="52" x="520" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="106" name="handball-borderless">
+   <resourceStyle width="52" x="572" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="107" name="hairdresser">
+   <resourceStyle width="52" x="624" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="108" name="gymnastics">
+   <resourceStyle width="52" x="676" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="109" name="gymnastics-borderless">
+   <resourceStyle width="52" x="728" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="110" name="archery-borderless">
+   <resourceStyle width="52" x="780" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="111" name="golfcourse">
+   <resourceStyle width="52" x="832" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="112" name="gate">
+   <resourceStyle width="52" x="884" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="113" name="fountain">
+   <resourceStyle width="52" x="936" y="284" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="114" name="bakery">
+   <resourceStyle width="52" x="0" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="115" name="fastfood">
+   <resourceStyle width="52" x="52" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="116" name="atm">
+   <resourceStyle width="52" x="104" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="117" name="arrow">
+   <resourceStyle width="52" x="156" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="118" name="football-borderless">
+   <resourceStyle width="52" x="208" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="119" name="athletics">
+   <resourceStyle width="52" x="260" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="120" name="football">
+   <resourceStyle width="52" x="312" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="121" name="firebrigade">
+   <resourceStyle width="52" x="364" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="122" name="athletics-borderless">
+   <resourceStyle width="52" x="416" y="336" height="52"/>
+  </symbolStyle>
+  <symbolStyle id="123" name="basketball-borderless">
+   <resourceStyle width="52" x="468" y="336" height="50"/>
+  </symbolStyle>
+  <symbolStyle id="124" name="khanda">
+   <resourceStyle width="48" x="520" y="336" height="48"/>
+  </symbolStyle>
+  <symbolStyle id="125" name="parking-private">
+   <resourceStyle width="44" x="568" y="336" height="44"/>
+  </symbolStyle>
+  <symbolStyle id="126" name="parking-permissive">
+   <resourceStyle width="44" x="612" y="336" height="44"/>
+  </symbolStyle>
+  <symbolStyle id="127" name="speed_trap">
+   <resourceStyle width="40" x="656" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="128" name="traffic_signal">
+   <resourceStyle width="40" x="696" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="129" name="bank">
+   <resourceStyle width="40" x="736" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="130" name="windmill">
+   <resourceStyle width="40" x="776" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="131" name="roundabout_right">
+   <resourceStyle width="40" x="816" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="132" name="housenumber">
+   <resourceStyle width="40" x="856" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="133" name="mosque">
+   <resourceStyle width="40" x="896" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="134" name="parking_roof-permissive">
+   <resourceStyle width="40" x="936" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="135" name="embassy">
+   <resourceStyle width="40" x="976" y="336" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="136" name="drinking_water">
+   <resourceStyle width="40" x="0" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="137" name="doctor">
+   <resourceStyle width="40" x="40" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="138" name="roundabout_left">
+   <resourceStyle width="40" x="80" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="139" name="church">
+   <resourceStyle width="40" x="120" y="388" height="40"/>
+  </symbolStyle>
+  <symbolStyle id="140" name="power_photovoltaic">
+   <resourceStyle width="36" x="160" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="141" name="power_hydro">
+   <resourceStyle width="36" x="196" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="142" name="power_generic">
+   <resourceStyle width="36" x="232" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="143" name="power_wind">
+   <resourceStyle width="36" x="268" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="144" name="wastewater">
+   <resourceStyle width="36" x="304" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="145" name="viewpoint">
+   <resourceStyle width="36" x="340" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="146" name="lighthouse">
+   <resourceStyle width="36" x="376" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="147" name="bureau_de_change">
+   <resourceStyle width="36" x="412" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="148" name="cave_entrance">
+   <resourceStyle width="36" x="448" y="388" height="36"/>
+  </symbolStyle>
+  <symbolStyle id="149" name="car_sharing">
+   <resourceStyle width="36" x="484" y="388" height="34"/>
+  </symbolStyle>
+  <symbolStyle id="150" name="hotel_and_restaurant">
+   <resourceStyle width="30" x="520" y="388" height="30"/>
+  </symbolStyle>
+  <symbolStyle id="151" name="parking_roof_fee">
+   <resourceStyle width="52" x="550" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="152" name="parking_roof_fee-permissive">
+   <resourceStyle width="52" x="602" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="153" name="picnic">
+   <resourceStyle width="28" x="654" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="154" name="parking_fee">
+   <resourceStyle width="52" x="682" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="155" name="parking_fee-permissive">
+   <resourceStyle width="52" x="734" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="156" name="park_and_ride">
+   <resourceStyle width="52" x="786" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="157" name="park_and_ride-permissive">
+   <resourceStyle width="52" x="838" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="158" name="bench">
+   <resourceStyle width="28" x="890" y="388" height="28"/>
+  </symbolStyle>
+  <symbolStyle id="159" name="building">
+   <resourceStyle width="22" x="918" y="388" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="160" name="disused">
+   <resourceStyle width="22" x="940" y="388" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="161" name="vulcan">
+   <resourceStyle width="22" x="962" y="388" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="162" name="power-tower">
+   <resourceStyle width="22" x="984" y="388" height="22"/>
+  </symbolStyle>
+  <symbolStyle id="163" name="survey_point">
+   <resourceStyle width="20" x="0" y="428" height="20"/>
+  </symbolStyle>
+  <symbolStyle id="164" name="power-pole">
+   <resourceStyle width="14" x="20" y="428" height="14"/>
+  </symbolStyle>
+  <symbolStyle id="165" name="tree">
+   <resourceStyle width="12" x="34" y="428" height="12"/>
+  </symbolStyle>
+ </page>
+</skin>
diff --git a/data/resources-xxhdpi/symbols.png b/data/resources-xxhdpi/symbols.png
new file mode 100644
index 0000000000..815a95c321
--- /dev/null
+++ b/data/resources-xxhdpi/symbols.png