From 9deaa9c9eb984d8b51935d9de6036a130c0e7c33 Mon Sep 17 00:00:00 2001
From: Viktor Govako <viktor.govako@gmail.com>
Date: Sun, 27 Nov 2022 19:50:09 +0300
Subject: [PATCH] [styles] Regenerated.

Signed-off-by: Viktor Govako <viktor.govako@gmail.com>
---
 data/drules_proto.bin       | Bin 324146 -> 323188 bytes
 data/drules_proto.txt       | 298 +-----------------------------------
 data/drules_proto_clear.bin | Bin 324761 -> 323803 bytes
 data/drules_proto_clear.txt | 298 +-----------------------------------
 data/drules_proto_dark.bin  | Bin 323093 -> 322135 bytes
 data/drules_proto_dark.txt  | 298 +-----------------------------------
 6 files changed, 6 insertions(+), 888 deletions(-)

diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index bfcaad16a02faea857171702ce32404ca14b36c7..1be10d28ad91afa8909563dfbaf467353d08e083 100644
GIT binary patch
delta 1506
zcma)6OK1~O6y+sXjISE=DNPiupQ30*L~!R)unW<Jih?f2m*gcGoy^3Um&EvKQ%qG#
zps3N;h!ritAElrc#*GM~pv8r_69iqT-3YpHsp!n4nQWRDcW-gdz2~0u?tT0v{Oe=5
zR7Pb_**gQH^2$60BdujaAzz^1kC*sx;N_*uo=qtFhd=s`!u-=9?BRXK;Yr^RUS=b=
z5|zm(bJP%0dQW3t1FbV5aN{t-%N=Bl#EMc%(-Qw#IYv^#%I2XA>;qSJOv^dC#hl$b
zkVWgx;Vwr~JWZ)V#f*Vd5b?AaS~5x7Go%}E&|G{5%HFkSF>dtGNm6W)3r!GNFN)Q?
z8G>$a%Tub*IMd}gQN*<2^YF^Eeh@EpBqe1dEvp^eox1=Bd}x&K9D`Nj;&Wp#+bXVT
zjL{Bb@cmceTQ^7ZdNRZ?NXl`QADe<Ge_n+(eA_tq_;?it&<Ourg@{lDzjzJauBag#
zbSBJbDlJM1RTEUVc|7m{qGt6v-1hX$AnbQQDlOP;RVN*Oqy~3Th5xQWZ@W&W74Ix^
z<H{1b!EL`-uW!P1<Zg2VvZSEKbnV2vrilr-vZ2&elcjnxm+9o3`TiF8z3z83XrW_}
zrAau9B2Swl3`Ur2+0%%KZ|9cZJ$0z`k02a&d@-1&TfRuTWlj5!W&W+hPvqVKMoBx{
z8aJkL4_>%GkZCazk85JakNZ$}&1O1DwBI}Xift|<9C8M*uz9LTcD8ZxKJgC^;n@zC
zm?yeSSy8ebSg4s@Ea;@&#ox)Wns1qcAU`?@Vbgl$kvm_3FzdF64_zzzLRwR(L6n7B
Nwyw1KbsF~W`UmY;*}(t+

delta 1194
zcmZ`(O=}ZD7-o`JX(lx`O>J!zwDBzX2RvyHUc3}h5DAmbq}g?|v)!3A1jMhlNDEPG
z#gVoeD-Eqx3Kek?@!|)FcoTZ^D1t{p@apcSak?8lzt6nS$NTL5`kHzEEpv4WO~t0-
zFJM;hzK1aI60>`=T|M%r0Y~J!NigJvX-LSV0qgr32=DO$M~Nl$@e1W(WX}S^U9Gtz
z!lQv@g!cxcJjvH`V~iF4`#4X=!jC0efQ0+ngb`2@@~jeQh(LX@?(8_6+m(5Ma5A9O
zN|bW?FQ8F{R7}<<A%QhkEYb+b{au54ymtv<+*;(2V#Jsl7KrZDLL}UsxeUp;@=i^v
z2}jq68NwOv{_F4|*7p$M?trJL^O9~wQgA(Mqg`lSZr0&oJai)W_)Yk<<Gsm*pb;^K
zyfFvg`&QZ<Wx_cb3meYLS9jp_fhNM4Ku4Jte6cxRv28Q#&5*a|;q%}Vgwri3vuG`6
zQma6nwz*+<`Yx=-`rjj*3P2XE`kdC^42R{YgxlF?2oJRY6)zs4Gpj{O%N{n;6W6&9
zSCER`Cc4_U-B_<L8;4%D8)uWMm3P?1mauFJ@AkRm<_|O|M;75)|D(1(n>xixxg$CE
z)DooPs!yC&JFm0VfU{`eW1Ex<;``XKYgnFHhIth(7tHa($T^<JjzZXvp^4P@Bq(Wz
zx@~c81>UN{2$m<B#v+(6O;}Mu35OKI=Qf7CHuMI;d&3E8=KSMm(L-Nag*OU0K^&cm
zTF#fR)}gd)tifS<ejPG$V-3>o;u_2#rLanb_ZdcRsgkdjm`OP?)kgo{!`)*~;pB-w
D5Biye

diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index b1e4b74243..aba6ed0e57 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -90873,11 +90873,6 @@ cont {
   name: "shop"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90889,11 +90884,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91010,11 +91000,6 @@ cont {
   name: "shop-antiques"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91026,11 +91011,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91077,11 +91057,6 @@ cont {
   name: "shop-art"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91093,11 +91068,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91144,11 +91114,6 @@ cont {
   name: "shop-baby_goods"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91160,11 +91125,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91211,11 +91171,6 @@ cont {
   name: "shop-bag"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91227,11 +91182,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91698,11 +91648,6 @@ cont {
   name: "shop-boutique"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91714,11 +91659,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92271,11 +92211,6 @@ cont {
   name: "shop-cheese"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92287,11 +92222,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92548,11 +92478,6 @@ cont {
   name: "shop-coffee"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92564,11 +92489,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92965,11 +92885,6 @@ cont {
   name: "shop-craft"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92981,11 +92896,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93032,11 +92942,6 @@ cont {
   name: "shop-dairy"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93048,11 +92953,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93379,11 +93279,6 @@ cont {
   name: "shop-electrical"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93395,11 +93290,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93723,11 +93613,6 @@ cont {
   name: "shop-fishing"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93739,11 +93624,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94560,11 +94440,6 @@ cont {
   name: "shop-interior_decoration"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94576,11 +94451,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94907,11 +94777,6 @@ cont {
   name: "shop-lottery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94923,11 +94788,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95073,11 +94933,6 @@ cont {
   name: "shop-massage"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95090,7 +94945,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16613
       min_distance: 10
     }
@@ -95099,6 +94954,7 @@ cont {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15613
     }
@@ -95142,11 +94998,6 @@ cont {
   name: "shop-medical_supply"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95158,11 +95009,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95279,11 +95125,6 @@ cont {
   name: "shop-money_lender"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95559,11 +95400,6 @@ cont {
   name: "shop-newsagent"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95629,11 +95465,6 @@ cont {
   name: "shop-nutrition_supplements"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95645,11 +95476,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95836,11 +95662,6 @@ cont {
   name: "shop-paint"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95852,11 +95673,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95973,11 +95789,6 @@ cont {
   name: "shop-pawnbroker"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16650
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96043,11 +95854,6 @@ cont {
   name: "shop-perfumery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96059,11 +95865,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96390,11 +96191,6 @@ cont {
   name: "shop-sewing"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96406,11 +96202,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96597,11 +96388,6 @@ cont {
   name: "shop-stationery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96667,11 +96453,6 @@ cont {
   name: "shop-storage_rental"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96683,11 +96464,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96903,11 +96679,6 @@ cont {
   name: "shop-tea"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96919,11 +96690,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97040,11 +96806,6 @@ cont {
   name: "shop-tobacco"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97056,11 +96817,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97177,11 +96933,6 @@ cont {
   name: "shop-trade"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97193,11 +96944,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97244,11 +96990,6 @@ cont {
   name: "shop-travel_agency"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97260,11 +97001,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97381,11 +97117,6 @@ cont {
   name: "shop-variety_store"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97397,11 +97128,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 8
-    }
     caption {
       primary {
         height: 11
@@ -97588,11 +97314,6 @@ cont {
   name: "shop-watches"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97604,11 +97325,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97655,11 +97371,6 @@ cont {
   name: "shop-wholesale"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97671,11 +97382,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index 897847ac1d758e506877b21215f9e303d2e96e7d..5530637380d8960d514712d4f14501e26a64965b 100644
GIT binary patch
delta 1517
zcma)6O=}ZT6y+sXNMAM0M@dppyC}A$elGk4Zd?e3;-b0=FPWEQa568>yi7>3wS^S4
zHpEornS~#rHQ>gD7RHsR=%(mWL0omAQ2Y&olSwmK<&C>xIOpDT&$;im4&p!e<Eu4P
z3)F(UFriFZ7|a4I#bTkzTo{jpaOBgSW?&Yj{#KoTQSo61u8Y?SyqUd?k9Cn}iO$uV
zWok+(Q%gA1LmONQJiUhSn2XGiOf{WnO!?2s8IqS)wtwYe9z59@R(5sEIo~uON2ZtY
zs4FR3pwy&t#&-jffdPZ%a@2=WFGD?e>K4Ym9tO$DE%KlWQH^dY!;`YFEx~wj;3?H;
zmK$o8XmVO)1wIF6R`5|*Qcg7ss_x^iwFXy1XhZDXh2u%7CTj!s2E{eTIrSMs?APJ<
zxIl+`io`TY-gQ;9JCG9d4VV<~wjd;C8gLn{3)X<7RD?*}hc6Q?grn|+MW)kgTBEu`
zjjl6dVH;BRR1=;D61xb8U64*I-L|@$jyQM#ZL}%wJ%p3;PENcd_N7N)AuqTRQF~Q}
zKe0stuaceqTPTr=o-x>sLv?2!!`9qtUss75xpL9ZLz}c99P}2`q!r&t$DY6<O1|xj
zFgf9>V^l9J@xJLe|KcfZo?k~e?mA?0W;hO|4aX$E75nkbDej#GPKk6Q#n(1`^cIq{
z49RAhoN-|rc09+qK@|BjJXb?F=1$>YEvluvQD=ufFWWhU33SmTS;SB&uco^e3~l7b
xJt`J*a6)Juh>AbU5VxH#3wg6u2zSnm{N@d^uN0U@O`;8L=^ku*`X!iG{sETiw1NNt

delta 1194
zcmZ`(&ubGw7-f=AX{WU&O-$Na)W);_gB}E_;K7T>Fxj0XyKZ*Uok>GLT9G0ZtUsuB
zFxLK}rC7w1xThWz1wl`WAm~9w3ZC@hRo&fmo$dzD-`n@S_r5p#@k{33_sr!PG?SP~
zK7nDqe*t0ORaPG?^rYk|0mtR}DKKTqf?nCyVe8N`!Uuf731SOlqCt5SnQ9~4)0sOW
zI?Asid@vZ5NU2q<FsA?a;}WSvKbF7mK(9MqfzzNQlvpFs5QVy)Sh6qk0O7u1n^vWi
z(-`LG1mqKPbP9U0#>!<HpI;R)mmFL~7<V`vQjXbCL!B5-E5gs+p%(Ndm1AmAO*n=|
ztO(9@H!s1<M0N?`{$Nkp;8nwpd-v0Ke@(-9589F^XJItieI57xEIix8WHBLVOqMBg
z*I_5S9&W1<&PgR|y&%ub!MVd52xkICHLClvi@Z^<TTz#$JaPlx3_nCT-GMTjwu%<D
zb?SsR$K32q*i7VJAUqI&Y})j9+W*oVlV5Mct->ROM>>Fp7nCrV-C0R%9yZn!7tO;o
zQU|CLL-Fl4*6YjTqff)e)k)JXIqYIbSYZI~_jgIMgNEe0yKp7966&i{r`)J@CFg!v
zfPthc6{pRvJGrzC7f}9HxReXx``E)ZCcoW>c@-`f%<;k~I-bX_YW!LB*wlLxl!T$~
zT70_%&sB8<D-lg&F-&#^)>Tl#A$s)O=7`sZ!60~VI7zLde;h4-=<QY5R>(=>7*w>1
zzI;W8((>~f9Fwn?AtQgRLE8Pa2G@{M*d)Sxi?Lg(<eODyQBEwy=>L1TJFx-g*}qjw
Bc$)wK

diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 40d0504311..90b7782775 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -90369,11 +90369,6 @@ cont {
   name: "shop"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90385,11 +90380,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90506,11 +90496,6 @@ cont {
   name: "shop-antiques"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90522,11 +90507,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90573,11 +90553,6 @@ cont {
   name: "shop-art"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90589,11 +90564,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90640,11 +90610,6 @@ cont {
   name: "shop-baby_goods"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90656,11 +90621,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90707,11 +90667,6 @@ cont {
   name: "shop-bag"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90723,11 +90678,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91194,11 +91144,6 @@ cont {
   name: "shop-boutique"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91210,11 +91155,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91767,11 +91707,6 @@ cont {
   name: "shop-cheese"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91783,11 +91718,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92044,11 +91974,6 @@ cont {
   name: "shop-coffee"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92060,11 +91985,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92461,11 +92381,6 @@ cont {
   name: "shop-craft"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92477,11 +92392,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92528,11 +92438,6 @@ cont {
   name: "shop-dairy"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92544,11 +92449,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92875,11 +92775,6 @@ cont {
   name: "shop-electrical"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92891,11 +92786,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93219,11 +93109,6 @@ cont {
   name: "shop-fishing"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93235,11 +93120,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94056,11 +93936,6 @@ cont {
   name: "shop-interior_decoration"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94072,11 +93947,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94403,11 +94273,6 @@ cont {
   name: "shop-lottery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94419,11 +94284,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94569,11 +94429,6 @@ cont {
   name: "shop-massage"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94586,7 +94441,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16613
       min_distance: 10
     }
@@ -94595,6 +94450,7 @@ cont {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
       priority: 15613
     }
@@ -94638,11 +94494,6 @@ cont {
   name: "shop-medical_supply"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94654,11 +94505,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94775,11 +94621,6 @@ cont {
   name: "shop-money_lender"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95055,11 +94896,6 @@ cont {
   name: "shop-newsagent"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95125,11 +94961,6 @@ cont {
   name: "shop-nutrition_supplements"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95141,11 +94972,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95332,11 +95158,6 @@ cont {
   name: "shop-paint"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95348,11 +95169,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95469,11 +95285,6 @@ cont {
   name: "shop-pawnbroker"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16650
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95539,11 +95350,6 @@ cont {
   name: "shop-perfumery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95555,11 +95361,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95886,11 +95687,6 @@ cont {
   name: "shop-sewing"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95902,11 +95698,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96093,11 +95884,6 @@ cont {
   name: "shop-stationery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96163,11 +95949,6 @@ cont {
   name: "shop-storage_rental"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96179,11 +95960,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96367,11 +96143,6 @@ cont {
   name: "shop-tea"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96383,11 +96154,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96504,11 +96270,6 @@ cont {
   name: "shop-tobacco"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96520,11 +96281,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96641,11 +96397,6 @@ cont {
   name: "shop-trade"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96657,11 +96408,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96708,11 +96454,6 @@ cont {
   name: "shop-travel_agency"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96724,11 +96465,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96845,11 +96581,6 @@ cont {
   name: "shop-variety_store"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96861,11 +96592,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 8
-    }
     caption {
       primary {
         height: 11
@@ -97052,11 +96778,6 @@ cont {
   name: "shop-watches"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97068,11 +96789,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97119,11 +96835,6 @@ cont {
   name: "shop-wholesale"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97135,11 +96846,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 29f21a624b937238dd3e44b84ec6f49154e58043..c613aa2fd49a5cfad13bace29290be724c05f858 100644
GIT binary patch
delta 1608
zcma)7L2DC17-f>LkWOvdCT$Zhiilbx)q~#jB<P_?MG@>lHcmE^WO1_-XD5wSYg^oc
zZQ6<z9ir4m6b}ksEUq3rsCe@tSiFcwPyPW9g2^V?oZ88480LNNeeZqy?Sr4uAK#<1
z4srrca05<hyC*T&IaY{7Lj8#_?hfJp&6k^j5fuM7Rl6IIM1$zVbvP}5Y4B!b2KUxq
zj}l85SBunE!uDRrp$38r<zqA_zg>oCOr^yynj%?cQFkB(<KQb#v7#qkiK{o<?cyv<
zbnTzUJzf)fj#8U;2<^#3IM9Z&OopnV?t2Ey!F@L|ZV+;kQTygUPZNXJW7|GT*AXxn
zJT!-JpGQJXsta!D#8g91T!Sxx1Gn%F51BFSoMEXmXn6VR28@M{Eg~HEz=kC#HyBT*
zsm?eN2D6m>%|Z@*Y>P0Ns1;JTEqm|4??H*0+VjM=N!Ck5Y7%zJ3k$GEjxWHOBl8GH
zJ&AdmuG^Bdi-m&O0mI2f_=+mBuM9)MS_*P{4dU+EGE@V@8wiKJnieh9c`YwiIkW;#
z(UNpmV3%_2U3wR0kRNt|)ErbhcKaT@j=gAQT_7bZ#n~0g>qt4V3ag3Pmb3!pnPR>Z
zFWu$)5DxmoZPQXGW8fZ_a1q7cwZz!MOT9@b|CAvvk5=HI99@D?<D@lD2{bRY3dGbV
zbv>$a_!~k{qPFPoWBBCHv|uTs>r9Qhv<A=pFa#%Q_1BFYS$zV-+cxob9fIhvgK)$f
xmr246DyEXQV0=pg_gob|AisqY5w%UFUe4|0OF3pzo0wZN`2PX-{4@AG_8+(=$+7?d

delta 1187
zcmZ`&OKTHR6y_#JNv3W3nA)OI(Lz_!l|MicyUC(kU3Ivb+(`!K<=mTz(S@(z11dIH
zb0r$1(1MCP#Q{qfih>Jw3T|8r{t4+kOec4uyJ60E&-otb{P-?E{3%~+p;o4qeGAL0
z;~gXct=Z1ZLT-w;EjY%nTmqBttiqcEeI!kUwIysZ{bHR^5j53BQZBB$Of1bmN77_e
zD&ulfsoHkszmLnfDn9m23@eaKFWdEKyod@Z=KW<2&hL|ZNE(Z#sWn0<`4@1}fI?;n
zXloit1DEav9k(rLWoMosNs2qVSWAgZiWRK8O<|hnpQSLCP4p9ksLa(>YzR2h|K`Ex
z%<NMnjYo4doz`?K<wUIU_+=>N&?|1-fWz65nDRcl2_J?!88%}iMa$%8Zo#kF&A~Ji
zQ;Msi{zcAi!%A@rNpi%<B$bf1LhFuWh$>B9x&vPizC_Y=47DxNR19KOh`T4#KXn&g
zWad60sStrI(g<f-LvBv2K^wj1{WUl$3iE>~uA;<f2kXP{q7@CcB+pOYhppnf!Lm8H
zVU=C`Ld;^JAnoVM131!IhwF3C20R?%YISqOAs^aM$R-;?Nn<1rzr6wH(EOLdJjyWB
z1MS0ZPj+A<F_ALc4MZz$pnGHmPVk^xaz%{bJ@eu#{PPGtCM&}1GFDYPg*n}Y&BQ3?
z;))onc_>JICQ2YEdc;t|5Y%*_zaPU+g7mPf6V_Bh`eHko7ke<xx7XqCSFsDSAN=!B
c!nA=|aEYmlPZDU<Y=cm2h@CyZ*N69|T~6wH=l}o!

diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index 4be3439a70..c33f185252 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -90454,11 +90454,6 @@ cont {
   name: "shop"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90470,11 +90465,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90591,11 +90581,6 @@ cont {
   name: "shop-antiques"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90607,11 +90592,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90658,11 +90638,6 @@ cont {
   name: "shop-art"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90674,11 +90649,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90725,11 +90695,6 @@ cont {
   name: "shop-baby_goods"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90741,11 +90706,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90792,11 +90752,6 @@ cont {
   name: "shop-bag"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -90808,11 +90763,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91279,11 +91229,6 @@ cont {
   name: "shop-boutique"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91295,11 +91240,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91852,11 +91792,6 @@ cont {
   name: "shop-cheese"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -91868,11 +91803,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92129,11 +92059,6 @@ cont {
   name: "shop-coffee"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92145,11 +92070,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92546,11 +92466,6 @@ cont {
   name: "shop-craft"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92562,11 +92477,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92613,11 +92523,6 @@ cont {
   name: "shop-dairy"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92629,11 +92534,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92960,11 +92860,6 @@ cont {
   name: "shop-electrical"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -92976,11 +92871,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93304,11 +93194,6 @@ cont {
   name: "shop-fishing"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -93320,11 +93205,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94141,11 +94021,6 @@ cont {
   name: "shop-interior_decoration"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94157,11 +94032,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94488,11 +94358,6 @@ cont {
   name: "shop-lottery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94504,11 +94369,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94654,11 +94514,6 @@ cont {
   name: "shop-massage"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94671,7 +94526,7 @@ cont {
   element {
     scale: 17
     symbol {
-      name: "shop-m"
+      name: "sauna-m"
       priority: 16613
       min_distance: 10
     }
@@ -94680,6 +94535,7 @@ cont {
         height: 10
         color: 5592405
         offset_y: 1
+        is_optional: true
       }
       priority: 15613
     }
@@ -94723,11 +94579,6 @@ cont {
   name: "shop-medical_supply"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94739,11 +94590,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -94860,11 +94706,6 @@ cont {
   name: "shop-money_lender"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95140,11 +94981,6 @@ cont {
   name: "shop-newsagent"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95210,11 +95046,6 @@ cont {
   name: "shop-nutrition_supplements"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95226,11 +95057,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95417,11 +95243,6 @@ cont {
   name: "shop-paint"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95433,11 +95254,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95554,11 +95370,6 @@ cont {
   name: "shop-pawnbroker"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16650
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95624,11 +95435,6 @@ cont {
   name: "shop-perfumery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95640,11 +95446,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95971,11 +95772,6 @@ cont {
   name: "shop-sewing"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -95987,11 +95783,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96178,11 +95969,6 @@ cont {
   name: "shop-stationery"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96248,11 +96034,6 @@ cont {
   name: "shop-storage_rental"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96264,11 +96045,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96452,11 +96228,6 @@ cont {
   name: "shop-tea"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96468,11 +96239,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96589,11 +96355,6 @@ cont {
   name: "shop-tobacco"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96605,11 +96366,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96726,11 +96482,6 @@ cont {
   name: "shop-trade"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96742,11 +96493,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96793,11 +96539,6 @@ cont {
   name: "shop-travel_agency"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96809,11 +96550,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96930,11 +96666,6 @@ cont {
   name: "shop-variety_store"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -96946,11 +96677,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 8
-    }
     caption {
       primary {
         height: 11
@@ -97137,11 +96863,6 @@ cont {
   name: "shop-watches"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97153,11 +96874,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97204,11 +96920,6 @@ cont {
   name: "shop-wholesale"
   element {
     scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10
@@ -97220,11 +96931,6 @@ cont {
   }
   element {
     scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 16613
-      min_distance: 10
-    }
     caption {
       primary {
         height: 10