diff --git a/data/styles/clear/include/Icons.mapcss b/data/styles/clear/include/Icons.mapcss
index f22f9b5070..428bf5b123 100644
--- a/data/styles/clear/include/Icons.mapcss
+++ b/data/styles/clear/include/Icons.mapcss
@@ -28,14 +28,15 @@
 
 /* 1. Z-INDEX OF ICONS */
 
-/* Default priority for all POIs to avoid building captions overlap.
-   Should be greater than [building] priority.
- */
-node[amenity],
+/*
+  Set default text priority for all POIs greater than building text priority (15201) to avoid name and symbol overlap.
+  This is the only valid variant to change text priority without overriding background filling priority.
+  ToDo: I'd prefer something like area[amenity] { z-name-index: 500; };
+  -x-me-min-text-priority and -x-me-text-priority are hacks.
+*/
 area[amenity],
-node[man_made],
 area[man_made],
-{z-index: 1000;}
+{-x-me-min-text-priority: 15300;}
 
 node|z17-[leisure],
 node|z16[amenity=parking],
diff --git a/data/styles/vehicle/include/Icons.mapcss b/data/styles/vehicle/include/Icons.mapcss
index e43aa38b15..dc2aa1bc24 100644
--- a/data/styles/vehicle/include/Icons.mapcss
+++ b/data/styles/vehicle/include/Icons.mapcss
@@ -39,18 +39,25 @@
 
 /* 1. Z-INDEX OF ICONS */
 
+/*
+  Set default text priority for all POIs greater than building text priority (15201) to avoid name and symbol overlap.
+  This is the only valid variant to change text priority without overriding background filling priority.
+  ToDo: I'd prefer something like area[amenity] { z-name-index: 500; };
+  -x-me-min-text-priority and -x-me-text-priority are hacks.
+*/
+area[amenity],
+area[man_made],
+{-x-me-min-text-priority: 15300;}
+
 node|z17-[leisure],
 node[amenity=marketplace],
 area[amenity=marketplace]
 {z-index: 6;}
 
-
-
 node[shop=supermarket],
 area[shop=supermarket],
 {z-index: 2600;}
 
-
 node[boundary=national_park],
 area[boundary=national_park],
 node[leisure=nature_reserve],
diff --git a/tools/kothic b/tools/kothic
index cbaff545dd..a7a36fc415 160000
--- a/tools/kothic
+++ b/tools/kothic
@@ -1 +1 @@
-Subproject commit cbaff545dd5d2343dcbd30285884dd4afa509d93
+Subproject commit a7a36fc4152bdbbb0569bd505199381244eb926c