Add:xpm:New SVG files from sjjb.co.uk, adapted for Navit.|From #877; thanks themroc!

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@5023 ffa7fe5e-494d-0410-b361-a75ebd5db220

1 files changed, 149 insertions, 50 deletions

diff --git a/navit/navit_shipped.xml b/navit/navit_shipped.xml
index 9e413402e..5764360e7 100644
--- a/navit/navit_shipped.xml
+++ b/navit/navit_shipped.xml
@@ -1812,7 +1812,7 @@ Waypoint</text></img>
 					<icon src="parking.png"/>
 				</itemgra>
 				<itemgra item_types="poi_car_dealer_parts" order="12-">
-					<icon src="car_dealer.xpm"/>
+					<icon src="car_dealer.png"/>
 				</itemgra>
 				<itemgra item_types="poi_fuel" order="12-">
 					<icon src="fuel.png"/>
@@ -1848,7 +1848,7 @@ Waypoint</text></img>
 					<icon src="hospital.png"/>
 				</itemgra>
 				<itemgra item_types="poi_dining" order="12-">
-					<icon src="dining.xpm"/>
+					<icon src="restaurant.png"/>
 				</itemgra>
 				<itemgra item_types="poi_fastfood" order="12-">
 					<icon src="fastfood.png"/>
@@ -1860,7 +1860,7 @@ Waypoint</text></img>
 					<icon src="auto_club.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_autoservice" order="12-">
-					<icon src="car_dealer.xpm"/>
+					<icon src="car_dealer.png"/>
 				</itemgra>
 				<itemgra item_types="poi_bank" order="12-">
 					<icon src="bank.png"/>
@@ -1887,7 +1887,7 @@ Waypoint</text></img>
 					<icon src="bus.png"/>
 				</itemgra>
 				<itemgra item_types="poi_bus_stop" order="12-">
-					<icon src="bus.png"/>
+					<icon src="bus_stop.png"/>
 				</itemgra>
 				<itemgra item_types="poi_business_service" order="12-">
 					<icon src="bussines_service.xpm"/>
@@ -1907,6 +1907,39 @@ Waypoint</text></img>
 				<itemgra item_types="poi_church" order="11-">
 					<icon src="church.png"/>
 				</itemgra>
+				<itemgra item_types="poi_bahai" order="11-">
+					<icon src="bahai.png"/>
+				</itemgra>
+				<itemgra item_types="poi_buddhist" order="11-">
+					<icon src="buddhist.png"/>
+				</itemgra>
+				<itemgra item_types="poi_hindu" order="11-">
+					<icon src="hindu.png"/>
+				</itemgra>
+				<itemgra item_types="poi_islamic" order="11-">
+					<icon src="islamic.png"/>
+				</itemgra>
+				<itemgra item_types="poi_jain" order="11-">
+					<icon src="jain.png"/>
+				</itemgra>
+				<itemgra item_types="poi_jewish" order="11-">
+					<icon src="jewish.png"/>
+				</itemgra>
+				<itemgra item_types="poi_pagan" order="11-">
+					<icon src="pagan.png"/>
+				</itemgra>
+				<itemgra item_types="poi_pastafarian" order="11-">
+					<icon src="pastafarian.png"/>
+				</itemgra>
+				<itemgra item_types="poi_shinto" order="11-">
+					<icon src="shinto.png"/>
+				</itemgra>
+				<itemgra item_types="poi_sikh" order="11-">
+					<icon src="sikh.png"/>
+				</itemgra>
+				<itemgra item_types="poi_taoist" order="11-">
+					<icon src="taoist.png"/>
+				</itemgra>
 				<itemgra item_types="poi_cinema" order="12-">
 					<icon src="cinema.png"/>
 				</itemgra>
@@ -1992,7 +2025,7 @@ Waypoint</text></img>
 					<icon src="level_crossing.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_library" order="12-">
-					<icon src="library.xpm"/>
+					<icon src="library.png"/>
 				</itemgra>
 				<itemgra item_types="poi_locale" order="12-">
 					<icon src="locale.xpm"/>
@@ -2007,10 +2040,10 @@ Waypoint</text></img>
 					<icon src="manmade_feature.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_marine" order="12-">
-					<icon src="marine.xpm"/>
+					<icon src="marine.png"/>
 				</itemgra>
 				<itemgra item_types="poi_marine_type" order="12-">
-					<icon src="marine_type.xpm"/>
+					<icon src="marine_type.png"/>
 				</itemgra>
 				<itemgra item_types="poi_mark" order="12-">
 					<icon src="mark.png"/>
@@ -2133,7 +2166,7 @@ Waypoint</text></img>
 					<icon src="telephone.png"/>
 				</itemgra>
 				<itemgra item_types="poi_theater" order="12-">
-					<icon src="theater.xpm"/>
+					<icon src="theater.png"/>
 				</itemgra>
 				<itemgra item_types="poi_tide" order="12-">
 					<icon src="tide.xpm"/>
@@ -2142,7 +2175,7 @@ Waypoint</text></img>
 					<icon src="tower.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_townhall" order="12-">
-					<icon src="townhall.xpm"/>
+					<icon src="townhall.png"/>
 				</itemgra>
 				<itemgra item_types="poi_trail" order="12-">
 					<icon src="trail.xpm"/>
@@ -2166,7 +2199,7 @@ Waypoint</text></img>
 					<icon src="zoo.png"/>
 				</itemgra>
 				<itemgra item_types="poi_picnic" order="12-">
-					<icon src="picnic.xpm"/>
+					<icon src="picnic.png"/>
 				</itemgra>
 				<itemgra item_types="poi_gc_multi" order="12-">
 					<icon src="gc_multi.xpm"/>
@@ -2212,7 +2245,7 @@ Waypoint</text></img>
 					<icon src="boundary_stone.png"/>
 				</itemgra>
 				<itemgra item_types="poi_castle" order="11-">
-					<icon src="castle.xpm"/>
+					<icon src="castle.png"/>
 				</itemgra>
 				<itemgra item_types="poi_ruins" order="11-">
 					<icon src="ruins.png"/>
@@ -2221,19 +2254,19 @@ Waypoint</text></img>
 					<icon src="hunting_stand.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_memorial" order="12-">
-					<icon src="memorial.xpm"/>
+					<icon src="memorial.png"/>
 				</itemgra>
 				<itemgra item_types="poi_monument" order="12-">
-					<icon src="memorial.xpm"/>
+					<icon src="memorial.png"/>
 				</itemgra>
 				<itemgra item_types="poi_shelter" order="11-">
-					<icon src="shelter.xpm"/>
+					<icon src="shelter.png"/>
 				</itemgra>
 				<itemgra item_types="poi_fountain" order="13-">
 					<icon src="fountain.png"/>
 				</itemgra>
 				<itemgra item_types="poi_potable_water" order="13-">
-					<icon src="potable_water.xpm"/>
+					<icon src="drinking_water.png"/>
 				</itemgra>
 				<itemgra item_types="poi_toilets" order="12-">
 					<icon src="toilets.png"/>
@@ -2255,7 +2288,7 @@ Waypoint</text></img>
 				</itemgra>
 			</layer>
 			<layer name="POI Labels">
-				<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
+				<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
 					<circle color="#606060" radius="0" width="0" text_size="10"/>
 				</itemgra>
 				<itemgra item_types="poi_custom0,poi_custom1,poi_custom2,poi_custom3,poi_custom4,poi_custom5,poi_custom6,poi_custom7,poi_custom8,poi_custom9,poi_customa,poi_customb,poi_customc,poi_customd,poi_custome,poi_customf" order="14-">
@@ -3181,7 +3214,7 @@ Waypoint</text></img>
 					<icon src="parking.png"/>
 				</itemgra>
 				<itemgra item_types="poi_car_dealer_parts" order="0-">
-					<icon src="car_dealer.xpm"/>
+					<icon src="car_dealer.png"/>
 				</itemgra>
 				<itemgra item_types="poi_fuel" order="10-">
 					<icon src="fuel.png"/>
@@ -3223,7 +3256,7 @@ Waypoint</text></img>
 				</itemgra>
 				-->
 				<itemgra item_types="poi_dining" order="12-">
-					<icon src="dining.xpm"/>
+					<icon src="restaurant.png"/>
 				</itemgra>
 				<itemgra item_types="poi_fastfood" order="12-">
 					<icon src="fastfood.png"/>
@@ -3235,7 +3268,7 @@ Waypoint</text></img>
 					<icon src="auto_club.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_autoservice" order="0-">
-					<icon src="autoservice.xpm"/>
+					<icon src="car_dealer.png"/>
 				</itemgra>
 				<itemgra item_types="poi_bank" order="12-">
 					<icon src="bank.png"/>
@@ -3262,7 +3295,7 @@ Waypoint</text></img>
 					<icon src="bus.png"/>
 				</itemgra>
 				<itemgra item_types="poi_bus_stop" order="12-">
-					<icon src="bus.png"/>
+					<icon src="bus_stop.png"/>
 				</itemgra>
 				<itemgra item_types="poi_business_service" order="0-">
 					<icon src="bussines_service.xpm"/>
@@ -3282,6 +3315,39 @@ Waypoint</text></img>
 				<itemgra item_types="poi_church" order="11-">
 					<icon src="church.png"/>
 				</itemgra>
+				<itemgra item_types="poi_bahai" order="11-">
+					<icon src="bahai.png"/>
+				</itemgra>
+				<itemgra item_types="poi_buddhist" order="11-">
+					<icon src="buddhist.png"/>
+				</itemgra>
+				<itemgra item_types="poi_hindu" order="11-">
+					<icon src="hindu.png"/>
+				</itemgra>
+				<itemgra item_types="poi_islamic" order="11-">
+					<icon src="islamic.png"/>
+				</itemgra>
+				<itemgra item_types="poi_jain" order="11-">
+					<icon src="jain.png"/>
+				</itemgra>
+				<itemgra item_types="poi_jewish" order="11-">
+					<icon src="jewish.png"/>
+				</itemgra>
+				<itemgra item_types="poi_pagan" order="11-">
+					<icon src="pagan.png"/>
+				</itemgra>
+				<itemgra item_types="poi_pastafarian" order="11-">
+					<icon src="pastafarian.png"/>
+				</itemgra>
+				<itemgra item_types="poi_shinto" order="11-">
+					<icon src="shinto.png"/>
+				</itemgra>
+				<itemgra item_types="poi_sikh" order="11-">
+					<icon src="sikh.png"/>
+				</itemgra>
+				<itemgra item_types="poi_taoist" order="11-">
+					<icon src="taoist.png"/>
+				</itemgra>
 				<itemgra item_types="poi_cinema" order="12-">
 					<icon src="cinema.png"/>
 				</itemgra>
@@ -3367,7 +3433,7 @@ Waypoint</text></img>
 					<icon src="level_crossing.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_library" order="12-">
-					<icon src="library.xpm"/>
+					<icon src="library.png"/>
 				</itemgra>
 				<itemgra item_types="poi_locale" order="0-">
 					<icon src="locale.xpm"/>
@@ -3382,10 +3448,10 @@ Waypoint</text></img>
 					<icon src="manmade_feature.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_marine" order="0-">
-					<icon src="marine.xpm"/>
+					<icon src="marine.png"/>
 				</itemgra>
 				<itemgra item_types="poi_marine_type" order="0-">
-					<icon src="marine_type.xpm"/>
+					<icon src="marine_type.png"/>
 				</itemgra>
 				<itemgra item_types="poi_mark" order="0-">
 					<icon src="mark.png"/>
@@ -3508,7 +3574,7 @@ Waypoint</text></img>
 					<icon src="telephone.png"/>
 				</itemgra>
 				<itemgra item_types="poi_theater" order="12-">
-					<icon src="theater.xpm"/>
+					<icon src="theater.png"/>
 				</itemgra>
 				<itemgra item_types="poi_tide" order="0-">
 					<icon src="tide.xpm"/>
@@ -3517,7 +3583,7 @@ Waypoint</text></img>
 					<icon src="tower.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_townhall" order="12-">
-					<icon src="townhall.xpm"/>
+					<icon src="townhall.png"/>
 				</itemgra>
 				<itemgra item_types="poi_trail" order="0-">
 					<icon src="trail.xpm"/>
@@ -3544,7 +3610,7 @@ Waypoint</text></img>
 					<icon src="zoo.png"/>
 				</itemgra>
 				<itemgra item_types="poi_picnic" order="11-">
-					<icon src="picnic.xpm"/>
+					<icon src="picnic.png"/>
 				</itemgra>
 				<itemgra item_types="poi_gc_multi" order="0-">
 					<icon src="gc_multi.xpm"/>
@@ -3587,25 +3653,25 @@ Waypoint</text></img>
 					<icon src="boundary_stone.png"/>
 				</itemgra>
 				<itemgra item_types="poi_castle" order="12-">
-					<icon src="castle.xpm"/>
+					<icon src="castle.png"/>
 				</itemgra>
 				<itemgra item_types="poi_hunting_stand" order="13-">
 					<icon src="hunting_stand.xpm"/>
 				</itemgra>
 				<itemgra item_types="poi_memorial" order="12-">
-					<icon src="memorial.xpm"/>
+					<icon src="memorial.png"/>
 				</itemgra>
 				<itemgra item_types="poi_monument" order="12-">
-					<icon src="memorial.xpm"/>
+					<icon src="memorial.png"/>
 				</itemgra>
 				<itemgra item_types="poi_shelter" order="10-">
-					<icon src="shelter.xpm"/>
+					<icon src="shelter.png"/>
 				</itemgra>
 				<itemgra item_types="poi_fountain" order="12-">
 					<icon src="fountain.png"/>
 				</itemgra>
 				<itemgra item_types="poi_potable_water" order="12-">
-					<icon src="potable_water.xpm"/>
+					<icon src="drinking_water.png"/>
 				</itemgra>
 				<itemgra item_types="poi_toilets" order="12-">
 					<icon src="toilets.png"/>
@@ -3624,7 +3690,7 @@ Waypoint</text></img>
 				</itemgra>
 			</layer>
 			<layer name="POI Labels">
-				<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
+				<itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle" order="14-">
 					<circle color="#606060" radius="0" width="0" text_size="10"/>
 				</itemgra>
 			</layer>
@@ -4450,7 +4516,7 @@ Waypoint</text></img>
         </itemgra>
       </layer>
       <layer name="POI Labels" active="1">
-        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
+        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
         order="15-">
           <circle color="#606060" radius="0" width="0"
           text_size="10" />
@@ -4512,7 +4578,7 @@ Waypoint</text></img>
           <icon src="hospital.png" />
         </itemgra>
         <itemgra item_types="poi_dining" order="12-">
-          <icon src="dining.png" />
+          <icon src="restaurant.png"/>
         </itemgra>
         <itemgra item_types="poi_fastfood" order="12-">
           <icon src="fastfood.png" />
@@ -4551,7 +4617,7 @@ Waypoint</text></img>
           <icon src="bus.png" />
         </itemgra>
         <itemgra item_types="poi_bus_stop" order="12-">
-          <icon src="bus.png" />
+          <icon src="bus_stop.png" />
         </itemgra>
         <itemgra item_types="poi_business_service" order="12-">
           <icon src="bussines_service.png" />
@@ -4566,11 +4632,44 @@ Waypoint</text></img>
           <icon src="casino.png" />
         </itemgra>
         <itemgra item_types="poi_cemetery" order="12-">
-          <icon src="cemetery.png" />
+          <icon src="cemetery.xpm" />
         </itemgra>
         <itemgra item_types="poi_church" order="11-">
           <icon src="church.png" />
         </itemgra>
+				<itemgra item_types="poi_bahai" order="11-">
+					<icon src="bahai.png"/>
+				</itemgra>
+				<itemgra item_types="poi_buddhist" order="11-">
+					<icon src="buddhist.png"/>
+				</itemgra>
+				<itemgra item_types="poi_hindu" order="11-">
+					<icon src="hindu.png"/>
+				</itemgra>
+				<itemgra item_types="poi_islamic" order="11-">
+					<icon src="islamic.png"/>
+				</itemgra>
+				<itemgra item_types="poi_jain" order="11-">
+					<icon src="jain.png"/>
+				</itemgra>
+				<itemgra item_types="poi_jewish" order="11-">
+					<icon src="jewish.png"/>
+				</itemgra>
+				<itemgra item_types="poi_pagan" order="11-">
+					<icon src="pagan.png"/>
+				</itemgra>
+				<itemgra item_types="poi_pastafarian" order="11-">
+					<icon src="pastafarian.png"/>
+				</itemgra>
+				<itemgra item_types="poi_shinto" order="11-">
+					<icon src="shinto.png"/>
+				</itemgra>
+				<itemgra item_types="poi_sikh" order="11-">
+					<icon src="sikh.png"/>
+				</itemgra>
+				<itemgra item_types="poi_taoist" order="11-">
+					<icon src="taoist.png"/>
+				</itemgra>
         <itemgra item_types="poi_cinema" order="12-">
           <icon src="cinema.png" />
         </itemgra>
@@ -4653,7 +4752,7 @@ Waypoint</text></img>
           <icon src="levee.png" />
         </itemgra>
         <itemgra item_types="poi_level_crossing" order="11-">
-          <icon src="level_crossing.png" />
+          <icon src="level_crossing.xpm" />
         </itemgra>
         <itemgra item_types="poi_library" order="12-">
           <icon src="library.png" />
@@ -4738,7 +4837,7 @@ Waypoint</text></img>
           <icon src="restricted_area.png" />
         </itemgra>
         <itemgra item_types="poi_restroom" order="13-">
-          <icon src="restroom.png" />
+          <icon src="toilets.png"/>
         </itemgra>
         <itemgra item_types="poi_sailing" order="12-">
           <icon src="sailing.png" />
@@ -4807,7 +4906,7 @@ Waypoint</text></img>
           <icon src="tide.png" />
         </itemgra>
         <itemgra item_types="poi_tower" order="13-">
-          <icon src="tower.png" />
+          <icon src="tower.xpm" />
         </itemgra>
         <itemgra item_types="poi_townhall" order="12-">
           <icon src="townhall.png" />
@@ -4837,28 +4936,28 @@ Waypoint</text></img>
           <icon src="picnic.png" />
         </itemgra>
         <itemgra item_types="poi_gc_multi" order="12-">
-          <icon src="gc_multi.png" />
+          <icon src="gc_multi.xpm" />
         </itemgra>
         <itemgra item_types="poi_gc_tradi" order="12-">
-          <icon src="gc_tradi.png" />
+          <icon src="gc_tradi.xpm" />
         </itemgra>
         <itemgra item_types="poi_gc_event" order="12-">
-          <icon src="gc_event.png" />
+          <icon src="gc_event.xpm" />
         </itemgra>
         <itemgra item_types="poi_gc_mystery" order="12-">
-          <icon src="gc_mystery.png" />
+          <icon src="gc_mystery.xpm" />
         </itemgra>
         <itemgra item_types="poi_gc_question" order="12-">
-          <icon src="gc_question.png" />
+          <icon src="gc_question.xpm" />
         </itemgra>
         <itemgra item_types="poi_gc_stages" order="12-">
-          <icon src="gc_stages.png" />
+          <icon src="gc_stages.xpm" />
         </itemgra>
         <itemgra item_types="poi_gc_reference" order="12-">
-          <icon src="gc_reference.png" />
+          <icon src="gc_reference.xpm" />
         </itemgra>
         <itemgra item_types="poi_gc_webcam" order="12-">
-          <icon src="gc_webcam.png" />
+          <icon src="gc_webcam.xpm" />
         </itemgra>
         <itemgra item_types="traffic_signals" order="13-">
           <icon src="traffic_signals.png" />
@@ -4885,7 +4984,7 @@ Waypoint</text></img>
           <icon src="ruins.png" />
         </itemgra>
         <itemgra item_types="poi_hunting_stand" order="12-">
-          <icon src="hunting_stand.png" />
+          <icon src="hunting_stand.xpm" />
         </itemgra>
         <itemgra item_types="poi_memorial" order="12-">
           <icon src="memorial.png" />
@@ -4900,7 +4999,7 @@ Waypoint</text></img>
           <icon src="fountain.png" />
         </itemgra>
         <itemgra item_types="poi_potable_water" order="13-">
-          <icon src="potable_water.png" />
+          <icon src="drinking_water.png"/>
         </itemgra>
         <itemgra item_types="poi_toilets" order="12-">
           <icon src="toilets.png" />
@@ -4923,7 +5022,7 @@ Waypoint</text></img>
         </itemgra>
       </layer>
       <layer name="Android-POI-Labels-full" active="0">
-        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
+        <itemgra item_types="poi_airport,town_ghost,poi_hotel,poi_car_parking,poi_car_dealer_parts,poi_fuel,poi_shopping,poi_attraction,poi_cafe,poi_bar,poi_pub,highway_exit,poi_camp_rv,poi_museum_history,poi_hospital,poi_dining,poi_fastfood,poi_police,poi_autoservice,poi_bank,poi_atm,poi_bus_station,poi_bus_stop,poi_business_service,poi_car_rent,poi_church,poi_bahai,poi_buddhist,poi_hindu,poi_islamic,poi_jain,poi_jewish,poi_pagan,poi_pastafarian,poi_shinto,poi_sikh,poi_taoist,poi_cinema,poi_concert,poi_drinking_water,poi_emergency,poi_fair,poi_fish,poi_government_building,poi_hotspring,poi_information,poi_justice,poi_landmark,poi_library,poi_mall,poi_manmade_feature,poi_marine,poi_marine_type,poi_mark,poi_oil_field,poi_peak,poi_personal_service,poi_pharmacy,poi_post_office,poi_public_office,poi_rail_halt,poi_rail_station,poi_rail_tram_stop,poi_repair_service,poi_resort,poi_restaurant,poi_restricted_area,poi_sailing,poi_scenic_area,poi_school,poi_service,poi_shop_retail,poi_skiing,poi_social_service,poi_sport,poi_stadium,poi_swimming,poi_theater,poi_townhall,poi_trail,poi_truck_stop,poi_tunnel,poi_worship,poi_wrecker,poi_zoo,poi_biergarten,poi_castle,poi_ruins,poi_memorial,poi_monument,poi_shelter,poi_fountain,poi_viewpoint,vehicle"
         order="14-">
           <circle color="#606060" radius="0" width="0"
           text_size="10" />