diff --git a/data/colors.txt b/data/colors.txt
index 6ec8888ec1..0e08f06446 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -382,11 +382,9 @@
 4043309055
 4279308544
 4281545523
-4281742388
 4287137928
 4287393810
 4288578070
 4294761984
-4294769916
 4294960384
 4294967295
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 4112cac334..1b8b7f34b7 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 42eb532b01..214d73ef4c 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -14210,7 +14210,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -14330,7 +14330,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -14450,7 +14450,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -15630,6 +15630,13 @@ cont {
   name: "highway-motorway_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15638,9 +15645,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15649,9 +15669,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15660,11 +15693,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15687,7 +15726,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15823,6 +15862,13 @@ cont {
   name: "highway-motorway_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15831,9 +15877,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15842,9 +15901,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15853,11 +15925,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15880,13 +15958,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 15592411
       dashdot {
       }
@@ -15894,7 +15972,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 8421504
       dashdot {
       }
@@ -16112,6 +16190,13 @@ cont {
   name: "highway-motorway_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16120,9 +16205,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16131,9 +16229,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      color: 8421504
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -16142,11 +16261,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       color: 8421504
       dashdot {
         dd: 5.0
@@ -16156,7 +16281,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -16179,7 +16304,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       color: 8421504
       dashdot {
         dd: 5.0
@@ -16189,7 +16314,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -19476,6 +19601,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19484,9 +19616,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19495,9 +19640,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19506,6 +19663,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -19657,6 +19820,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19665,9 +19835,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19676,9 +19859,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19687,6 +19882,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -19934,6 +20135,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19942,9 +20150,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19953,9 +20174,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19964,6 +20197,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -20247,16 +20486,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20266,14 +20495,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20441,16 +20662,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20460,14 +20671,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20635,16 +20838,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20654,14 +20847,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20925,16 +21110,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20944,14 +21119,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -21239,7 +21406,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -21359,7 +21526,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -21543,7 +21710,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -27089,6 +27256,13 @@ cont {
   name: "highway-trunk_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27097,9 +27271,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27108,9 +27295,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27119,11 +27319,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27146,7 +27352,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27282,6 +27488,13 @@ cont {
   name: "highway-trunk_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27290,9 +27503,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27301,9 +27527,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27312,11 +27551,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27339,13 +27584,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 15592411
       dashdot {
       }
@@ -27353,7 +27598,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 8421504
       dashdot {
       }
@@ -27571,6 +27816,13 @@ cont {
   name: "highway-trunk_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27579,9 +27831,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27590,9 +27855,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      color: 8421504
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27601,11 +27887,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       color: 8421504
       dashdot {
         dd: 5.0
@@ -27615,7 +27907,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -27638,7 +27930,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       color: 8421504
       dashdot {
         dd: 5.0
@@ -27648,7 +27940,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -27832,6 +28124,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27845,11 +28147,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -27952,6 +28262,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27965,11 +28285,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28072,6 +28400,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28085,11 +28423,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28288,6 +28634,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28301,11 +28657,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -64957,43 +65321,80 @@ cont {
 cont {
   name: "tourism-attraction"
   element {
-    scale: 15
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
     }
   }
   element {
     scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 18
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -65001,11 +65402,16 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -65013,26 +65419,61 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
 }
 cont {
   name: "tourism-attraction-animal"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 15
     symbol {
-      name: "zoo-m"
+      name: "tourism-m"
       priority: 16846
-      min_distance: 24
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
     }
   }
   element {
     scale: 16
     symbol {
-      name: "zoo-m"
+      name: "tourism-m"
       priority: 16846
-      min_distance: 24
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
     }
   }
   element {
@@ -65042,6 +65483,15 @@ cont {
       priority: 16846
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
   }
   element {
     scale: 18
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index be6fde67a3..90fc4b7b55 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 bdb58eef4e..6d5d56d432 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -14144,7 +14144,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -14264,7 +14264,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -14384,7 +14384,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -15564,6 +15564,13 @@ cont {
   name: "highway-motorway_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15572,9 +15579,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15583,9 +15603,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15594,11 +15627,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15621,7 +15660,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15757,6 +15796,13 @@ cont {
   name: "highway-motorway_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15765,9 +15811,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15776,9 +15835,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15787,11 +15859,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -15814,13 +15892,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 15592411
       dashdot {
       }
@@ -15828,7 +15906,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 8421504
       dashdot {
       }
@@ -16046,6 +16124,13 @@ cont {
   name: "highway-motorway_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16054,9 +16139,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16065,9 +16163,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      color: 8421504
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -16076,11 +16195,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       color: 8421504
       dashdot {
         dd: 5.0
@@ -16090,7 +16215,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -16113,7 +16238,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       color: 8421504
       dashdot {
         dd: 5.0
@@ -16123,7 +16248,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -19410,6 +19535,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19418,9 +19550,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19429,9 +19574,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19440,6 +19597,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -19591,6 +19754,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19599,9 +19769,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19610,9 +19793,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19621,6 +19816,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -19868,6 +20069,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19876,9 +20084,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 16749632
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19887,9 +20108,21 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 90
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 16749632
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19898,6 +20131,12 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16438
+      min_distance: 120
+    }
   }
   element {
     scale: 14
@@ -20181,16 +20420,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20200,14 +20429,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20375,16 +20596,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20394,14 +20605,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20569,16 +20772,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20588,14 +20781,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -20859,16 +21044,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 16316664
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20878,14 +21053,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 4473924
-        stroke_color: 452984831
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       color: 16777215
@@ -21173,7 +21340,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -21293,7 +21460,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -21477,7 +21644,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
@@ -26895,6 +27062,13 @@ cont {
   name: "highway-trunk_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26903,9 +27077,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -26914,9 +27101,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -26925,11 +27125,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -26952,7 +27158,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27088,6 +27294,13 @@ cont {
   name: "highway-trunk_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27096,9 +27309,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27107,9 +27333,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27118,11 +27357,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 16742950
       priority: 1459
       cap: BUTTCAP
@@ -27145,13 +27390,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 16742950
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 15592411
       dashdot {
       }
@@ -27159,7 +27404,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 8421504
       dashdot {
       }
@@ -27377,6 +27622,13 @@ cont {
   name: "highway-trunk_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27385,9 +27637,22 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 85
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27396,9 +27661,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      color: 8421504
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 16742950
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27407,11 +27693,17 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      color: 16777215
+      priority: 16459
+      min_distance: 90
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       color: 8421504
       dashdot {
         dd: 5.0
@@ -27421,7 +27713,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -27444,7 +27736,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       color: 8421504
       dashdot {
         dd: 5.0
@@ -27454,7 +27746,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 16557154
       priority: 1459
       cap: BUTTCAP
@@ -27638,6 +27930,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27651,11 +27953,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -27758,6 +28068,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27771,11 +28091,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -27878,6 +28206,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27891,11 +28229,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28094,6 +28440,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 16316664
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28107,11 +28463,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 16316664
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 4473924
+        stroke_color: 452984831
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -64586,8 +64950,81 @@ cont {
 }
 cont {
   name: "tourism-attraction"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 18
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -64595,11 +65032,16 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -64607,12 +65049,63 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
 }
 cont {
   name: "tourism-attraction-animal"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 17
     symbol {
@@ -64620,6 +65113,15 @@ cont {
       priority: 16846
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
   }
   element {
     scale: 18
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 18ee3ba796..863d86e827 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 88bc55402b..9dc6fbd3ac 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -14144,7 +14144,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -14264,7 +14264,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -14384,7 +14384,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -15582,6 +15582,13 @@ cont {
   name: "highway-motorway_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15590,9 +15597,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15601,9 +15622,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15612,11 +15647,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -15640,7 +15682,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -15782,6 +15824,13 @@ cont {
   name: "highway-motorway_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15790,9 +15839,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -15801,9 +15864,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -15812,11 +15889,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -15840,13 +15924,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677969
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 2236945
       dashdot {
       }
@@ -15854,7 +15938,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 4473924
       dashdot {
       }
@@ -16078,6 +16162,13 @@ cont {
   name: "highway-motorway_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16086,9 +16177,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -16097,9 +16202,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -16108,11 +16234,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -16121,7 +16254,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677972
       priority: 1459
       cap: BUTTCAP
@@ -16145,7 +16278,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -16154,7 +16287,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677972
       priority: 1459
       cap: BUTTCAP
@@ -19462,6 +19595,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19470,9 +19610,23 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19481,9 +19635,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 4334872
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19492,6 +19659,13 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -19649,6 +19823,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19657,9 +19838,23 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19668,9 +19863,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 4334872
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19679,6 +19887,13 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -19932,6 +20147,13 @@ cont {
   }
   element {
     scale: 11
+    lines {
+      width: 1.5
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19940,9 +20162,23 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.7
+      color: 4334872
+      priority: 1438
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19951,9 +20187,22 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
+    lines {
+      width: 2.4
+      color: 4334872
+      priority: 1438
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -19962,6 +20211,13 @@ cont {
       }
       priority: 16438
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16438
+      min_distance: 120
+      text_color: 11711154
+    }
   }
   element {
     scale: 14
@@ -20245,16 +20501,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 2828327
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20264,14 +20510,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 436207616
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       stroke_color: 11711154
@@ -20447,16 +20685,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 2828327
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20466,14 +20694,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 436207616
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       stroke_color: 11711154
@@ -20649,16 +20869,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 2828327
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20668,14 +20878,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 436207616
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       stroke_color: 11711154
@@ -20947,16 +21149,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.8
-      color: 2828327
-      priority: 1397
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -20966,14 +21158,6 @@ cont {
       join: BEVELJOIN
       cap: BUTTCAP
     }
-    path_text {
-      primary {
-        height: 10
-        color: 6710886
-        stroke_color: 436207616
-      }
-      priority: 16397
-    }
     shield {
       height: 9
       stroke_color: 11711154
@@ -21265,7 +21449,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -21385,7 +21569,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -21569,7 +21753,7 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
@@ -27041,6 +27225,13 @@ cont {
   name: "highway-trunk_link"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27049,9 +27240,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27060,9 +27265,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27071,11 +27290,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -27099,7 +27325,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -27241,6 +27467,13 @@ cont {
   name: "highway-trunk_link-bridge"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27249,9 +27482,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27260,9 +27507,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27271,11 +27532,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677969
       priority: 1459
       cap: BUTTCAP
@@ -27299,13 +27567,13 @@ cont {
   element {
     scale: 14
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677969
       priority: 1459
       cap: BUTTCAP
     }
     lines {
-      width: 3.6
+      width: 4.0
       color: 2236945
       dashdot {
       }
@@ -27313,7 +27581,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 4.4
+      width: 4.8
       color: 4473924
       dashdot {
       }
@@ -27537,6 +27805,13 @@ cont {
   name: "highway-trunk_link-tunnel"
   element {
     scale: 10
+    lines {
+      width: 0.8
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27545,9 +27820,23 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 85
+      text_color: 11711154
+    }
   }
   element {
     scale: 11
+    lines {
+      width: 1.0
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 10
@@ -27556,9 +27845,30 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 12
+    lines {
+      width: 3.2
+      dashdot {
+      }
+      priority: 1458
+      cap: BUTTCAP
+    }
+    lines {
+      width: 1.2
+      color: 3677969
+      priority: 1459
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
     path_text {
       primary {
         height: 12
@@ -27567,11 +27877,18 @@ cont {
       }
       priority: 16459
     }
+    shield {
+      height: 9
+      stroke_color: 11711154
+      priority: 16459
+      min_distance: 90
+      text_color: 11711154
+    }
   }
   element {
     scale: 13
     lines {
-      width: 3.4
+      width: 3.8
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -27580,7 +27897,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.4
+      width: 1.8
       color: 3677972
       priority: 1459
       cap: BUTTCAP
@@ -27604,7 +27921,7 @@ cont {
   element {
     scale: 14
     lines {
-      width: 3.8
+      width: 4.0
       dashdot {
         dd: 5.0
         dd: 5.0
@@ -27613,7 +27930,7 @@ cont {
       cap: BUTTCAP
     }
     lines {
-      width: 1.8
+      width: 2.0
       color: 3677972
       priority: 1459
       cap: BUTTCAP
@@ -27798,6 +28115,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 2828327
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27811,11 +28138,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 436207616
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -27918,6 +28253,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 2828327
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -27931,11 +28276,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 436207616
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28038,6 +28391,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 2828327
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28051,11 +28414,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 436207616
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -28254,6 +28625,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.8
+      color: 2828327
+      priority: 1377
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -28267,11 +28648,19 @@ cont {
   element {
     scale: 13
     lines {
-      width: 1.0
+      width: 1.2
       color: 2828327
       priority: 1377
       cap: BUTTCAP
     }
+    path_text {
+      primary {
+        height: 10
+        color: 6710886
+        stroke_color: 436207616
+      }
+      priority: 16377
+    }
   }
   element {
     scale: 14
@@ -64673,8 +65062,81 @@ cont {
 }
 cont {
   name: "tourism-attraction"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 18
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -64682,11 +65144,16 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
   element {
     scale: 19
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
     caption {
       primary {
         height: 11
@@ -64694,12 +65161,63 @@ cont {
         offset_y: 1
         is_optional: true
       }
-      priority: 15632
+      priority: 15846
     }
   }
 }
 cont {
   name: "tourism-attraction-animal"
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16846
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16846
+      min_distance: 36
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
+  }
   element {
     scale: 17
     symbol {
@@ -64707,6 +65225,15 @@ cont {
       priority: 16846
       min_distance: 24
     }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15846
+    }
   }
   element {
     scale: 18
diff --git a/data/drules_proto_vehicle_clear.bin b/data/drules_proto_vehicle_clear.bin
index bdd735fee9..bc3c2cd8d4 100644
Binary files a/data/drules_proto_vehicle_clear.bin and b/data/drules_proto_vehicle_clear.bin differ
diff --git a/data/drules_proto_vehicle_clear.txt b/data/drules_proto_vehicle_clear.txt
index 2c71ce1aa0..3a48be95d5 100644
--- a/data/drules_proto_vehicle_clear.txt
+++ b/data/drules_proto_vehicle_clear.txt
@@ -9725,16 +9725,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4294769916
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -9959,16 +9949,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4294769916
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10193,16 +10173,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4294769916
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10523,16 +10493,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4294769916
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -16282,6 +16242,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 16579836
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16402,6 +16372,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 16579836
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16522,6 +16502,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 16579836
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16738,6 +16728,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 16579836
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin
index d25e7697a1..0551350d50 100644
Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ
diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt
index 592b20ab5b..41aeb5f63a 100644
--- a/data/drules_proto_vehicle_dark.txt
+++ b/data/drules_proto_vehicle_dark.txt
@@ -9892,16 +9892,6 @@ cont {
 }
 cont {
   name: "highway-residential"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4281742388
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10142,16 +10132,6 @@ cont {
 }
 cont {
   name: "highway-residential-area"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4281742388
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10392,16 +10372,6 @@ cont {
 }
 cont {
   name: "highway-residential-bridge"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4281742388
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -10738,16 +10708,6 @@ cont {
 }
 cont {
   name: "highway-residential-tunnel"
-  element {
-    scale: 11
-    lines {
-      width: 0.3
-      color: 4281742388
-      priority: 1423
-      join: BEVELJOIN
-      cap: BUTTCAP
-    }
-  }
   element {
     scale: 12
     lines {
@@ -16676,6 +16636,16 @@ cont {
 }
 cont {
   name: "highway-unclassified"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 3552308
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16796,6 +16766,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-area"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 3552308
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -16916,6 +16896,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-bridge"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 3552308
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
@@ -17132,6 +17122,16 @@ cont {
 }
 cont {
   name: "highway-unclassified-tunnel"
+  element {
+    scale: 11
+    lines {
+      width: 0.85
+      color: 3552308
+      priority: 1400
+      join: BEVELJOIN
+      cap: BUTTCAP
+    }
+  }
   element {
     scale: 12
     lines {
diff --git a/data/visibility.txt b/data/visibility.txt
index b9324732b8..aadda5dfc8 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -371,10 +371,10 @@ world  00000000000000000000  +
             tunnel  00000000001111111111  -
             {}
         raceway  00000000000000000000  -
-        residential  00000000000111111111  +
-            area  00000000000111111111  -
-            bridge  00000000000111111111  -
-            tunnel  00000000000111111111  -
+        residential  00000000000011111111  +
+            area  00000000000011111111  -
+            bridge  00000000000011111111  -
+            tunnel  00000000000011111111  -
             {}
         rest_area  00000000000000000000  -
         road  00000000000011111111  +
@@ -431,10 +431,10 @@ world  00000000000000000000  +
             bridge  00000000001111111111  -
             tunnel  00000000001111111111  -
             {}
-        unclassified  00000000000011111111  +
-            area  00000000000011111111  -
-            bridge  00000000000011111111  -
-            tunnel  00000000000011111111  -
+        unclassified  00000000000111111111  +
+            area  00000000000111111111  -
+            bridge  00000000000111111111  -
+            tunnel  00000000000111111111  -
             {}
         world_level  00001111110000000000  -
         world_towns_level  00000011110000000000  -