diff --git a/data/style/style.xml b/data/style/style.xml
index 4cd794ec..39f039b2 100644
--- a/data/style/style.xml
+++ b/data/style/style.xml
@@ -167,7 +167,7 @@
     </rule>
     <rule e="way" closed="yes" k="amenity" v="parking" zoom-min="10">
         <area fill="#ffffff" stroke="#d5cdc0" stroke-width="0.1"/>
-        <rule e="way" k="*" v="*" zoom-min="16">
+        <rule e="way" k="*" v="*" zoom-min="17">
             <symbol id="parking" src=":/POI/parking-11.svg" symbol-width="11"/>
         </rule>
     </rule>
@@ -350,7 +350,7 @@
             <line stroke="#ffffff" stroke-width="0.4"/>
         </rule>
     </rule>
-    <rule e="way" k="highway" v="tertiary|tertiary_link|residential|living_street">
+    <rule e="way" k="highway" v="tertiary|tertiary_link|residential|living_street|raceway">
         <rule e="way" k="*" v="*" zoom-min="13" zoom-max="13">
             <line stroke="#d5cdc0" stroke-width="1.5"/>
             <line stroke="#ffffff" stroke-width="0.75"/>
@@ -528,7 +528,7 @@
     </rule>
 
     <!-- Town & vilage names -->
-    <rule e="node" k="place" v="locality" zoom-min="14">
+    <rule e="node" k="place" v="locality|isolated_dwelling|farm" zoom-min="14">
         <caption fill="#000000" font-size="10" k="name" priority="10" stroke="#FFFFFF" stroke-width="2"/>
     </rule>
     <rule e="node" k="place" v="hamlet" zoom-min="12">
@@ -576,7 +576,7 @@
             </rule>
         </rule>
     </rule>
-    <rule e="node" k="natural" v="spring|hot_spring" zoom-min="15">
+    <rule e="node" k="natural" v="spring" zoom-min="15">
         <rule e="any" k="name" v="*">
             <symbol id="spring" src=":/POI/water-11.svg" symbol-width="11" priority="7"/>
             <rule e="any" k="*" v="*" zoom-min="16">
@@ -584,6 +584,14 @@
             </rule>
         </rule>
     </rule>
+    <rule e="node" k="natural" v="hot_spring|geyser" zoom-min="15">
+        <rule e="any" k="name" v="*">
+            <symbol id="hot-spring" src=":/POI/hot-spring.svg" symbol-width="11" priority="7"/>
+            <rule e="any" k="*" v="*" zoom-min="16">
+                <caption fill="#000000" font-size="10" font-family="serif" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="hot-spring"/>
+            </rule>
+        </rule>
+    </rule>
     <rule e="node" k="tourism" v="viewpoint" zoom-min="15">
         <rule e="node" k="name" v="*">
             <symbol id="viewpoint" src=":/POI/viewpoint-11.svg" symbol-width="11"/>
@@ -686,10 +694,10 @@
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="shelter"/>
         </rule>
     </rule>
-    <rule e="any" k="tourism|building" v="alpine_hut" zoom-min="16">
-        <symbol id="lodging" src=":/POI/lodging-11.svg" symbol-width="11"/>
-        <rule e="any" k="*" v="*" zoom-min="17">
-            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="lodging"/>
+    <rule e="any" k="tourism|building" v="alpine_hut" zoom-min="15">
+        <symbol id="alpine_hut" src=":/POI/home-11.svg" symbol-width="11" priority="5"/>
+        <rule e="any" k="*" v="*" zoom-min="16">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="alpine_hut"/>
         </rule>
     </rule>
     <rule e="any" k="tourism|building" v="hotel|hostel|guest_house|chalet|motel" zoom-min="17">
@@ -805,6 +813,34 @@
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="embassy"/>
         </rule>
     </rule>
+    <rule e="any" k="leisure" v="stadium" zoom-min="16">
+        <symbol id="stadium" src=":/POI/stadium-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="stadium"/>
+        </rule>
+    </rule>
+    <rule e="any" k="tourism" v="zoo" zoom-min="16">
+        <symbol id="zoo" src=":/POI/zoo-11.svg" symbol-width="11"/>
+        <rule e="any" k="*" v="*" zoom-min="17">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="zoo"/>
+        </rule>
+    </rule>
+    <rule e="any" k="leisure" v="park" zoom-min="16">
+        <rule e="any" k="name" v="*">
+            <symbol id="park" src=":/POI/park-11.svg" symbol-width="11"/>
+            <rule e="any" k="*" v="*" zoom-min="17">
+                <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="park"/>
+            </rule>
+        </rule>
+    </rule>
+    <rule e="any" k="leisure" v="garden" zoom-min="16">
+        <rule e="any" k="name" v="*">
+            <symbol id="garden" src=":/POI/garden-11.svg" symbol-width="11"/>
+            <rule e="any" k="*" v="*" zoom-min="17">
+                <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="garden"/>
+            </rule>
+        </rule>
+    </rule>
 
     <rule e="any" k="sport" v="swimming" zoom-min="16">
         <symbol id="swimming" src=":/POI/swimming-11.svg" symbol-width="11"/>
@@ -812,7 +848,7 @@
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="swimming"/>
         </rule>
     </rule>
-    <rule e="any" k="sport" v="golf" zoom-min="17">
+    <rule e="any" k="sport|leisure" v="golf|golf_course" zoom-min="17">
         <symbol id="golf" src=":/POI/golf-11.svg" symbol-width="11"/>
         <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="golf"/>
     </rule>
@@ -918,5 +954,23 @@
             <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="alcohol"/>
         </rule>
     </rule>
+    <rule e="any" k="shop" v="travel_agency" zoom-min="17">
+        <symbol id="travel-agency" src=":/POI/beach-11.svg" symbol-width="11" priority="-5"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="travel-agency"/>
+        </rule>
+    </rule>
+    <rule e="any" k="shop" v="laundry" zoom-min="17">
+        <symbol id="laundry" src=":/POI/laundry-11.svg" symbol-width="11" priority="-5"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="laundry"/>
+        </rule>
+    </rule>
+    <rule e="any" k="shop" v="butcher" zoom-min="17">
+        <symbol id="butcher" src=":/POI/slaughterhouse-11.svg" symbol-width="11" priority="-5"/>
+        <rule e="any" k="*" v="*" zoom-min="18">
+            <caption fill="#000000" font-size="10" font-style="italic" k="name" stroke="#FFFFFF" stroke-width="2" symbol-id="butcher"/>
+        </rule>
+    </rule>
 
 </rendertheme>
diff --git a/gpxsee.qrc b/gpxsee.qrc
index 6082e41d..c1717c44 100644
--- a/gpxsee.qrc
+++ b/gpxsee.qrc
@@ -64,9 +64,12 @@
 		<file alias="harbor-11.svg">icons/map/POI/harbor-11.svg</file>
 		<file alias="hardware-11.svg">icons/map/POI/hardware-11.svg</file>
 		<file alias="heliport-11.svg">icons/map/POI/heliport-11.svg</file>
+		<file alias="home-11.svg">icons/map/POI/home-11.svg</file>
 		<file alias="hospital-11.svg">icons/map/POI/hospital-11.svg</file>
+		<file alias="hot-spring.svg">icons/map/POI/hot-spring.svg</file>
 		<file alias="information-11.svg">icons/map/POI/information-11.svg</file>
 		<file alias="landmark-11.svg">icons/map/POI/landmark-11.svg</file>
+		<file alias="laundry-11.svg">icons/map/POI/laundry-11.svg</file>
 		<file alias="library-11.svg">icons/map/POI/library-11.svg</file>
 		<file alias="lighthouse-11.svg">icons/map/POI/lighthouse-11.svg</file>
 		<file alias="lodging-11.svg">icons/map/POI/lodging-11.svg</file>
@@ -97,7 +100,9 @@
 		<file alias="shop-11.svg">icons/map/POI/shop-11.svg</file>
 		<file alias="skateboard-11.svg">icons/map/POI/skateboard-11.svg</file>
 		<file alias="skiing-11.svg">icons/map/POI/skiing-11.svg</file>
+		<file alias="slaughterhouse-11.svg">icons/map/POI/slaughterhouse-11.svg</file>
 		<file alias="soccer-11.svg">icons/map/POI/soccer-11.svg</file>
+		<file alias="stadium-11.svg">icons/map/POI/stadium-11.svg</file>
 		<file alias="swimming-11.svg">icons/map/POI/swimming-11.svg</file>
 		<file alias="telephone-11.svg">icons/map/POI/telephone-11.svg</file>
 		<file alias="tennis-11.svg">icons/map/POI/tennis-11.svg</file>
diff --git a/icons/map/POI/home-11.svg b/icons/map/POI/home-11.svg
new file mode 100644
index 00000000..40722537
--- /dev/null
+++ b/icons/map/POI/home-11.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11" id="home-11">
+  <path d="M10.0015,4.7507c0,0.13807-0.11193,0.25-0.25,0.25H1.25c-0.13807,0-0.25-0.11193-0.25-0.25&#xA;&#x9;c-0.00054-0.07163,0.02839-0.14033,0.08-0.19l4.2378-3.4545l0.016-0.016c0.10112-0.09209,0.2577-0.08493,0.35,0.016l2.3174,1.8892&#xA;&#x9;V1.5c0-0.27614,0.22386-0.5,0.5-0.5s0.5,0.22386,0.5,0.5v2.31l0.92,0.75C9.9731,4.60979,10.00215,4.67878,10.0015,4.7507z M2,9.7514&#xA;&#x9;c-0.00111,0.13696,0.10902,0.24889,0.24598,0.25c0.00001,0,0.00001,0,0.00002,0h2.7547v-2h1v2h2.7526&#xA;&#x9;c0.13697,0,0.248-0.11103,0.248-0.248l0,0l0,0V6.0009H2V9.7514z"/>
+</svg>
\ No newline at end of file
diff --git a/icons/map/POI/hot-spring.svg b/icons/map/POI/hot-spring.svg
new file mode 100644
index 00000000..ee061d1a
--- /dev/null
+++ b/icons/map/POI/hot-spring.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="hot-spring" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 15 15">
+  <path d="M6.682,5.759c-.505-.725-.781-1.121-.63-2.376,.139-1.156,.678-1.616,1.198-2.059,.404-.345,.797-.68,.981-1.324,.301,.722-.036,1.47-.349,2.164-.311,.691-.599,1.329-.211,1.836,.971,1.271,1.963,2.88,.971,4.586-.214,.393-.539,.681-.861,.968-.422,.375-.841,.747-1.004,1.348-.269-.677,.008-1.366,.285-2.052,.306-.759,.61-1.516,.172-2.251-.203-.34-.389-.607-.551-.84Zm3.371-1.174c-.098-.632,.034-1.281,.368-1.809,.367-.45,.701-.642,.991-.81,.345-.199,.627-.362,.83-.877,.289,.684,0,1.188-.304,1.718-.119,.207-.24,.418-.329,.645-.191,.61,.101,.893,.467,1.247,.358,.346,.786,.76,.899,1.617,.083,.635-.036,1.156-.372,1.684-.356,.436-.681,.655-.965,.846-.356,.24-.648,.437-.856,.965-.292-.688,.031-1.259,.353-1.828,.123-.217,.246-.434,.334-.658,.073-.558-.234-.867-.581-1.217-.357-.36-.757-.763-.834-1.523Zm-8.018,0c-.098-.632,.005-1.3,.368-1.809,.376-.528,.729-.717,1.035-.881,.323-.173,.594-.318,.786-.806,.289,.683-.014,1.208-.325,1.749-.122,.212-.246,.427-.336,.655-.152,.385,.131,1.014,.501,1.242,1.002,.801,1.227,2.286,.547,3.353-.366,.448-.704,.648-.999,.823-.353,.209-.645,.382-.849,.898-.278-.656,.008-1.18,.3-1.714,.131-.24,.263-.481,.345-.737,.179-.557-.134-.884-.51-1.277-.349-.365-.752-.785-.863-1.498Zm10.965,4.414c.7,2.616-3.474,3-5.5,3s-6.2-.484-5.5-3c-.633,.316-1,.961-1,1.5,0,1.519,2.91,2.9,6.5,2.9s6.5-1.381,6.5-2.9c0-.539-.367-1.184-1-1.5Z"/>
+</svg>
\ No newline at end of file
diff --git a/icons/map/POI/laundry-11.svg b/icons/map/POI/laundry-11.svg
new file mode 100644
index 00000000..14483e9b
--- /dev/null
+++ b/icons/map/POI/laundry-11.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="laundry-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path3291" d="M5,0L4,2H2c0,0-1,0-1,1v7c0,0,0,1,1,1h7c1,0,1-1,1-1V1c0-1-1-1-1-1H5z M6,1h3v1H6V1z M5.5,4&#xA;&#x9;C6.8807,4,8,5.1193,8,6.5S6.8807,9,5.5,9S3,7.8807,3,6.5S4.1193,4,5.5,4z"/>
+</svg>
\ No newline at end of file
diff --git a/icons/map/POI/slaughterhouse-11.svg b/icons/map/POI/slaughterhouse-11.svg
new file mode 100644
index 00000000..e45288b0
--- /dev/null
+++ b/icons/map/POI/slaughterhouse-11.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="slaughterhouse-11" xmlns="http://www.w3.org/2000/svg" width="11" height="11" viewBox="0 0 11 11">
+  <path d="M11,5.75v.241C11,7,10,6.5,10,6.5H8A3.081,3.081,0,0,1,7,8a2.848,2.848,0,0,1-.416.9.26.26,0,0,0-.05.242l.458,1.55A.227.227,0,0,1,7,10.75a.25.25,0,0,1-.25.25.259.259,0,0,1-.244-.173L6,9V8.5H2.75l-.21.42a.25.25,0,0,0-.02.168L3,10.75a.25.25,0,0,1-.25.25.26.26,0,0,1-.237-.172L2,9V8.5a4.013,4.013,0,0,1-.843-.139,1.383,1.383,0,0,1-.5,1.045.242.242,0,0,0-.094.282l.414.99a.213.213,0,0,1,.011.072.25.25,0,0,1-.25.25.253.253,0,0,1-.228-.148L0,9.5a6.031,6.031,0,0,0,0-2v-2A1.486,1.486,0,0,1,2,4.1s.768.132,1.1.154A2.457,2.457,0,0,0,4,4.087,1.666,1.666,0,0,1,4.5,4a1.648,1.648,0,0,1,.844.257,3.166,3.166,0,0,0,.9.23L7,4.5s.966-.484,1-.5V3.5l.5.5A1.474,1.474,0,0,1,10,3.5.914.914,0,0,0,9,4l1,1,.68.529a.425.425,0,0,1,.07-.029A.238.238,0,0,1,11,5.75Z"/>
+</svg>
\ No newline at end of file
diff --git a/icons/map/POI/stadium-11.svg b/icons/map/POI/stadium-11.svg
new file mode 100644
index 00000000..019ff4cf
--- /dev/null
+++ b/icons/map/POI/stadium-11.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" id="stadium-11" xmlns="http://www.w3.org/2000/svg" width="11px" height="11px" viewBox="0 0 11 11">
+  <path id="path4177" d="M5,0v3v0.0117&#xA;&#x9;C2.7922,3.1089,1.0876,3.8182,1,4.6816c0,0,0,2.4594,0,3.6816C0.9995,9.2672,3.0143,10,5.5,10s4.5005-0.7328,4.5-1.6367V4.6816&#xA;&#x9;C9.9122,3.8177,8.2093,3.1082,6,3.0117V2.5723L8.5,1.5L5,0z M1.8184,5.752C2.1366,5.9302,2.5373,6.0838,3,6.2051v2.459&#xA;&#x9;C2.2493,8.4283,1.8213,8.0972,1.8184,7.75V5.752z M9.1816,5.7559V7.75C9.1803,8.0979,8.7521,8.4298,8,8.666V6.2031&#xA;&#x9;C8.4614,6.0836,8.862,5.932,9.1816,5.7559z M4,6.3984C4.4815,6.4652,4.9888,6.4995,5.5,6.5C6.0112,6.4995,6.5185,6.4652,7,6.3984&#xA;&#x9;v2.4922C6.5282,8.9624,6.0171,8.9997,5.5,9C4.9829,8.9997,4.4718,8.9624,4,8.8906V6.3984z"/>
+</svg>
\ No newline at end of file