diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index b597f710dd..1a983e3c22 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index f630018d2e..f9081382c6 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2177,13 +2177,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "none"
+      name: "bus-l"
       priority: 16878
     }
     caption {
       primary {
-        height: 11
-        color: 4473924
+        height: 12
+        color: 3355443
         stroke_color: 452984831
         offset_y: 10
       }
@@ -2756,13 +2756,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "none"
+      name: "ship-l"
       priority: 16878
     }
     caption {
       primary {
-        height: 11
-        color: 4473924
+        height: 12
+        color: 3355443
         stroke_color: 452984831
         offset_y: 10
       }
@@ -3001,12 +3001,12 @@ cont {
       priority: -15433
     }
     symbol {
-      name: "none"
+      name: "cemetery-l"
       priority: 16567
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -3082,12 +3082,12 @@ cont {
       priority: -15433
     }
     symbol {
-      name: "none"
+      name: "cemetery-l"
       priority: 16567
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -30516,7 +30516,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -30535,7 +30535,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -30554,7 +30554,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -30573,7 +30573,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -30592,7 +30592,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 4473924
+        color: 6710886
         offset_y: 10
       }
       priority: 15851
@@ -37050,7 +37050,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -37069,7 +37069,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
@@ -37088,7 +37088,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 8b2ac79ab5..7bd2be8e67 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 4476fca5bd..3e3fa90325 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -2177,13 +2177,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "none"
+      name: "bus-l"
       priority: 16878
     }
     caption {
       primary {
-        height: 11
-        color: 5592405
+        height: 12
+        color: 11711154
         stroke_color: 437326080
         offset_y: 10
       }
@@ -2756,13 +2756,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "none"
+      name: "ship-l"
       priority: 16878
     }
     caption {
       primary {
-        height: 11
-        color: 5592405
+        height: 12
+        color: 11711154
         stroke_color: 437326080
         offset_y: 10
       }
@@ -3001,12 +3001,12 @@ cont {
       priority: -15433
     }
     symbol {
-      name: "none"
+      name: "cemetery-l"
       priority: 16567
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -3082,12 +3082,12 @@ cont {
       priority: -15433
     }
     symbol {
-      name: "none"
+      name: "cemetery-l"
       priority: 16567
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -30516,7 +30516,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -30535,7 +30535,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -30554,7 +30554,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -30573,7 +30573,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -30592,7 +30592,7 @@ cont {
     caption {
       primary {
         height: 10
-        color: 5592405
+        color: 10066329
         offset_y: 10
       }
       priority: 15851
@@ -37050,7 +37050,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -37069,7 +37069,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
@@ -37088,7 +37088,7 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
diff --git a/data/styles/clear/style-clear/style.mapcss b/data/styles/clear/style-clear/style.mapcss
index fe9e4dc513..5d9da47f73 100644
--- a/data/styles/clear/style-clear/style.mapcss
+++ b/data/styles/clear/style-clear/style.mapcss
@@ -2,12 +2,12 @@
 @import("../include/defaults.mapcss");
 @import("../include/roads.mapcss");
 /* @import("../include/roads_orange.mapcss"); */
+@import("../include/POI.mapcss");
 @import("../include/transport.mapcss");
 @import("../include/boundaries.mapcss");
 @import("../include/natural.mapcss");
 @import("../include/labels.mapcss");
 @import("../include/landuse.mapcss");
-@import("../include/POI.mapcss");
 @import("../include/other.mapcss");
 @import("../include/buildings.mapcss");
 
diff --git a/data/styles/clear/style-night/style.mapcss b/data/styles/clear/style-night/style.mapcss
index c54a756338..5d9da47f73 100644
--- a/data/styles/clear/style-night/style.mapcss
+++ b/data/styles/clear/style-night/style.mapcss
@@ -1,15 +1,15 @@
 @import("colors.mapcss");
 @import("../include/defaults.mapcss");
 @import("../include/roads.mapcss");
-/* @import("../include/roads_orange.mapcss");  */
+/* @import("../include/roads_orange.mapcss"); */
+@import("../include/POI.mapcss");
 @import("../include/transport.mapcss");
 @import("../include/boundaries.mapcss");
 @import("../include/natural.mapcss");
 @import("../include/labels.mapcss");
-@import("../include/buildings.mapcss");
 @import("../include/landuse.mapcss");
-@import("../include/POI.mapcss");
 @import("../include/other.mapcss");
+@import("../include/buildings.mapcss");
 
 canvas
 {