diff --git a/data/classificator.txt b/data/classificator.txt
index 079ed52794..9904301145 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -47,7 +47,6 @@ world  +
         doctors  -
         drinking_water  -
         driving_school  -
-        embassy  -
         events_venue  -
         fast_food  -
         ferry_terminal  -
@@ -603,8 +602,6 @@ world  +
         hot_spring  -
         lake  -
         land  -
-        meadow  -
-        orchard  -
         peak  -
         pond  -
         rock  -
@@ -614,7 +611,6 @@ world  +
         strait  -
         tree  -
         tree_row  -
-        vineyard  -
         volcano  -
         water  -
         wetland  +
@@ -627,6 +623,7 @@ world  +
         {}
     office  +
         company  -
+        diplomatic  -
         estate_agent  -
         government  -
         insurance  -
diff --git a/data/colors.txt b/data/colors.txt
index 59e15f05bf..6c11e2d2f7 100644
--- a/data/colors.txt
+++ b/data/colors.txt
@@ -190,6 +190,7 @@
 10242335
 10400608
 10426903
+10506258
 10592406
 10790054
 11053224
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index ec836fc93b..adfaf1774f 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 aa02c8508f..1c7c9cc0b5 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -3824,57 +3824,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-embassy"
-  element {
-    scale: 17
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-}
 cont {
   name: "amenity-events_venue"
   element {
@@ -16345,9 +16294,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16358,9 +16307,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16379,9 +16328,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16399,9 +16348,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16419,9 +16368,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16439,9 +16388,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16462,9 +16411,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16475,9 +16424,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16496,9 +16445,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16516,9 +16465,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16536,9 +16485,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16556,9 +16505,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16579,9 +16528,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16592,9 +16541,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16613,9 +16562,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16633,9 +16582,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16653,9 +16602,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16673,9 +16622,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16696,9 +16645,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16709,9 +16658,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16730,9 +16679,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16750,9 +16699,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16770,9 +16719,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16790,9 +16739,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16813,9 +16762,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16826,9 +16775,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16847,9 +16796,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16867,9 +16816,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16887,9 +16836,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16907,9 +16856,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16930,9 +16879,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16943,9 +16892,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16964,9 +16913,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16984,9 +16933,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17004,9 +16953,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17024,9 +16973,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17047,9 +16996,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17060,9 +17009,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17081,9 +17030,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17101,9 +17050,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17121,9 +17070,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17141,9 +17090,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17164,9 +17113,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17177,9 +17126,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17198,9 +17147,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17218,9 +17167,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17238,9 +17187,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17258,9 +17207,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17281,9 +17230,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17294,9 +17243,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17315,9 +17264,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17335,9 +17284,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17355,9 +17304,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17375,9 +17324,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17398,9 +17347,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17411,9 +17360,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17432,9 +17381,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17452,9 +17401,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17472,9 +17421,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17492,9 +17441,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17515,9 +17464,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17528,9 +17477,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17549,9 +17498,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17569,9 +17518,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17589,9 +17538,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17609,9 +17558,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17632,9 +17581,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17645,9 +17594,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17666,9 +17615,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17704,9 +17653,9 @@ cont {
     }
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17742,9 +17691,9 @@ cont {
     }
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17780,9 +17729,9 @@ cont {
     }
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -41005,6 +40954,57 @@ cont {
     }
   }
 }
+cont {
+  name: "office-diplomatic"
+  element {
+    scale: 17
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+}
 cont {
   name: "office-estate_agent"
   element {
@@ -59611,11 +59611,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 16
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -59627,11 +59627,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -59643,11 +59643,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -59659,11 +59659,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -59708,7 +59708,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16462
       min_distance: 10
     }
@@ -59725,7 +59725,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16462
       min_distance: 10
     }
@@ -59831,9 +59831,9 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -59848,9 +59848,9 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -59865,9 +59865,9 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -60321,7 +60321,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -60338,7 +60338,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -60355,7 +60355,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -60795,13 +60795,13 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 16
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60811,13 +60811,13 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 16
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60827,13 +60827,13 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 16
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60843,13 +60843,13 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60859,13 +60859,13 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60875,13 +60875,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -61326,11 +61326,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -61342,11 +61342,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -61358,11 +61358,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 0eb0db4815..a4e90e0e24 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 675d60d915..615a6e0342 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -3824,57 +3824,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-embassy"
-  element {
-    scale: 17
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 11
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-}
 cont {
   name: "amenity-events_venue"
   element {
@@ -16265,9 +16214,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16278,9 +16227,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16299,9 +16248,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16319,9 +16268,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16339,9 +16288,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16359,9 +16308,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16382,9 +16331,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16395,9 +16344,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16416,9 +16365,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16436,9 +16385,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16456,9 +16405,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16476,9 +16425,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16499,9 +16448,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16512,9 +16461,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16533,9 +16482,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16553,9 +16502,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16573,9 +16522,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16593,9 +16542,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16616,9 +16565,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16629,9 +16578,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16650,9 +16599,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16670,9 +16619,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16690,9 +16639,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16710,9 +16659,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16733,9 +16682,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16746,9 +16695,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16767,9 +16716,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16787,9 +16736,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16807,9 +16756,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16827,9 +16776,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16850,9 +16799,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16863,9 +16812,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16884,9 +16833,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16904,9 +16853,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16924,9 +16873,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16944,9 +16893,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16967,9 +16916,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16980,9 +16929,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17001,9 +16950,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17021,9 +16970,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17041,9 +16990,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17061,9 +17010,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17084,9 +17033,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17097,9 +17046,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17118,9 +17067,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17138,9 +17087,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17158,9 +17107,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17178,9 +17127,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17201,9 +17150,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17214,9 +17163,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17235,9 +17184,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17255,9 +17204,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17275,9 +17224,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17295,9 +17244,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17318,9 +17267,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17331,9 +17280,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17352,9 +17301,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17372,9 +17321,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17392,9 +17341,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17412,9 +17361,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17435,9 +17384,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17448,9 +17397,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17469,9 +17418,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17489,9 +17438,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17509,9 +17458,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17529,9 +17478,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17552,9 +17501,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17565,9 +17514,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17586,9 +17535,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17624,9 +17573,9 @@ cont {
     }
     lines {
       width: 2.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17662,9 +17611,9 @@ cont {
     }
     lines {
       width: 3.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17700,9 +17649,9 @@ cont {
     }
     lines {
       width: 4.0
-      color: 6510384
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -40789,6 +40738,57 @@ cont {
     }
   }
 }
+cont {
+  name: "office-diplomatic"
+  element {
+    scale: 17
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+}
 cont {
   name: "office-estate_agent"
   element {
@@ -59259,11 +59259,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 16
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -59275,11 +59275,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -59291,11 +59291,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -59307,11 +59307,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -59356,7 +59356,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16462
       min_distance: 10
     }
@@ -59373,7 +59373,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16462
       min_distance: 10
     }
@@ -59479,9 +59479,9 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -59496,9 +59496,9 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -59513,9 +59513,9 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -59969,7 +59969,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -59986,7 +59986,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -60003,7 +60003,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -60443,13 +60443,13 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 16
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60459,13 +60459,13 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60475,13 +60475,13 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60491,13 +60491,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60942,11 +60942,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60958,11 +60958,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
@@ -60974,11 +60974,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 4473924
         offset_y: 1
       }
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index a248f56926..0deaf5c90d 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 693d6db214..4b3f06bb2a 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -3824,57 +3824,6 @@ cont {
     }
   }
 }
-cont {
-  name: "amenity-embassy"
-  element {
-    scale: 17
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 19
-    symbol {
-      name: "embassy-m"
-      priority: 16500
-    }
-    caption {
-      primary {
-        height: 11
-        color: 5592405
-        offset_y: 1
-        is_optional: true
-      }
-      priority: 15500
-    }
-  }
-}
 cont {
   name: "amenity-events_venue"
   element {
@@ -16297,9 +16246,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16310,9 +16259,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16331,9 +16280,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16351,9 +16300,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16371,9 +16320,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16391,9 +16340,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16414,9 +16363,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16427,9 +16376,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16448,9 +16397,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16468,9 +16417,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16488,9 +16437,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16508,9 +16457,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16531,9 +16480,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16544,9 +16493,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16565,9 +16514,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16585,9 +16534,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16605,9 +16554,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16625,9 +16574,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16648,9 +16597,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16661,9 +16610,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16682,9 +16631,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16702,9 +16651,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16722,9 +16671,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16742,9 +16691,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16765,9 +16714,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16778,9 +16727,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16799,9 +16748,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16819,9 +16768,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16839,9 +16788,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16859,9 +16808,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16882,9 +16831,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -16895,9 +16844,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -16916,9 +16865,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -16936,9 +16885,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -16956,9 +16905,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -16976,9 +16925,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -16999,9 +16948,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17012,9 +16961,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17033,9 +16982,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17053,9 +17002,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17073,9 +17022,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17093,9 +17042,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17116,9 +17065,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17129,9 +17078,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17150,9 +17099,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17170,9 +17119,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17190,9 +17139,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17210,9 +17159,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17233,9 +17182,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17246,9 +17195,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17267,9 +17216,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17287,9 +17236,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17307,9 +17256,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17327,9 +17276,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17350,9 +17299,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17363,9 +17312,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17384,9 +17333,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17404,9 +17353,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17424,9 +17373,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17444,9 +17393,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17467,9 +17416,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17480,9 +17429,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17501,9 +17450,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17521,9 +17470,9 @@ cont {
     scale: 17
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17541,9 +17490,9 @@ cont {
     scale: 18
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17561,9 +17510,9 @@ cont {
     scale: 19
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -17584,9 +17533,9 @@ cont {
     scale: 14
     lines {
       width: 0.9
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.52
+        dd: 1.52
         dd: 1.35
       }
       priority: 1238
@@ -17597,9 +17546,9 @@ cont {
     scale: 15
     lines {
       width: 1.1
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 2.7
+        dd: 1.7
         dd: 1.26
       }
       priority: 1238
@@ -17618,9 +17567,9 @@ cont {
     scale: 16
     lines {
       width: 1.8
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 3.6
+        dd: 2.5
         dd: 1.8
       }
       priority: 1238
@@ -17656,9 +17605,9 @@ cont {
     }
     lines {
       width: 2.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 4.5
+        dd: 3.0
         dd: 1.8
       }
       priority: 1238
@@ -17694,9 +17643,9 @@ cont {
     }
     lines {
       width: 3.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 7.2
+        dd: 4.0
         dd: 2.7
       }
       priority: 1238
@@ -17732,9 +17681,9 @@ cont {
     }
     lines {
       width: 4.0
-      color: 2828327
+      color: 10506258
       dashdot {
-        dd: 9.0
+        dd: 6.0
         dd: 3.6
       }
       priority: 1238
@@ -40886,6 +40835,57 @@ cont {
     }
   }
 }
+cont {
+  name: "office-diplomatic"
+  element {
+    scale: 17
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "embassy-m"
+      priority: 16500
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15500
+    }
+  }
+}
 cont {
   name: "office-estate_agent"
   element {
@@ -59346,11 +59346,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 16
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -59362,11 +59362,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -59378,11 +59378,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -59394,11 +59394,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16955
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -59443,7 +59443,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16462
       min_distance: 10
     }
@@ -59460,7 +59460,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16462
       min_distance: 10
     }
@@ -59566,9 +59566,9 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -59583,9 +59583,9 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -59600,9 +59600,9 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "bank-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 20
     }
     caption {
       primary {
@@ -60056,7 +60056,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -60073,7 +60073,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -60090,7 +60090,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "bookmaker-m"
       priority: 16485
       min_distance: 10
     }
@@ -60530,13 +60530,13 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 16
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -60546,13 +60546,13 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -60562,13 +60562,13 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -60578,13 +60578,13 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-m"
+      name: "grocery-m"
       priority: 16500
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -61029,11 +61029,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -61045,11 +61045,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
@@ -61061,11 +61061,11 @@ cont {
     symbol {
       name: "shop-m"
       priority: 16462
-      min_distance: 10
+      min_distance: 8
     }
     caption {
       primary {
-        height: 10
+        height: 11
         color: 5592405
         offset_y: 1
       }
diff --git a/data/patterns.txt b/data/patterns.txt
index 3a93a4e9c5..8cd71dbb3d 100644
--- a/data/patterns.txt
+++ b/data/patterns.txt
@@ -20,11 +20,17 @@
 7.0 3.0
 16.2 8.1
 5.0 5.0
-2.52 1.35
+1.52 1.35
+1.7 1.26
+2.5 1.8
+3.0 1.8
+4.0 2.7
+6.0 3.6
 1.5 1.5
 2.3 2.3
 3.2 3.2
 4.0 4.0
+2.52 1.35
 6.3 6.3
 1.8 5.4
 4.5 4.5
diff --git a/data/types.txt b/data/types.txt
index 7f002cb8f4..2381f0fa3f 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -446,7 +446,7 @@ mapswithme
 mapswithme
 *railway|yard
 mapswithme
-*natural|meadow
+landuse|meadow
 mapswithme
 *railway|razed
 *highway|footway|demanding_mountain_hiking
@@ -683,15 +683,14 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
-*natural|vineyard
+landuse|vineyard
 mapswithme
 mapswithme
 mapswithme
 mapswithme
 *boundary|administrative|country
 mapswithme
-*natural|orchard
-mapswithme
+landuse|orchard
 mapswithme
 mapswithme
 mapswithme
@@ -700,13 +699,14 @@ mapswithme
 mapswithme
 mapswithme
 mapswithme
+*office|diplomatic
 *railway|station|subway
 *amenity|police
 *amenity|car_rental
 *amenity|taxi
 *amenity|marketplace
 *amenity|nightclub
-*amenity|embassy
+office|diplomatic
 *amenity|townhall
 *barrier|gate
 *barrier|lift_gate
diff --git a/data/visibility.txt b/data/visibility.txt
index 8939c799ae..5c8aba973a 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -47,7 +47,6 @@ world  00000000000000000000  +
         doctors  00000000000000000000  -
         drinking_water  00000000000000000000  -
         driving_school  00000000000000000000  -
-        embassy  00000000000000000000  -
         events_venue  00000000000000000000  -
         fast_food  00000000000000000111  -
         ferry_terminal  00000000000000000000  -
@@ -603,8 +602,6 @@ world  00000000000000000000  +
         hot_spring  00000000000000000000  -
         lake  11111111111111111111  -
         land  11111111111111111111  -
-        meadow  00000000000000000000  -
-        orchard  00000000000000000000  -
         peak  00000000000000000000  -
         pond  11111111111111111111  -
         rock  00000000000000000000  -
@@ -614,7 +611,6 @@ world  00000000000000000000  +
         strait  00000000000001111111  -
         tree  00000000000000000000  -
         tree_row  00000000000000000000  -
-        vineyard  00000000000000000000  -
         volcano  00000000000000000000  -
         water  11111111111111111111  -
         wetland  00000000000111111111  +
@@ -627,6 +623,7 @@ world  00000000000000000000  +
         {}
     office  00000000000000000000  +
         company  00000000000000000000  -
+        diplomatic  00000000000000000000  -
         estate_agent  00000000000000000000  -
         government  00000000000000000000  -
         insurance  00000000000000000000  -