From d825db3e7ee21988f7e1a2305800fb72ca4bf1c4 Mon Sep 17 00:00:00 2001
From: Ilya Zverev <zverik@textual.ru>
Date: Wed, 27 Apr 2016 21:22:34 +0300
Subject: [PATCH] [styles] Reuild styles with new icons

---
 data/drules_proto.bin       |  Bin 230912 -> 232133 bytes
 data/drules_proto.txt       |  488 ++++++++++++++-
 data/drules_proto_clear.bin |  Bin 215457 -> 217873 bytes
 data/drules_proto_clear.txt | 1118 +++++++++++++++++++++++++++++------
 data/drules_proto_dark.bin  |  Bin 212824 -> 215240 bytes
 data/drules_proto_dark.txt  | 1118 +++++++++++++++++++++++++++++------
 6 files changed, 2360 insertions(+), 364 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index a24cbe0fb4416d8cd37f4dc888156061c765e744..3022fbe51b897042a6b0f4d48a9130c1250d6a8f 100644
GIT binary patch
delta 1221
zcmb7@K~K~`6vs1Nk=@aD+aYMpx-3EzqT7R>*67uXXriB>4rN#xcLvfHv0+V#81#S#
zZ44h^PhN}(hsLXs0|!r@MQ=o7_GU~x`Pys|WkbtllK1A9_ul`_e^%C&tyjw1t;*;&
z!aC(l*q(1#bJS_tqG`Gw_3U{;P8a3yZcRr@d~V!eh2_oq*>y?UM&Y}WDmrjkt933N
zdyeo#cx~!TxN}nrt;%%Rm<om;Vv=@wz&z&If;xV9ufjI<TOY5^a$IJdIZY-k-&mNN
z7mN%S%VQcIOag<eNdK~mMn@p6_D^g5(_~+IwYnBn*N}BR_>S<Y7PH+&hZ(cBCz$J+
z789Ps$ho3CCgXvo&ka}q0X?r=RB)+?)ep~JNRwE9(gsAyM#_gEyjMm&gy|t#HbOFx
zD0q*iwV;EroN9LIqM&3PR$Rt|Nnr3q?BoHl<FN1?kd_5qXhT1eMYW@^pHK$}ZxB{F
z6(*-M418&G!F+N)u|%mC!o;y92L7G+*D_$SMRH)VW%^^6)7MVQ#UAR<{l%ikJBXKp
z*AgDun|q0Z)6FH;YLPm)O2_I982>)}FeAAFgZ%~tC-*BjuD@&ptsIFir*x33xSHa*
zXzd8JQHLkat@CMj7e(D&se1=~+xXllR3>Eb2eznVI&6X3j=u7U48bn`Pewl*g%h{`
E0FkXw0RR91

delta 203
zcmX>)m9L?PZ^Kb(#?;BjrDdmgN-%kDo+#791mw%h%TC@R>$&-*{9<k95-#=08@(hZ
zukaQE2~L*rsh|8(o|~&IwIsDDGcU2Ia`Hx5pUtAaXDt=&x%g9aQ;X75^O7rd3o`Qa
zQiVi01eFB2*ufm#oXLjmVvIS>9_`yb+8L8=w$C`im?*e?{x!x$T-!fAWX$1g?|Q?y
zz3UCr+W^V^j9j9{8Tkde$%#erMX3denMJxKl|`w=)6dy3ubiIm$IQ7s$BsGD2LR9-
BOR4|>

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index d09031587c..84f9abcc6e 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -2474,6 +2474,54 @@ cont {
 }
 cont {
   name: "amenity-charging_station"
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 14
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
   element {
     scale: 17
     caption {
@@ -2752,6 +2800,54 @@ cont {
 }
 cont {
   name: "amenity-community_centre"
+  element {
+    scale: 13
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 14
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 15
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
   element {
     scale: 17
     caption {
@@ -6595,6 +6691,18 @@ cont {
 }
 cont {
   name: "amenity-vending_machine-parking_tickets"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
   element {
     scale: 17
     caption {
@@ -6673,6 +6781,18 @@ cont {
 }
 cont {
   name: "amenity-veterinary"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 11
+        color: 4210752
+        stroke_color: 16777215
+        offset_y: 10
+      }
+      priority: 15003
+    }
+  }
   element {
     scale: 17
     caption {
@@ -11111,10 +11231,28 @@ cont {
 }
 cont {
   name: "emergency-phone"
+  element {
+    scale: 15
+    symbol {
+      name: "phone-m"
+      apply_for_type: 1
+      priority: 16863
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "phone-m"
+      apply_for_type: 1
+      priority: 16863
+      min_distance: 30
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "phone-l"
+      name: "phone-m"
       apply_for_type: 1
       priority: 16863
       min_distance: 30
@@ -11123,7 +11261,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "phone-l"
+      name: "phone-m"
       apply_for_type: 1
       priority: 16863
       min_distance: 30
@@ -38504,6 +38642,105 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-fitness_centre"
+  element {
+    scale: 13
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+}
 cont {
   name: "leisure-garden"
   element {
@@ -39878,6 +40115,73 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-sauna"
+  element {
+    scale: 15
+    symbol {
+      name: "sauna-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "sauna-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "sauna-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sauna-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+}
 cont {
   name: "leisure-slipway"
   element {
@@ -40718,6 +41022,73 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-chimney"
+  element {
+    scale: 15
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
@@ -41385,6 +41756,105 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-water_well"
+  element {
+    scale: 13
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+}
 cont {
   name: "man_made-windmill"
   element {
@@ -69044,6 +69514,20 @@ cont {
 }
 cont {
   name: "shop-car_repair-tyres"
+  element {
+    scale: 13
+    symbol {
+      name: "car_repair"
+      priority: 16000
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car_repair"
+      priority: 16000
+    }
+  }
   element {
     scale: 15
     symbol {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index d0427b6cc46b23c86d46ed5a3f78b1b63a7a4212..2c8fef86e0c6c213d4e7be533d8bb1d29b4781f7 100644
GIT binary patch
delta 2984
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
S5;xP+llZ;-Ll5`)x_<#hT9~>3

delta 832
zcmah{O-K|`9OwT=boc4(uB+49hOC-Pg)LMP6n63wU6LiSOSX-(Z{4ZgdBe=xY(NU?
z6c{0Mcn2Zzkbx0?Y&9hWd5JtlumqK+o$}&>6hvKWXO`5Ho!;a3_5Zz(@o90&7U#qm
zoU((lsJ)Pk6`#Zo*B&^HTjV^^RAwcVtZWRc+HlHbGE=E$&nMfOPT<BJUd^Qy*|6u5
z?Zu@-?;*O|O!N7I8<SFq#ym|^Hx6%mX~AGwTCiu69mT$`8^_^+{q|Cq{b{gZKOCHa
zZaaBda$7}C;^u#*5!qxUH6)wY2y@F6)2W8m@Bj{yJTZoerdSC*OEq$5e$<&C1*yaN
zI0;94YNimD_|_^&JXM0u+A%BK=?n1J9YR}mALL6VXyc(3n1C5xUWNTWC8y?xDrf({
zgKw_FSu|$x))pb|t~cXCoZtQeld#}sMfsUE@bN1pIJnp3KHj(v{Wa4FN8PIX_^oxQ
z<3lBA-^(@O^nL|e>)hRdEx{>m!ucbii&&(YjH-}CP9Cv{!IvWFoHHFk6Q5y`_kKqM
z{6iUK9PtObj>3z817?=$iONH!blG4gA1|ZFy#FU!X<7p;ZIcGkW!2y%NqEPP{YKc)
zf1$b>@g-ofs-e2Y@0HQ)u1sp?2~(A7rW5#sHb8m>xY0ADjmqc95m|HZ*&XUEgYc$4
z^a5~$C!htErquAbhNpmi9;y@OA%W+BaTUo@Mm=oDYZ5s_Y1%`1pI`7h-$KHD6m$UB
nd!|aQ$~W?O=R&h!!A>5t3{tHuJ_GFc<Rhv^s^Y5=;Ze_Dt@bk`

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index ab02e77075..843ae468ad 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -2527,10 +2527,11 @@ cont {
 cont {
   name: "amenity-bicycle_parking"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "none"
-      priority: 16000
+      name: "bike-parking-l"
+      priority: 16849
+      min_distance: 20
     }
     caption {
       primary {
@@ -2538,7 +2539,39 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15849
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bike-parking-l"
+      priority: 16849
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15849
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bike-parking-l"
+      priority: 16849
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15849
     }
   }
 }
@@ -3123,10 +3156,88 @@ cont {
 cont {
   name: "amenity-charging_station"
   element {
-    scale: 19
+    scale: 13
     symbol {
-      name: "none"
+      name: "charging-station-s"
       priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "charging-station-s"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "charging-station-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "charging-station-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "charging-station-l"
+      priority: 16876
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "charging-station-l"
+      priority: 16876
     }
     caption {
       primary {
@@ -3134,17 +3245,47 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15876
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "charging-station-l"
+      priority: 16876
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
     }
   }
 }
 cont {
   name: "amenity-childcare"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "none"
-      priority: 16000
+      name: "childcare-l"
+      priority: 16835
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15835
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "childcare-l"
+      priority: 16849
     }
     caption {
       primary {
@@ -3152,7 +3293,22 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15849
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "childcare-l"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15849
     }
   }
 }
@@ -3333,28 +3489,140 @@ cont {
 cont {
   name: "amenity-community_centre"
   element {
-    scale: 19
+    scale: 13
     symbol {
-      name: "none"
-      priority: 16000
+      name: "tourism-s"
+      priority: 16876
+      min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15876
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
     }
   }
 }
 cont {
   name: "amenity-courthouse"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "none"
-      priority: 16000
+      name: "courthouse-l"
+      priority: 16876
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "courthouse-l"
+      priority: 16876
     }
     caption {
       primary {
@@ -3362,7 +3630,22 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15876
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "courthouse-l"
+      priority: 16876
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
     }
   }
 }
@@ -7471,10 +7754,25 @@ cont {
 }
 cont {
   name: "amenity-vending_machine-parking_tickets"
+  element {
+    scale: 16
+    symbol {
+      name: "parking-meter-m"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15849
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "vending-l"
+      name: "parking-meter-l"
       priority: 16849
       min_distance: 20
     }
@@ -7490,7 +7788,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "vending-l"
+      name: "parking-meter-l"
       priority: 16849
       min_distance: 20
     }
@@ -7506,7 +7804,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "vending-l"
+      name: "parking-meter-l"
       priority: 16849
       min_distance: 20
     }
@@ -7574,10 +7872,40 @@ cont {
 cont {
   name: "amenity-veterinary"
   element {
-    scale: 19
+    scale: 16
     symbol {
-      name: "none"
-      priority: 16000
+      name: "veterinary-m"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15849
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "veterinary-l"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15849
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "veterinary-l"
+      priority: 16849
     }
     caption {
       primary {
@@ -7585,17 +7913,40 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15849
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "veterinary-l"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15849
     }
   }
 }
 cont {
   name: "amenity-waste_basket"
+  element {
+    scale: 18
+    symbol {
+      name: "waste-basket-s"
+      apply_for_type: 1
+      priority: 16849
+    }
+  }
   element {
     scale: 19
     symbol {
-      name: "none"
-      priority: 16000
+      name: "waste-basket-s"
+      priority: 16849
     }
     caption {
       primary {
@@ -7603,7 +7954,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15000
+      priority: 15849
     }
   }
 }
@@ -10142,6 +10493,24 @@ cont {
 }
 cont {
   name: "emergency-phone"
+  element {
+    scale: 15
+    symbol {
+      name: "phone-m"
+      apply_for_type: 1
+      priority: 16863
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "phone-m"
+      apply_for_type: 1
+      priority: 16863
+      min_distance: 30
+    }
+  }
   element {
     scale: 17
     symbol {
@@ -34110,6 +34479,124 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-fitness_centre"
+  element {
+    scale: 13
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "gym-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gym-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "gym-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "gym-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "gym-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+}
 cont {
   name: "leisure-garden"
   element {
@@ -38913,42 +39400,94 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-sauna"
+  element {
+    scale: 15
+    symbol {
+      name: "sauna-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "sauna-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "sauna-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sauna-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "sauna-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+}
 cont {
   name: "leisure-sports_centre"
-  element {
-    scale: 13
-    symbol {
-      name: "pitch-s"
-      apply_for_type: 1
-      priority: 16068
-      min_distance: 50
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "pitch-s"
-      apply_for_type: 1
-      priority: 16068
-      min_distance: 50
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15500
-    }
-  }
   element {
     scale: 15
     symbol {
@@ -39040,7 +39579,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "pitch-s"
+      name: "climbing-s"
       apply_for_type: 1
       priority: 16068
       min_distance: 50
@@ -39057,7 +39596,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "pitch-s"
+      name: "climbing-s"
       apply_for_type: 1
       priority: 16068
       min_distance: 50
@@ -39074,7 +39613,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "pitch-m"
+      name: "climbing-m"
       apply_for_type: 1
       priority: 16068
       min_distance: 40
@@ -39091,7 +39630,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "pitch-m"
+      name: "climbing-m"
       apply_for_type: 1
       priority: 16068
       min_distance: 40
@@ -39108,7 +39647,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "pitch-l"
+      name: "climbing-l"
       apply_for_type: 1
       priority: 16068
       min_distance: 10
@@ -39125,7 +39664,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "pitch-l"
+      name: "climbing-l"
       apply_for_type: 1
       priority: 16068
       min_distance: 10
@@ -39142,7 +39681,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "pitch-l"
+      name: "climbing-l"
       apply_for_type: 1
       priority: 16068
       min_distance: 10
@@ -39172,7 +39711,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15500
+      priority: 15849
     }
   }
   element {
@@ -39188,7 +39727,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15500
+      priority: 15849
     }
   }
   element {
@@ -39277,7 +39816,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "pitch-s"
+      name: "swimming-s"
       apply_for_type: 1
       priority: 16068
       min_distance: 50
@@ -39294,7 +39833,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "pitch-s"
+      name: "swimming-s"
       apply_for_type: 1
       priority: 16068
       min_distance: 50
@@ -39311,7 +39850,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "pitch-m"
+      name: "swimming-m"
       apply_for_type: 1
       priority: 16068
       min_distance: 40
@@ -39328,7 +39867,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "pitch-m"
+      name: "swimming-m"
       apply_for_type: 1
       priority: 16068
       min_distance: 40
@@ -39345,7 +39884,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "pitch-l"
+      name: "swimming-l"
       apply_for_type: 1
       priority: 16068
       min_distance: 10
@@ -39396,40 +39935,6 @@ cont {
 }
 cont {
   name: "leisure-sports_centre-yoga"
-  element {
-    scale: 13
-    symbol {
-      name: "pitch-s"
-      apply_for_type: 1
-      priority: 16068
-      min_distance: 50
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "pitch-s"
-      apply_for_type: 1
-      priority: 16068
-      min_distance: 50
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 10
-      }
-      priority: 15500
-    }
-  }
   element {
     scale: 15
     symbol {
@@ -40101,6 +40606,89 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-chimney"
+  element {
+    scale: 15
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "chimney-l"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "chimney-l"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
@@ -40440,6 +41028,121 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-water_well"
+  element {
+    scale: 13
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+}
 cont {
   name: "man_made-windmill"
   element {
@@ -43833,11 +44536,28 @@ cont {
 }
 cont {
   name: "office-lawyer"
+  element {
+    scale: 17
+    symbol {
+      name: "lawyer-l"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
   element {
     scale: 18
     symbol {
       name: "office-l"
       priority: 16863
+      min_distance: 10
     }
     caption {
       primary {
@@ -43853,6 +44573,7 @@ cont {
     symbol {
       name: "office-l"
       priority: 16863
+      min_distance: 10
     }
     caption {
       primary {
@@ -62093,7 +62814,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16849
     }
     caption {
@@ -62108,7 +62829,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16849
     }
     caption {
@@ -62123,7 +62844,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16849
     }
     caption {
@@ -62375,7 +63096,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16849
     }
     caption {
@@ -62390,7 +63111,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16849
     }
     caption {
@@ -62405,7 +63126,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16849
     }
     caption {
@@ -62420,7 +63141,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16849
     }
     caption {
@@ -62435,7 +63156,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16849
     }
     caption {
@@ -62528,19 +63249,52 @@ cont {
 }
 cont {
   name: "shop-car_repair-tyres"
+  element {
+    scale: 13
+    symbol {
+      name: "car-repair-s"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car-repair-s"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 6
+      }
+      priority: 15500
+    }
+  }
   element {
     scale: 15
     symbol {
       name: "car-repair-m"
       priority: 16849
+      min_distance: 20
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15849
+      priority: 15500
     }
   }
   element {
@@ -62551,33 +63305,33 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15849
+      priority: 15500
     }
   }
   element {
     scale: 17
     symbol {
       name: "car-repair-l"
-      priority: 16849
+      priority: 16876
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 4473924
         offset_y: 10
       }
-      priority: 15849
+      priority: 15876
     }
   }
   element {
     scale: 18
     symbol {
       name: "car-repair-l"
-      priority: 16849
+      priority: 16876
     }
     caption {
       primary {
@@ -62585,14 +63339,14 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15849
+      priority: 15876
     }
   }
   element {
     scale: 19
     symbol {
       name: "car-repair-l"
-      priority: 16849
+      priority: 16876
     }
     caption {
       primary {
@@ -62600,7 +63354,7 @@ cont {
         color: 4473924
         offset_y: 10
       }
-      priority: 15849
+      priority: 15876
     }
   }
 }
@@ -62999,7 +63753,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16849
     }
     caption {
@@ -63014,7 +63768,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16849
     }
     caption {
@@ -63029,7 +63783,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16849
     }
     caption {
@@ -63044,7 +63798,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16849
     }
     caption {
@@ -63059,7 +63813,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16849
     }
     caption {
@@ -63077,7 +63831,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16849
     }
     caption {
@@ -63092,7 +63846,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16849
     }
     caption {
@@ -63107,7 +63861,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16849
     }
     caption {
@@ -63122,7 +63876,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16849
     }
     caption {
@@ -63137,7 +63891,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16849
     }
     caption {
@@ -63311,8 +64065,9 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16849
+      min_distance: 20
     }
     caption {
       primary {
@@ -63326,8 +64081,9 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16849
+      min_distance: 20
     }
     caption {
       primary {
@@ -63341,7 +64097,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16849
     }
     caption {
@@ -63356,7 +64112,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16849
     }
     caption {
@@ -63371,7 +64127,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16849
     }
     caption {
@@ -64513,7 +65269,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "climbing-m"
       priority: 16849
     }
     caption {
@@ -64528,7 +65284,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "climbing-m"
       priority: 16849
     }
     caption {
@@ -64543,7 +65299,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "climbing-l"
       priority: 16849
     }
     caption {
@@ -64558,7 +65314,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "climbing-l"
       priority: 16849
     }
     caption {
@@ -64573,7 +65329,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "climbing-l"
       priority: 16849
     }
     caption {
@@ -64591,7 +65347,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16849
     }
     caption {
@@ -64606,7 +65362,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16849
     }
     caption {
@@ -64621,7 +65377,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16849
     }
     caption {
@@ -64636,7 +65392,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16849
     }
     caption {
@@ -64651,7 +65407,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16849
     }
     caption {
@@ -64669,7 +65425,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16849
     }
     caption {
@@ -64684,7 +65440,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16849
     }
     caption {
@@ -64699,7 +65455,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16849
     }
     caption {
@@ -64714,7 +65470,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16849
     }
     caption {
@@ -64729,7 +65485,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16849
     }
     caption {
@@ -64747,7 +65503,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16849
     }
     caption {
@@ -64762,7 +65518,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16849
     }
     caption {
@@ -64777,7 +65533,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16849
     }
     caption {
@@ -64792,7 +65548,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16849
     }
     caption {
@@ -64807,7 +65563,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16849
     }
     caption {
@@ -65089,7 +65845,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16849
     }
     caption {
@@ -65104,7 +65860,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16849
     }
     caption {
@@ -65119,7 +65875,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16849
     }
     caption {
@@ -65134,7 +65890,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16849
     }
     caption {
@@ -65149,7 +65905,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16849
     }
     caption {
@@ -65323,7 +66079,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16849
     }
     caption {
@@ -65338,7 +66094,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16849
     }
     caption {
@@ -65353,7 +66109,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16849
     }
     caption {
@@ -65368,7 +66124,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16849
     }
     caption {
@@ -65383,7 +66139,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16849
     }
     caption {
@@ -65401,7 +66157,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16849
     }
     caption {
@@ -65416,7 +66172,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16849
     }
     caption {
@@ -65431,7 +66187,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16849
     }
     caption {
@@ -65446,7 +66202,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16849
     }
     caption {
@@ -65461,7 +66217,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16849
     }
     caption {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index c52406fc3acf50b046dcbe475d964ef07b8feda6..48ede560f8e3e05de9a771f23786812bfb197be2 100644
GIT binary patch
delta 2998
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

delta 780
zcmZ{hPiPZC6vlb8u}!Dhq%B6<loCayLJ8tO)E*QMDtZwiM!{-aH<M&B*@?TGmW7B1
zuZ3C`or9nh!9zv-6LqxMLaT=!gyKaLD;6Y0D`*QMcqqo*4YU>PX@>W{@Atl$H#sPl
z{`ek>Vc2U0!Xb-B!^QjIt#$4DaI2Ihs$!TCIW1`^MNP$ZLoyVqT55E|+8wxgxvyjr
zvZN8GQ5^4l3;(!jHk)@iaha$_O%&XTTbA53uNi5Y*K79UUE8+9E$d28mv!k(-s(9!
zyi(jt45BHjq?yhv*lmrSTkmFWkNY~r7!Hsu(NaW}&4{)C<gTl%z*zyVcklx@A>Hj6
zLO94yyoVrzDcH>DG^}CKHeqA!Huw%+!Z5p5f;O+5QL-28H?JyW10^_u`c2mF7q&QO
zwFIx>vEvT0Pi62jGzFXfGa|=|A0X<vi*U$^vd&}Dl(gy?UYUkHb^PaNxFhg|FL1iE
z=@b@eGO5TUl9BpMqOqzU9p!HVs8WUz_Gk{p*r8dJ<b`jj7qyH4_Umbyi`WZ_=OoS0
zZ_J{5?A3Sl5zPP_`hi;6F`qEWZZ9CrXXa78M|=TTta)h8WQ!H_U<HQiSz;)%i{Y1l
zp|21e1>EfF6Pmr{43Sj(=iD*p7f}O0_#2Hj2A%`<xgwf35|py>Ids?!>U#p%>vnR)
za9sXpfN`ymrUrFNO-pW_NJ&Z)E`6+O(_{6*019xxjjqLxcCm)x6Id`|8D^LoaZ`&=
S0XMkfK1C%CiI+uTzWXnzVJM&g

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 1d69bd8be5..6a5e520b7c 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -2527,10 +2527,11 @@ cont {
 cont {
   name: "amenity-bicycle_parking"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "none"
-      priority: 16000
+      name: "bike-parking-l"
+      priority: 16849
+      min_distance: 20
     }
     caption {
       primary {
@@ -2538,7 +2539,39 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15849
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "bike-parking-l"
+      priority: 16849
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15849
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "bike-parking-l"
+      priority: 16849
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15849
     }
   }
 }
@@ -3123,10 +3156,88 @@ cont {
 cont {
   name: "amenity-charging_station"
   element {
-    scale: 19
+    scale: 13
     symbol {
-      name: "none"
+      name: "charging-station-s"
       priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "charging-station-s"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "charging-station-m"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "charging-station-m"
+      priority: 16000
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "charging-station-l"
+      priority: 16876
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "charging-station-l"
+      priority: 16876
     }
     caption {
       primary {
@@ -3134,17 +3245,47 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15876
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "charging-station-l"
+      priority: 16876
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
     }
   }
 }
 cont {
   name: "amenity-childcare"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "none"
-      priority: 16000
+      name: "childcare-l"
+      priority: 16835
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15835
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "childcare-l"
+      priority: 16849
     }
     caption {
       primary {
@@ -3152,7 +3293,22 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15849
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "childcare-l"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15849
     }
   }
 }
@@ -3333,28 +3489,140 @@ cont {
 cont {
   name: "amenity-community_centre"
   element {
-    scale: 19
+    scale: 13
     symbol {
-      name: "none"
-      priority: 16000
+      name: "tourism-s"
+      priority: 16876
+      min_distance: 10
     }
     caption {
       primary {
-        height: 11
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "tourism-s"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "tourism-m"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15876
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "tourism-m"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "tourism-l"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "tourism-l"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "tourism-l"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
     }
   }
 }
 cont {
   name: "amenity-courthouse"
   element {
-    scale: 19
+    scale: 17
     symbol {
-      name: "none"
-      priority: 16000
+      name: "courthouse-l"
+      priority: 16876
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "courthouse-l"
+      priority: 16876
     }
     caption {
       primary {
@@ -3362,7 +3630,22 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15876
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "courthouse-l"
+      priority: 16876
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
     }
   }
 }
@@ -7471,10 +7754,25 @@ cont {
 }
 cont {
   name: "amenity-vending_machine-parking_tickets"
+  element {
+    scale: 16
+    symbol {
+      name: "parking-meter-m"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15849
+    }
+  }
   element {
     scale: 17
     symbol {
-      name: "vending-l"
+      name: "parking-meter-l"
       priority: 16849
       min_distance: 20
     }
@@ -7490,7 +7788,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "vending-l"
+      name: "parking-meter-l"
       priority: 16849
       min_distance: 20
     }
@@ -7506,7 +7804,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "vending-l"
+      name: "parking-meter-l"
       priority: 16849
       min_distance: 20
     }
@@ -7574,10 +7872,40 @@ cont {
 cont {
   name: "amenity-veterinary"
   element {
-    scale: 19
+    scale: 16
     symbol {
-      name: "none"
-      priority: 16000
+      name: "veterinary-m"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15849
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "veterinary-l"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15849
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "veterinary-l"
+      priority: 16849
     }
     caption {
       primary {
@@ -7585,17 +7913,40 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15849
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "veterinary-l"
+      priority: 16849
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15849
     }
   }
 }
 cont {
   name: "amenity-waste_basket"
+  element {
+    scale: 18
+    symbol {
+      name: "waste-basket-s"
+      apply_for_type: 1
+      priority: 16849
+    }
+  }
   element {
     scale: 19
     symbol {
-      name: "none"
-      priority: 16000
+      name: "waste-basket-s"
+      priority: 16849
     }
     caption {
       primary {
@@ -7603,7 +7954,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15000
+      priority: 15849
     }
   }
 }
@@ -10142,6 +10493,24 @@ cont {
 }
 cont {
   name: "emergency-phone"
+  element {
+    scale: 15
+    symbol {
+      name: "phone-m"
+      apply_for_type: 1
+      priority: 16863
+      min_distance: 30
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "phone-m"
+      apply_for_type: 1
+      priority: 16863
+      min_distance: 30
+    }
+  }
   element {
     scale: 17
     symbol {
@@ -34110,6 +34479,124 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-fitness_centre"
+  element {
+    scale: 13
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "gym-s"
+      priority: 16876
+      min_distance: 50
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "gym-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "gym-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "gym-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "gym-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "gym-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+}
 cont {
   name: "leisure-garden"
   element {
@@ -38913,42 +39400,94 @@ cont {
     }
   }
 }
+cont {
+  name: "leisure-sauna"
+  element {
+    scale: 15
+    symbol {
+      name: "sauna-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "sauna-m"
+      priority: 16876
+      min_distance: 40
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "sauna-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "sauna-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "sauna-l"
+      apply_for_type: 1
+      priority: 16068
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15500
+    }
+  }
+}
 cont {
   name: "leisure-sports_centre"
-  element {
-    scale: 13
-    symbol {
-      name: "pitch-s"
-      apply_for_type: 1
-      priority: 16068
-      min_distance: 50
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "pitch-s"
-      apply_for_type: 1
-      priority: 16068
-      min_distance: 50
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15500
-    }
-  }
   element {
     scale: 15
     symbol {
@@ -39040,7 +39579,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "pitch-s"
+      name: "climbing-s"
       apply_for_type: 1
       priority: 16068
       min_distance: 50
@@ -39057,7 +39596,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "pitch-s"
+      name: "climbing-s"
       apply_for_type: 1
       priority: 16068
       min_distance: 50
@@ -39074,7 +39613,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "pitch-m"
+      name: "climbing-m"
       apply_for_type: 1
       priority: 16068
       min_distance: 40
@@ -39091,7 +39630,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "pitch-m"
+      name: "climbing-m"
       apply_for_type: 1
       priority: 16068
       min_distance: 40
@@ -39108,7 +39647,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "pitch-l"
+      name: "climbing-l"
       apply_for_type: 1
       priority: 16068
       min_distance: 10
@@ -39125,7 +39664,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "pitch-l"
+      name: "climbing-l"
       apply_for_type: 1
       priority: 16068
       min_distance: 10
@@ -39142,7 +39681,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "pitch-l"
+      name: "climbing-l"
       apply_for_type: 1
       priority: 16068
       min_distance: 10
@@ -39172,7 +39711,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15500
+      priority: 15849
     }
   }
   element {
@@ -39188,7 +39727,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15500
+      priority: 15849
     }
   }
   element {
@@ -39277,7 +39816,7 @@ cont {
   element {
     scale: 13
     symbol {
-      name: "pitch-s"
+      name: "swimming-s"
       apply_for_type: 1
       priority: 16068
       min_distance: 50
@@ -39294,7 +39833,7 @@ cont {
   element {
     scale: 14
     symbol {
-      name: "pitch-s"
+      name: "swimming-s"
       apply_for_type: 1
       priority: 16068
       min_distance: 50
@@ -39311,7 +39850,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "pitch-m"
+      name: "swimming-m"
       apply_for_type: 1
       priority: 16068
       min_distance: 40
@@ -39328,7 +39867,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "pitch-m"
+      name: "swimming-m"
       apply_for_type: 1
       priority: 16068
       min_distance: 40
@@ -39345,7 +39884,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "pitch-l"
+      name: "swimming-l"
       apply_for_type: 1
       priority: 16068
       min_distance: 10
@@ -39396,40 +39935,6 @@ cont {
 }
 cont {
   name: "leisure-sports_centre-yoga"
-  element {
-    scale: 13
-    symbol {
-      name: "pitch-s"
-      apply_for_type: 1
-      priority: 16068
-      min_distance: 50
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15500
-    }
-  }
-  element {
-    scale: 14
-    symbol {
-      name: "pitch-s"
-      apply_for_type: 1
-      priority: 16068
-      min_distance: 50
-    }
-    caption {
-      primary {
-        height: 10
-        color: 5592405
-        offset_y: 10
-      }
-      priority: 15500
-    }
-  }
   element {
     scale: 15
     symbol {
@@ -40101,6 +40606,89 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-chimney"
+  element {
+    scale: 15
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "chimney-m"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "chimney-l"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "chimney-l"
+      priority: 16863
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15863
+    }
+  }
+}
 cont {
   name: "man_made-cutline"
   element {
@@ -40440,6 +41028,121 @@ cont {
     }
   }
 }
+cont {
+  name: "man_made-water_well"
+  element {
+    scale: 13
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "drinking-water-s"
+      priority: 16890
+      min_distance: 12
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 15
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 16
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 17
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "drinking-water-m"
+      priority: 16890
+      min_distance: 5
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 8
+      }
+      priority: 15890
+    }
+  }
+}
 cont {
   name: "man_made-windmill"
   element {
@@ -43833,11 +44536,28 @@ cont {
 }
 cont {
   name: "office-lawyer"
+  element {
+    scale: 17
+    symbol {
+      name: "lawyer-l"
+      priority: 16876
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 10
+      }
+      priority: 15876
+    }
+  }
   element {
     scale: 18
     symbol {
       name: "office-l"
       priority: 16863
+      min_distance: 10
     }
     caption {
       primary {
@@ -43853,6 +44573,7 @@ cont {
     symbol {
       name: "office-l"
       priority: 16863
+      min_distance: 10
     }
     caption {
       primary {
@@ -62093,7 +62814,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16849
     }
     caption {
@@ -62108,7 +62829,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16849
     }
     caption {
@@ -62123,7 +62844,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "bookmaker-l"
       priority: 16849
     }
     caption {
@@ -62375,7 +63096,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16849
     }
     caption {
@@ -62390,7 +63111,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-part-m"
       priority: 16849
     }
     caption {
@@ -62405,7 +63126,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16849
     }
     caption {
@@ -62420,7 +63141,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16849
     }
     caption {
@@ -62435,7 +63156,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "car-part-l"
       priority: 16849
     }
     caption {
@@ -62528,19 +63249,52 @@ cont {
 }
 cont {
   name: "shop-car_repair-tyres"
+  element {
+    scale: 13
+    symbol {
+      name: "car-repair-s"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15500
+    }
+  }
+  element {
+    scale: 14
+    symbol {
+      name: "car-repair-s"
+      priority: 16000
+      min_distance: 20
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 6
+      }
+      priority: 15500
+    }
+  }
   element {
     scale: 15
     symbol {
       name: "car-repair-m"
       priority: 16849
+      min_distance: 20
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15849
+      priority: 15500
     }
   }
   element {
@@ -62551,33 +63305,33 @@ cont {
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15849
+      priority: 15500
     }
   }
   element {
     scale: 17
     symbol {
       name: "car-repair-l"
-      priority: 16849
+      priority: 16876
     }
     caption {
       primary {
-        height: 11
+        height: 10
         color: 5592405
         offset_y: 10
       }
-      priority: 15849
+      priority: 15876
     }
   }
   element {
     scale: 18
     symbol {
       name: "car-repair-l"
-      priority: 16849
+      priority: 16876
     }
     caption {
       primary {
@@ -62585,14 +63339,14 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15849
+      priority: 15876
     }
   }
   element {
     scale: 19
     symbol {
       name: "car-repair-l"
-      priority: 16849
+      priority: 16876
     }
     caption {
       primary {
@@ -62600,7 +63354,7 @@ cont {
         color: 5592405
         offset_y: 10
       }
-      priority: 15849
+      priority: 15876
     }
   }
 }
@@ -62999,7 +63753,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16849
     }
     caption {
@@ -63014,7 +63768,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "copyshop-m"
       priority: 16849
     }
     caption {
@@ -63029,7 +63783,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16849
     }
     caption {
@@ -63044,7 +63798,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16849
     }
     caption {
@@ -63059,7 +63813,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "copyshop-l"
       priority: 16849
     }
     caption {
@@ -63077,7 +63831,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16849
     }
     caption {
@@ -63092,7 +63846,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "beauty-m"
       priority: 16849
     }
     caption {
@@ -63107,7 +63861,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16849
     }
     caption {
@@ -63122,7 +63876,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16849
     }
     caption {
@@ -63137,7 +63891,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "beauty-l"
       priority: 16849
     }
     caption {
@@ -63311,8 +64065,9 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16849
+      min_distance: 20
     }
     caption {
       primary {
@@ -63326,8 +64081,9 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "laundry-m"
       priority: 16849
+      min_distance: 20
     }
     caption {
       primary {
@@ -63341,7 +64097,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16849
     }
     caption {
@@ -63356,7 +64112,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16849
     }
     caption {
@@ -63371,7 +64127,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "laundry-l"
       priority: 16849
     }
     caption {
@@ -64513,7 +65269,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "climbing-m"
       priority: 16849
     }
     caption {
@@ -64528,7 +65284,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "climbing-m"
       priority: 16849
     }
     caption {
@@ -64543,7 +65299,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "climbing-l"
       priority: 16849
     }
     caption {
@@ -64558,7 +65314,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "climbing-l"
       priority: 16849
     }
     caption {
@@ -64573,7 +65329,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "climbing-l"
       priority: 16849
     }
     caption {
@@ -64591,7 +65347,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16849
     }
     caption {
@@ -64606,7 +65362,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "petshop-m"
       priority: 16849
     }
     caption {
@@ -64621,7 +65377,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16849
     }
     caption {
@@ -64636,7 +65392,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16849
     }
     caption {
@@ -64651,7 +65407,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "petshop-l"
       priority: 16849
     }
     caption {
@@ -64669,7 +65425,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16849
     }
     caption {
@@ -64684,7 +65440,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "photo-shop-m"
       priority: 16849
     }
     caption {
@@ -64699,7 +65455,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16849
     }
     caption {
@@ -64714,7 +65470,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16849
     }
     caption {
@@ -64729,7 +65485,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "photo-shop-l"
       priority: 16849
     }
     caption {
@@ -64747,7 +65503,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16849
     }
     caption {
@@ -64762,7 +65518,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "seafood-shop-m"
       priority: 16849
     }
     caption {
@@ -64777,7 +65533,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16849
     }
     caption {
@@ -64792,7 +65548,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16849
     }
     caption {
@@ -64807,7 +65563,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "seafood-shop-l"
       priority: 16849
     }
     caption {
@@ -65089,7 +65845,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16849
     }
     caption {
@@ -65104,7 +65860,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "ticket-shop-m"
       priority: 16849
     }
     caption {
@@ -65119,7 +65875,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16849
     }
     caption {
@@ -65134,7 +65890,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16849
     }
     caption {
@@ -65149,7 +65905,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "ticket-shop-l"
       priority: 16849
     }
     caption {
@@ -65323,7 +66079,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16849
     }
     caption {
@@ -65338,7 +66094,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "car-repair-m"
       priority: 16849
     }
     caption {
@@ -65353,7 +66109,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16849
     }
     caption {
@@ -65368,7 +66124,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16849
     }
     caption {
@@ -65383,7 +66139,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "car-repair-l"
       priority: 16849
     }
     caption {
@@ -65401,7 +66157,7 @@ cont {
   element {
     scale: 15
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16849
     }
     caption {
@@ -65416,7 +66172,7 @@ cont {
   element {
     scale: 16
     symbol {
-      name: "shop-m"
+      name: "alcohol-m"
       priority: 16849
     }
     caption {
@@ -65431,7 +66187,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16849
     }
     caption {
@@ -65446,7 +66202,7 @@ cont {
   element {
     scale: 18
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16849
     }
     caption {
@@ -65461,7 +66217,7 @@ cont {
   element {
     scale: 19
     symbol {
-      name: "shop-l"
+      name: "alcohol-l"
       priority: 16849
     }
     caption {