diff --git a/README.md b/README.md
index 70b42526..ce1ee70a 100644
--- a/README.md
+++ b/README.md
@@ -63,7 +63,7 @@ GPXSee is licensed under GPL-3.0 (only). However, some 3rd party parts are using
 different, GPL compatible, licenses:
 
 * [Oxygen icons](icons/GUI) - LGPLv3
-* [Mapbox Maki icons](icons/IMG) - CC0
+* [Mapbox Maki icons](icons/IMG/POI) - CC0
 * [Map Icons Collection](icons/symbols) - CC BY SA 3.0
 * [RTree implementation](src/common/rtree.h) - Public domain
 * [Albers](src/map/proj/albersequal.cpp), [Geocentric](src/map/geocentric.cpp),
diff --git a/gpxsee.qrc b/gpxsee.qrc
index 6d233d5d..699c89a3 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -57,93 +57,93 @@
 
 	<!-- IMG map style -->
 	<qresource prefix="/IMG">
-		<file alias="airfield-11.png">icons/IMG/airfield-11.png</file>
-		<file alias="airport-11.png">icons/IMG/airport-11.png</file>
-		<file alias="amusement-park-11.png">icons/IMG/amusement-park-11.png</file>
-		<file alias="bakery-11.png">icons/IMG/bakery-11.png</file>
-		<file alias="bank-11.png">icons/IMG/bank-11.png</file>
-		<file alias="bar-11.png">icons/IMG/bar-11.png</file>
-		<file alias="bbq-11.png">icons/IMG/bbq-11.png</file>
-		<file alias="beach-11.png">icons/IMG/beach-11.png</file>
-		<file alias="bowling-alley-11.png">icons/IMG/bowling-alley-11.png</file>
-		<file alias="building-alt1-11.png">icons/IMG/building-alt1-11.png</file>
-		<file alias="bridge-11.png">icons/IMG/bridge-11.png</file>
-		<file alias="bus-11.png">icons/IMG/bus-11.png</file>
-		<file alias="cafe-11.png">icons/IMG/cafe-11.png</file>
-		<file alias="campsite-11.png">icons/IMG/campsite-11.png</file>
-		<file alias="car-11.png">icons/IMG/car-11.png</file>
-		<file alias="car-rental-11.png">icons/IMG/car-rental-11.png</file>
-		<file alias="car-repair-11.png">icons/IMG/car-repair-11.png</file>
-		<file alias="casino-11.png">icons/IMG/casino-11.png</file>
-		<file alias="cemetery-11.png">icons/IMG/cemetery-11.png</file>
-		<file alias="cinema-11.png">icons/IMG/cinema-11.png</file>
-		<file alias="clothing-store-11.png">icons/IMG/clothing-store-11.png</file>
-		<file alias="communications-tower-11.png">icons/IMG/communications-tower-11.png</file>
-		<file alias="convenience-11.png">icons/IMG/convenience-11.png</file>
-		<file alias="dam-11.png">icons/IMG/dam-11.png</file>
-		<file alias="danger-11.png">icons/IMG/danger-11.png</file>
-		<file alias="drinking-water-11.png">icons/IMG/drinking-water-11.png</file>
-		<file alias="fast-food-11.png">icons/IMG/fast-food-11.png</file>
-		<file alias="entrance-alt1-11.png">icons/IMG/entrance-alt1-11.png</file>
-		<file alias="fire-station-11.png">icons/IMG/fire-station-11.png</file>
-		<file alias="fitness-centre-11.png">icons/IMG/fitness-centre-11.png</file>
-		<file alias="fuel-11.png">icons/IMG/fuel-11.png</file>
-		<file alias="furniture-11.png">icons/IMG/furniture-11.png</file>
-		<file alias="garden-11.png">icons/IMG/garden-11.png</file>
-		<file alias="garden-centre-11.png">icons/IMG/garden-centre-11.png</file>
-		<file alias="golf-11.png">icons/IMG/golf-11.png</file>
-		<file alias="grocery-11.png">icons/IMG/grocery-11.png</file>
-		<file alias="hairdresser-11.png">icons/IMG/hairdresser-11.png</file>
-		<file alias="harbor-11.png">icons/IMG/harbor-11.png</file>
-		<file alias="hardware-11.png">icons/IMG/hardware-11.png</file>
-		<file alias="heliport-11.png">icons/IMG/heliport-11.png</file>
-		<file alias="hospital-11.png">icons/IMG/hospital-11.png</file>
-		<file alias="information-11.png">icons/IMG/information-11.png</file>
-		<file alias="landmark-11.png">icons/IMG/landmark-11.png</file>
-		<file alias="library-11.png">icons/IMG/library-11.png</file>
-		<file alias="lodging-11.png">icons/IMG/lodging-11.png</file>
-		<file alias="mountain-11.png">icons/IMG/mountain-11.png</file>
-		<file alias="museum-11.png">icons/IMG/museum-11.png</file>
-		<file alias="park-11.png">icons/IMG/park-11.png</file>
-		<file alias="parking-11.png">icons/IMG/parking-11.png</file>
-		<file alias="pharmacy-11.png">icons/IMG/pharmacy-11.png</file>
-		<file alias="picnic-site-11.png">icons/IMG/picnic-site-11.png</file>
-		<file alias="place-of-worship-11.png">icons/IMG/place-of-worship-11.png</file>
-		<file alias="police-11.png">icons/IMG/police-11.png</file>
-		<file alias="post-11.png">icons/IMG/post-11.png</file>
-		<file alias="religious-christian-11.png">icons/IMG/religious-christian-11.png</file>
-		<file alias="religious-jewish-11.png">icons/IMG/religious-jewish-11.png</file>
-		<file alias="religious-muslim-11.png">icons/IMG/religious-muslim-11.png</file>
-		<file alias="restaurant-11.png">icons/IMG/restaurant-11.png</file>
-		<file alias="restaurant-noodle-11.png">icons/IMG/restaurant-noodle-11.png</file>
-		<file alias="restaurant-pizza-11.png">icons/IMG/restaurant-pizza-11.png</file>
-		<file alias="restaurant-seafood-11.png">icons/IMG/restaurant-seafood-11.png</file>
-		<file alias="roadblock-11.png">icons/IMG/roadblock-11.png</file>
-		<file alias="school-11.png">icons/IMG/school-11.png</file>
-		<file alias="shelter-11.png">icons/IMG/shelter-11.png</file>
-		<file alias="shop-11.png">icons/IMG/shop-11.png</file>
-		<file alias="skiing-11.png">icons/IMG/skiing-11.png</file>
-		<file alias="soccer-11.png">icons/IMG/soccer-11.png</file>
-		<file alias="swimming-11.png">icons/IMG/swimming-11.png</file>
-		<file alias="theatre-11.png">icons/IMG/theatre-11.png</file>
-		<file alias="telephone-11.png">icons/IMG/telephone-11.png</file>
-		<file alias="toilet-11.png">icons/IMG/toilet-11.png</file>
-		<file alias="town-hall-11.png">icons/IMG/town-hall-11.png</file>
-		<file alias="viewpoint-11.png">icons/IMG/viewpoint-11.png</file>
-		<file alias="village-11.png">icons/IMG/village-11.png</file>
-		<file alias="waterfall-11.png">icons/IMG/waterfall-11.png</file>
-		<file alias="wetland-11.png">icons/IMG/wetland-11.png</file>
-		<file alias="zoo-11.png">icons/IMG/zoo-11.png</file>
+		<file alias="airfield-11.png">icons/IMG/POI/airfield-11.png</file>
+		<file alias="airport-11.png">icons/IMG/POI/airport-11.png</file>
+		<file alias="amusement-park-11.png">icons/IMG/POI/amusement-park-11.png</file>
+		<file alias="bakery-11.png">icons/IMG/POI/bakery-11.png</file>
+		<file alias="bank-11.png">icons/IMG/POI/bank-11.png</file>
+		<file alias="bar-11.png">icons/IMG/POI/bar-11.png</file>
+		<file alias="bbq-11.png">icons/IMG/POI/bbq-11.png</file>
+		<file alias="beach-11.png">icons/IMG/POI/beach-11.png</file>
+		<file alias="bowling-alley-11.png">icons/IMG/POI/bowling-alley-11.png</file>
+		<file alias="building-alt1-11.png">icons/IMG/POI/building-alt1-11.png</file>
+		<file alias="bridge-11.png">icons/IMG/POI/bridge-11.png</file>
+		<file alias="bus-11.png">icons/IMG/POI/bus-11.png</file>
+		<file alias="cafe-11.png">icons/IMG/POI/cafe-11.png</file>
+		<file alias="campsite-11.png">icons/IMG/POI/campsite-11.png</file>
+		<file alias="car-11.png">icons/IMG/POI/car-11.png</file>
+		<file alias="car-rental-11.png">icons/IMG/POI/car-rental-11.png</file>
+		<file alias="car-repair-11.png">icons/IMG/POI/car-repair-11.png</file>
+		<file alias="casino-11.png">icons/IMG/POI/casino-11.png</file>
+		<file alias="cemetery-11.png">icons/IMG/POI/cemetery-11.png</file>
+		<file alias="cinema-11.png">icons/IMG/POI/cinema-11.png</file>
+		<file alias="clothing-store-11.png">icons/IMG/POI/clothing-store-11.png</file>
+		<file alias="communications-tower-11.png">icons/IMG/POI/communications-tower-11.png</file>
+		<file alias="convenience-11.png">icons/IMG/POI/convenience-11.png</file>
+		<file alias="dam-11.png">icons/IMG/POI/dam-11.png</file>
+		<file alias="danger-11.png">icons/IMG/POI/danger-11.png</file>
+		<file alias="drinking-water-11.png">icons/IMG/POI/drinking-water-11.png</file>
+		<file alias="fast-food-11.png">icons/IMG/POI/fast-food-11.png</file>
+		<file alias="entrance-alt1-11.png">icons/IMG/POI/entrance-alt1-11.png</file>
+		<file alias="fire-station-11.png">icons/IMG/POI/fire-station-11.png</file>
+		<file alias="fitness-centre-11.png">icons/IMG/POI/fitness-centre-11.png</file>
+		<file alias="fuel-11.png">icons/IMG/POI/fuel-11.png</file>
+		<file alias="furniture-11.png">icons/IMG/POI/furniture-11.png</file>
+		<file alias="garden-11.png">icons/IMG/POI/garden-11.png</file>
+		<file alias="garden-centre-11.png">icons/IMG/POI/garden-centre-11.png</file>
+		<file alias="golf-11.png">icons/IMG/POI/golf-11.png</file>
+		<file alias="grocery-11.png">icons/IMG/POI/grocery-11.png</file>
+		<file alias="hairdresser-11.png">icons/IMG/POI/hairdresser-11.png</file>
+		<file alias="harbor-11.png">icons/IMG/POI/harbor-11.png</file>
+		<file alias="hardware-11.png">icons/IMG/POI/hardware-11.png</file>
+		<file alias="heliport-11.png">icons/IMG/POI/heliport-11.png</file>
+		<file alias="hospital-11.png">icons/IMG/POI/hospital-11.png</file>
+		<file alias="information-11.png">icons/IMG/POI/information-11.png</file>
+		<file alias="landmark-11.png">icons/IMG/POI/landmark-11.png</file>
+		<file alias="library-11.png">icons/IMG/POI/library-11.png</file>
+		<file alias="lodging-11.png">icons/IMG/POI/lodging-11.png</file>
+		<file alias="mountain-11.png">icons/IMG/POI/mountain-11.png</file>
+		<file alias="museum-11.png">icons/IMG/POI/museum-11.png</file>
+		<file alias="park-11.png">icons/IMG/POI/park-11.png</file>
+		<file alias="parking-11.png">icons/IMG/POI/parking-11.png</file>
+		<file alias="pharmacy-11.png">icons/IMG/POI/pharmacy-11.png</file>
+		<file alias="picnic-site-11.png">icons/IMG/POI/picnic-site-11.png</file>
+		<file alias="place-of-worship-11.png">icons/IMG/POI/place-of-worship-11.png</file>
+		<file alias="police-11.png">icons/IMG/POI/police-11.png</file>
+		<file alias="post-11.png">icons/IMG/POI/post-11.png</file>
+		<file alias="religious-christian-11.png">icons/IMG/POI/religious-christian-11.png</file>
+		<file alias="religious-jewish-11.png">icons/IMG/POI/religious-jewish-11.png</file>
+		<file alias="religious-muslim-11.png">icons/IMG/POI/religious-muslim-11.png</file>
+		<file alias="restaurant-11.png">icons/IMG/POI/restaurant-11.png</file>
+		<file alias="restaurant-noodle-11.png">icons/IMG/POI/restaurant-noodle-11.png</file>
+		<file alias="restaurant-pizza-11.png">icons/IMG/POI/restaurant-pizza-11.png</file>
+		<file alias="restaurant-seafood-11.png">icons/IMG/POI/restaurant-seafood-11.png</file>
+		<file alias="roadblock-11.png">icons/IMG/POI/roadblock-11.png</file>
+		<file alias="school-11.png">icons/IMG/POI/school-11.png</file>
+		<file alias="shelter-11.png">icons/IMG/POI/shelter-11.png</file>
+		<file alias="shop-11.png">icons/IMG/POI/shop-11.png</file>
+		<file alias="skiing-11.png">icons/IMG/POI/skiing-11.png</file>
+		<file alias="soccer-11.png">icons/IMG/POI/soccer-11.png</file>
+		<file alias="swimming-11.png">icons/IMG/POI/swimming-11.png</file>
+		<file alias="theatre-11.png">icons/IMG/POI/theatre-11.png</file>
+		<file alias="telephone-11.png">icons/IMG/POI/telephone-11.png</file>
+		<file alias="toilet-11.png">icons/IMG/POI/toilet-11.png</file>
+		<file alias="town-hall-11.png">icons/IMG/POI/town-hall-11.png</file>
+		<file alias="viewpoint-11.png">icons/IMG/POI/viewpoint-11.png</file>
+		<file alias="village-11.png">icons/IMG/POI/village-11.png</file>
+		<file alias="waterfall-11.png">icons/IMG/POI/waterfall-11.png</file>
+		<file alias="wetland-11.png">icons/IMG/POI/wetland-11.png</file>
+		<file alias="zoo-11.png">icons/IMG/POI/zoo-11.png</file>
 
-		<file alias="light-major.png">icons/IMG/light-major.png</file>
-		<file alias="light-platform.png">icons/IMG/light-platform.png</file>
-		<file alias="beacon.png">icons/IMG/beacon.png</file>
-		<file alias="rock.png">icons/IMG/rock.png</file>
-		<file alias="wreck.png">icons/IMG/wreck.png</file>
-		<file alias="obstruction.png">icons/IMG/obstruction.png</file>
-		<file alias="anchor-line.png">icons/IMG/anchor-line.png</file>
-		<file alias="pipeline.png">icons/IMG/pipeline.png</file>
-		<file alias="cable.png">icons/IMG/cable.png</file>
+		<file alias="light-major.png">icons/IMG/marine/light-major.png</file>
+		<file alias="light-platform.png">icons/IMG/marine/light-platform.png</file>
+		<file alias="beacon.png">icons/IMG/marine/beacon.png</file>
+		<file alias="rock.png">icons/IMG/marine/rock.png</file>
+		<file alias="wreck.png">icons/IMG/marine/wreck.png</file>
+		<file alias="obstruction.png">icons/IMG/marine/obstruction.png</file>
+		<file alias="anchor-line.png">icons/IMG/marine/anchor-line.png</file>
+		<file alias="pipeline.png">icons/IMG/marine/pipeline.png</file>
+		<file alias="cable.png">icons/IMG/marine/cable.png</file>
 	</qresource>
 
 	<!-- Mapsforge rendertheme -->
diff --git a/icons/IMG/airfield-11.png b/icons/IMG/POI/airfield-11.png
similarity index 100%
rename from icons/IMG/airfield-11.png
rename to icons/IMG/POI/airfield-11.png
diff --git a/icons/IMG/airport-11.png b/icons/IMG/POI/airport-11.png
similarity index 100%
rename from icons/IMG/airport-11.png
rename to icons/IMG/POI/airport-11.png
diff --git a/icons/IMG/amusement-park-11.png b/icons/IMG/POI/amusement-park-11.png
similarity index 100%
rename from icons/IMG/amusement-park-11.png
rename to icons/IMG/POI/amusement-park-11.png
diff --git a/icons/IMG/bakery-11.png b/icons/IMG/POI/bakery-11.png
similarity index 100%
rename from icons/IMG/bakery-11.png
rename to icons/IMG/POI/bakery-11.png
diff --git a/icons/IMG/bank-11.png b/icons/IMG/POI/bank-11.png
similarity index 100%
rename from icons/IMG/bank-11.png
rename to icons/IMG/POI/bank-11.png
diff --git a/icons/IMG/bar-11.png b/icons/IMG/POI/bar-11.png
similarity index 100%
rename from icons/IMG/bar-11.png
rename to icons/IMG/POI/bar-11.png
diff --git a/icons/IMG/bbq-11.png b/icons/IMG/POI/bbq-11.png
similarity index 100%
rename from icons/IMG/bbq-11.png
rename to icons/IMG/POI/bbq-11.png
diff --git a/icons/IMG/beach-11.png b/icons/IMG/POI/beach-11.png
similarity index 100%
rename from icons/IMG/beach-11.png
rename to icons/IMG/POI/beach-11.png
diff --git a/icons/IMG/bowling-alley-11.png b/icons/IMG/POI/bowling-alley-11.png
similarity index 100%
rename from icons/IMG/bowling-alley-11.png
rename to icons/IMG/POI/bowling-alley-11.png
diff --git a/icons/IMG/bridge-11.png b/icons/IMG/POI/bridge-11.png
similarity index 100%
rename from icons/IMG/bridge-11.png
rename to icons/IMG/POI/bridge-11.png
diff --git a/icons/IMG/building-alt1-11.png b/icons/IMG/POI/building-alt1-11.png
similarity index 100%
rename from icons/IMG/building-alt1-11.png
rename to icons/IMG/POI/building-alt1-11.png
diff --git a/icons/IMG/bus-11.png b/icons/IMG/POI/bus-11.png
similarity index 100%
rename from icons/IMG/bus-11.png
rename to icons/IMG/POI/bus-11.png
diff --git a/icons/IMG/cafe-11.png b/icons/IMG/POI/cafe-11.png
similarity index 100%
rename from icons/IMG/cafe-11.png
rename to icons/IMG/POI/cafe-11.png
diff --git a/icons/IMG/campsite-11.png b/icons/IMG/POI/campsite-11.png
similarity index 100%
rename from icons/IMG/campsite-11.png
rename to icons/IMG/POI/campsite-11.png
diff --git a/icons/IMG/car-11.png b/icons/IMG/POI/car-11.png
similarity index 100%
rename from icons/IMG/car-11.png
rename to icons/IMG/POI/car-11.png
diff --git a/icons/IMG/car-rental-11.png b/icons/IMG/POI/car-rental-11.png
similarity index 100%
rename from icons/IMG/car-rental-11.png
rename to icons/IMG/POI/car-rental-11.png
diff --git a/icons/IMG/car-repair-11.png b/icons/IMG/POI/car-repair-11.png
similarity index 100%
rename from icons/IMG/car-repair-11.png
rename to icons/IMG/POI/car-repair-11.png
diff --git a/icons/IMG/casino-11.png b/icons/IMG/POI/casino-11.png
similarity index 100%
rename from icons/IMG/casino-11.png
rename to icons/IMG/POI/casino-11.png
diff --git a/icons/IMG/cemetery-11.png b/icons/IMG/POI/cemetery-11.png
similarity index 100%
rename from icons/IMG/cemetery-11.png
rename to icons/IMG/POI/cemetery-11.png
diff --git a/icons/IMG/cinema-11.png b/icons/IMG/POI/cinema-11.png
similarity index 100%
rename from icons/IMG/cinema-11.png
rename to icons/IMG/POI/cinema-11.png
diff --git a/icons/IMG/clothing-store-11.png b/icons/IMG/POI/clothing-store-11.png
similarity index 100%
rename from icons/IMG/clothing-store-11.png
rename to icons/IMG/POI/clothing-store-11.png
diff --git a/icons/IMG/communications-tower-11.png b/icons/IMG/POI/communications-tower-11.png
similarity index 100%
rename from icons/IMG/communications-tower-11.png
rename to icons/IMG/POI/communications-tower-11.png
diff --git a/icons/IMG/convenience-11.png b/icons/IMG/POI/convenience-11.png
similarity index 100%
rename from icons/IMG/convenience-11.png
rename to icons/IMG/POI/convenience-11.png
diff --git a/icons/IMG/dam-11.png b/icons/IMG/POI/dam-11.png
similarity index 100%
rename from icons/IMG/dam-11.png
rename to icons/IMG/POI/dam-11.png
diff --git a/icons/IMG/danger-11.png b/icons/IMG/POI/danger-11.png
similarity index 100%
rename from icons/IMG/danger-11.png
rename to icons/IMG/POI/danger-11.png
diff --git a/icons/IMG/drinking-water-11.png b/icons/IMG/POI/drinking-water-11.png
similarity index 100%
rename from icons/IMG/drinking-water-11.png
rename to icons/IMG/POI/drinking-water-11.png
diff --git a/icons/IMG/entrance-alt1-11.png b/icons/IMG/POI/entrance-alt1-11.png
similarity index 100%
rename from icons/IMG/entrance-alt1-11.png
rename to icons/IMG/POI/entrance-alt1-11.png
diff --git a/icons/IMG/fast-food-11.png b/icons/IMG/POI/fast-food-11.png
similarity index 100%
rename from icons/IMG/fast-food-11.png
rename to icons/IMG/POI/fast-food-11.png
diff --git a/icons/IMG/fire-station-11.png b/icons/IMG/POI/fire-station-11.png
similarity index 100%
rename from icons/IMG/fire-station-11.png
rename to icons/IMG/POI/fire-station-11.png
diff --git a/icons/IMG/fitness-centre-11.png b/icons/IMG/POI/fitness-centre-11.png
similarity index 100%
rename from icons/IMG/fitness-centre-11.png
rename to icons/IMG/POI/fitness-centre-11.png
diff --git a/icons/IMG/fuel-11.png b/icons/IMG/POI/fuel-11.png
similarity index 100%
rename from icons/IMG/fuel-11.png
rename to icons/IMG/POI/fuel-11.png
diff --git a/icons/IMG/furniture-11.png b/icons/IMG/POI/furniture-11.png
similarity index 100%
rename from icons/IMG/furniture-11.png
rename to icons/IMG/POI/furniture-11.png
diff --git a/icons/IMG/garden-11.png b/icons/IMG/POI/garden-11.png
similarity index 100%
rename from icons/IMG/garden-11.png
rename to icons/IMG/POI/garden-11.png
diff --git a/icons/IMG/garden-centre-11.png b/icons/IMG/POI/garden-centre-11.png
similarity index 100%
rename from icons/IMG/garden-centre-11.png
rename to icons/IMG/POI/garden-centre-11.png
diff --git a/icons/IMG/golf-11.png b/icons/IMG/POI/golf-11.png
similarity index 100%
rename from icons/IMG/golf-11.png
rename to icons/IMG/POI/golf-11.png
diff --git a/icons/IMG/grocery-11.png b/icons/IMG/POI/grocery-11.png
similarity index 100%
rename from icons/IMG/grocery-11.png
rename to icons/IMG/POI/grocery-11.png
diff --git a/icons/IMG/hairdresser-11.png b/icons/IMG/POI/hairdresser-11.png
similarity index 100%
rename from icons/IMG/hairdresser-11.png
rename to icons/IMG/POI/hairdresser-11.png
diff --git a/icons/IMG/harbor-11.png b/icons/IMG/POI/harbor-11.png
similarity index 100%
rename from icons/IMG/harbor-11.png
rename to icons/IMG/POI/harbor-11.png
diff --git a/icons/IMG/hardware-11.png b/icons/IMG/POI/hardware-11.png
similarity index 100%
rename from icons/IMG/hardware-11.png
rename to icons/IMG/POI/hardware-11.png
diff --git a/icons/IMG/heliport-11.png b/icons/IMG/POI/heliport-11.png
similarity index 100%
rename from icons/IMG/heliport-11.png
rename to icons/IMG/POI/heliport-11.png
diff --git a/icons/IMG/hospital-11.png b/icons/IMG/POI/hospital-11.png
similarity index 100%
rename from icons/IMG/hospital-11.png
rename to icons/IMG/POI/hospital-11.png
diff --git a/icons/IMG/information-11.png b/icons/IMG/POI/information-11.png
similarity index 100%
rename from icons/IMG/information-11.png
rename to icons/IMG/POI/information-11.png
diff --git a/icons/IMG/landmark-11.png b/icons/IMG/POI/landmark-11.png
similarity index 100%
rename from icons/IMG/landmark-11.png
rename to icons/IMG/POI/landmark-11.png
diff --git a/icons/IMG/library-11.png b/icons/IMG/POI/library-11.png
similarity index 100%
rename from icons/IMG/library-11.png
rename to icons/IMG/POI/library-11.png
diff --git a/icons/IMG/licence.txt b/icons/IMG/POI/licence.txt
similarity index 100%
rename from icons/IMG/licence.txt
rename to icons/IMG/POI/licence.txt
diff --git a/icons/IMG/lodging-11.png b/icons/IMG/POI/lodging-11.png
similarity index 100%
rename from icons/IMG/lodging-11.png
rename to icons/IMG/POI/lodging-11.png
diff --git a/icons/IMG/mountain-11.png b/icons/IMG/POI/mountain-11.png
similarity index 100%
rename from icons/IMG/mountain-11.png
rename to icons/IMG/POI/mountain-11.png
diff --git a/icons/IMG/museum-11.png b/icons/IMG/POI/museum-11.png
similarity index 100%
rename from icons/IMG/museum-11.png
rename to icons/IMG/POI/museum-11.png
diff --git a/icons/IMG/park-11.png b/icons/IMG/POI/park-11.png
similarity index 100%
rename from icons/IMG/park-11.png
rename to icons/IMG/POI/park-11.png
diff --git a/icons/IMG/parking-11.png b/icons/IMG/POI/parking-11.png
similarity index 100%
rename from icons/IMG/parking-11.png
rename to icons/IMG/POI/parking-11.png
diff --git a/icons/IMG/pharmacy-11.png b/icons/IMG/POI/pharmacy-11.png
similarity index 100%
rename from icons/IMG/pharmacy-11.png
rename to icons/IMG/POI/pharmacy-11.png
diff --git a/icons/IMG/picnic-site-11.png b/icons/IMG/POI/picnic-site-11.png
similarity index 100%
rename from icons/IMG/picnic-site-11.png
rename to icons/IMG/POI/picnic-site-11.png
diff --git a/icons/IMG/place-of-worship-11.png b/icons/IMG/POI/place-of-worship-11.png
similarity index 100%
rename from icons/IMG/place-of-worship-11.png
rename to icons/IMG/POI/place-of-worship-11.png
diff --git a/icons/IMG/police-11.png b/icons/IMG/POI/police-11.png
similarity index 100%
rename from icons/IMG/police-11.png
rename to icons/IMG/POI/police-11.png
diff --git a/icons/IMG/post-11.png b/icons/IMG/POI/post-11.png
similarity index 100%
rename from icons/IMG/post-11.png
rename to icons/IMG/POI/post-11.png
diff --git a/icons/IMG/religious-christian-11.png b/icons/IMG/POI/religious-christian-11.png
similarity index 100%
rename from icons/IMG/religious-christian-11.png
rename to icons/IMG/POI/religious-christian-11.png
diff --git a/icons/IMG/religious-jewish-11.png b/icons/IMG/POI/religious-jewish-11.png
similarity index 100%
rename from icons/IMG/religious-jewish-11.png
rename to icons/IMG/POI/religious-jewish-11.png
diff --git a/icons/IMG/religious-muslim-11.png b/icons/IMG/POI/religious-muslim-11.png
similarity index 100%
rename from icons/IMG/religious-muslim-11.png
rename to icons/IMG/POI/religious-muslim-11.png
diff --git a/icons/IMG/restaurant-11.png b/icons/IMG/POI/restaurant-11.png
similarity index 100%
rename from icons/IMG/restaurant-11.png
rename to icons/IMG/POI/restaurant-11.png
diff --git a/icons/IMG/restaurant-noodle-11.png b/icons/IMG/POI/restaurant-noodle-11.png
similarity index 100%
rename from icons/IMG/restaurant-noodle-11.png
rename to icons/IMG/POI/restaurant-noodle-11.png
diff --git a/icons/IMG/restaurant-pizza-11.png b/icons/IMG/POI/restaurant-pizza-11.png
similarity index 100%
rename from icons/IMG/restaurant-pizza-11.png
rename to icons/IMG/POI/restaurant-pizza-11.png
diff --git a/icons/IMG/restaurant-seafood-11.png b/icons/IMG/POI/restaurant-seafood-11.png
similarity index 100%
rename from icons/IMG/restaurant-seafood-11.png
rename to icons/IMG/POI/restaurant-seafood-11.png
diff --git a/icons/IMG/roadblock-11.png b/icons/IMG/POI/roadblock-11.png
similarity index 100%
rename from icons/IMG/roadblock-11.png
rename to icons/IMG/POI/roadblock-11.png
diff --git a/icons/IMG/school-11.png b/icons/IMG/POI/school-11.png
similarity index 100%
rename from icons/IMG/school-11.png
rename to icons/IMG/POI/school-11.png
diff --git a/icons/IMG/shelter-11.png b/icons/IMG/POI/shelter-11.png
similarity index 100%
rename from icons/IMG/shelter-11.png
rename to icons/IMG/POI/shelter-11.png
diff --git a/icons/IMG/shop-11.png b/icons/IMG/POI/shop-11.png
similarity index 100%
rename from icons/IMG/shop-11.png
rename to icons/IMG/POI/shop-11.png
diff --git a/icons/IMG/skiing-11.png b/icons/IMG/POI/skiing-11.png
similarity index 100%
rename from icons/IMG/skiing-11.png
rename to icons/IMG/POI/skiing-11.png
diff --git a/icons/IMG/soccer-11.png b/icons/IMG/POI/soccer-11.png
similarity index 100%
rename from icons/IMG/soccer-11.png
rename to icons/IMG/POI/soccer-11.png
diff --git a/icons/IMG/swimming-11.png b/icons/IMG/POI/swimming-11.png
similarity index 100%
rename from icons/IMG/swimming-11.png
rename to icons/IMG/POI/swimming-11.png
diff --git a/icons/IMG/telephone-11.png b/icons/IMG/POI/telephone-11.png
similarity index 100%
rename from icons/IMG/telephone-11.png
rename to icons/IMG/POI/telephone-11.png
diff --git a/icons/IMG/theatre-11.png b/icons/IMG/POI/theatre-11.png
similarity index 100%
rename from icons/IMG/theatre-11.png
rename to icons/IMG/POI/theatre-11.png
diff --git a/icons/IMG/toilet-11.png b/icons/IMG/POI/toilet-11.png
similarity index 100%
rename from icons/IMG/toilet-11.png
rename to icons/IMG/POI/toilet-11.png
diff --git a/icons/IMG/town-hall-11.png b/icons/IMG/POI/town-hall-11.png
similarity index 100%
rename from icons/IMG/town-hall-11.png
rename to icons/IMG/POI/town-hall-11.png
diff --git a/icons/IMG/viewpoint-11.png b/icons/IMG/POI/viewpoint-11.png
similarity index 100%
rename from icons/IMG/viewpoint-11.png
rename to icons/IMG/POI/viewpoint-11.png
diff --git a/icons/IMG/village-11.png b/icons/IMG/POI/village-11.png
similarity index 100%
rename from icons/IMG/village-11.png
rename to icons/IMG/POI/village-11.png
diff --git a/icons/IMG/waterfall-11.png b/icons/IMG/POI/waterfall-11.png
similarity index 100%
rename from icons/IMG/waterfall-11.png
rename to icons/IMG/POI/waterfall-11.png
diff --git a/icons/IMG/wetland-11.png b/icons/IMG/POI/wetland-11.png
similarity index 100%
rename from icons/IMG/wetland-11.png
rename to icons/IMG/POI/wetland-11.png
diff --git a/icons/IMG/zoo-11.png b/icons/IMG/POI/zoo-11.png
similarity index 100%
rename from icons/IMG/zoo-11.png
rename to icons/IMG/POI/zoo-11.png
diff --git a/icons/IMG/anchor-line.png b/icons/IMG/marine/anchor-line.png
similarity index 100%
rename from icons/IMG/anchor-line.png
rename to icons/IMG/marine/anchor-line.png
diff --git a/icons/IMG/beacon.png b/icons/IMG/marine/beacon.png
similarity index 100%
rename from icons/IMG/beacon.png
rename to icons/IMG/marine/beacon.png
diff --git a/icons/IMG/cable.png b/icons/IMG/marine/cable.png
similarity index 100%
rename from icons/IMG/cable.png
rename to icons/IMG/marine/cable.png
diff --git a/icons/IMG/light-major.png b/icons/IMG/marine/light-major.png
similarity index 100%
rename from icons/IMG/light-major.png
rename to icons/IMG/marine/light-major.png
diff --git a/icons/IMG/light-platform.png b/icons/IMG/marine/light-platform.png
similarity index 100%
rename from icons/IMG/light-platform.png
rename to icons/IMG/marine/light-platform.png
diff --git a/icons/IMG/obstruction.png b/icons/IMG/marine/obstruction.png
similarity index 100%
rename from icons/IMG/obstruction.png
rename to icons/IMG/marine/obstruction.png
diff --git a/icons/IMG/pipeline.png b/icons/IMG/marine/pipeline.png
similarity index 100%
rename from icons/IMG/pipeline.png
rename to icons/IMG/marine/pipeline.png
diff --git a/icons/IMG/rock.png b/icons/IMG/marine/rock.png
similarity index 100%
rename from icons/IMG/rock.png
rename to icons/IMG/marine/rock.png
diff --git a/icons/IMG/wreck.png b/icons/IMG/marine/wreck.png
similarity index 100%
rename from icons/IMG/wreck.png
rename to icons/IMG/marine/wreck.png