diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index 8ccedf1ea9..3e0b3a9640 100644
Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ
diff --git a/data/drules_proto.txt b/data/drules_proto.txt
index 4767c80ba2..5fb3a8f910 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -115960,7 +115960,7 @@ cont {
 cont {
   name: "shop-auction"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "auction-m"
       priority: 500
@@ -115976,46 +115976,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -116032,7 +115998,7 @@ cont {
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -116616,7 +116582,7 @@ cont {
 cont {
   name: "shop-bookmaker"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "lottery-m"
       priority: 500
@@ -116632,46 +116598,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -116688,7 +116620,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118080,28 +118012,12 @@ cont {
 }
 cont {
   name: "shop-collector"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 24
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118118,7 +118034,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118135,7 +118051,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -119334,40 +119250,6 @@ cont {
 }
 cont {
   name: "shop-fabric"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -119707,7 +119589,7 @@ cont {
 cont {
   name: "shop-funeral_directors"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "funeral_directors-m"
       priority: 500
@@ -119723,46 +119605,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -119779,7 +119627,7 @@ cont {
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -121247,7 +121095,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -121264,7 +121112,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -121281,7 +121129,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -124707,29 +124555,12 @@ cont {
 }
 cont {
   name: "shop-wholesale"
-  element {
-    scale: 17
-    symbol {
-      name: "wholesale-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -124746,7 +124577,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -124763,7 +124594,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 98fe36991b..0613990dbc 100644
Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ
diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt
index 2283017337..cfab49fbb8 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -111110,7 +111110,7 @@ cont {
 cont {
   name: "shop-auction"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "auction-m"
       priority: 500
@@ -111126,46 +111126,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -111182,7 +111148,7 @@ cont {
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -111766,7 +111732,7 @@ cont {
 cont {
   name: "shop-bookmaker"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "lottery-m"
       priority: 500
@@ -111782,46 +111748,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -111838,7 +111770,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -113230,28 +113162,12 @@ cont {
 }
 cont {
   name: "shop-collector"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 24
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -113268,7 +113184,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -113285,7 +113201,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -114484,40 +114400,6 @@ cont {
 }
 cont {
   name: "shop-fabric"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -114857,7 +114739,7 @@ cont {
 cont {
   name: "shop-funeral_directors"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "funeral_directors-m"
       priority: 500
@@ -114873,46 +114755,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -114929,7 +114777,7 @@ cont {
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -116397,7 +116245,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -116414,7 +116262,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -116431,7 +116279,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -119823,29 +119671,12 @@ cont {
 }
 cont {
   name: "shop-wholesale"
-  element {
-    scale: 17
-    symbol {
-      name: "wholesale-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -119862,7 +119693,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -119879,7 +119710,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index db945275e6..04fe60c5b6 100644
Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ
diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt
index e0f1237d93..2fa8663f69 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -110895,7 +110895,7 @@ cont {
 cont {
   name: "shop-auction"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "auction-m"
       priority: 500
@@ -110911,46 +110911,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -110967,7 +110933,7 @@ cont {
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -111551,7 +111517,7 @@ cont {
 cont {
   name: "shop-bookmaker"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "lottery-m"
       priority: 500
@@ -111567,46 +111533,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -111623,7 +111555,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -113015,28 +112947,12 @@ cont {
 }
 cont {
   name: "shop-collector"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 24
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -113053,7 +112969,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -113070,7 +112986,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -114269,40 +114185,6 @@ cont {
 }
 cont {
   name: "shop-fabric"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -114642,7 +114524,7 @@ cont {
 cont {
   name: "shop-funeral_directors"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "funeral_directors-m"
       priority: 500
@@ -114658,46 +114540,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -114714,7 +114562,7 @@ cont {
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -116182,7 +116030,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -116199,7 +116047,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -116216,7 +116064,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -119608,29 +119456,12 @@ cont {
 }
 cont {
   name: "shop-wholesale"
-  element {
-    scale: 17
-    symbol {
-      name: "wholesale-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -119647,7 +119478,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -119664,7 +119495,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index 7b36766f78..16cc5a2f80 100644
Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ
diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt
index 8622aa09a5..372276a8a4 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -116727,7 +116727,7 @@ cont {
 cont {
   name: "shop-auction"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "auction-m"
       priority: 500
@@ -116743,46 +116743,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -116799,7 +116765,7 @@ cont {
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -117383,7 +117349,7 @@ cont {
 cont {
   name: "shop-bookmaker"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "lottery-m"
       priority: 500
@@ -117399,46 +117365,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -117455,7 +117387,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118847,28 +118779,12 @@ cont {
 }
 cont {
   name: "shop-collector"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 24
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118885,7 +118801,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118902,7 +118818,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -120101,40 +120017,6 @@ cont {
 }
 cont {
   name: "shop-fabric"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -120474,7 +120356,7 @@ cont {
 cont {
   name: "shop-funeral_directors"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "funeral_directors-m"
       priority: 500
@@ -120490,46 +120372,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -120546,7 +120394,7 @@ cont {
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -122014,7 +121862,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -122031,7 +121879,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -122048,7 +121896,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -125440,29 +125288,12 @@ cont {
 }
 cont {
   name: "shop-wholesale"
-  element {
-    scale: 17
-    symbol {
-      name: "wholesale-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 9211020
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -125479,7 +125310,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -125496,7 +125327,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index 65723bc2d5..f96035dfd4 100644
Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ
diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt
index 578c058333..207546f5ed 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -116512,7 +116512,7 @@ cont {
 cont {
   name: "shop-auction"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "auction-m"
       priority: 500
@@ -116528,46 +116528,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "auction-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -116584,7 +116550,7 @@ cont {
     symbol {
       name: "auction-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -117168,7 +117134,7 @@ cont {
 cont {
   name: "shop-bookmaker"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "lottery-m"
       priority: 500
@@ -117184,46 +117150,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "lottery-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -117240,7 +117172,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118632,28 +118564,12 @@ cont {
 }
 cont {
   name: "shop-collector"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 24
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118670,7 +118586,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -118687,7 +118603,7 @@ cont {
     symbol {
       name: "shop-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -119886,40 +119802,6 @@ cont {
 }
 cont {
   name: "shop-fabric"
-  element {
-    scale: 16
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 17
-    symbol {
-      name: "shop-m"
-      priority: 500
-      min_distance: 10
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
@@ -120259,7 +120141,7 @@ cont {
 cont {
   name: "shop-funeral_directors"
   element {
-    scale: 16
+    scale: 18
     symbol {
       name: "funeral_directors-m"
       priority: 500
@@ -120275,46 +120157,12 @@ cont {
       priority: -9500
     }
   }
-  element {
-    scale: 17
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
-  element {
-    scale: 18
-    symbol {
-      name: "funeral_directors-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 19
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -120331,7 +120179,7 @@ cont {
     symbol {
       name: "funeral_directors-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -121799,7 +121647,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -121816,7 +121664,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -121833,7 +121681,7 @@ cont {
     symbol {
       name: "lottery-m"
       priority: 500
-      min_distance: 20
+      min_distance: 10
     }
     caption {
       primary {
@@ -125225,29 +125073,12 @@ cont {
 }
 cont {
   name: "shop-wholesale"
-  element {
-    scale: 17
-    symbol {
-      name: "wholesale-m"
-      priority: 500
-      min_distance: 24
-    }
-    caption {
-      primary {
-        height: 10
-        color: 4473924
-        offset_y: 1
-        is_optional: true
-      }
-      priority: -9500
-    }
-  }
   element {
     scale: 18
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -125264,7 +125095,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
@@ -125281,7 +125112,7 @@ cont {
     symbol {
       name: "wholesale-m"
       priority: 500
-      min_distance: 24
+      min_distance: 10
     }
     caption {
       primary {
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 3f93c67fc1..39c51a10f3 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -1132,15 +1132,15 @@ office-diplomatic                                   # icon z17- (also has captio
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
 shop-agrarian                                       # icon z18- (also has caption(optional) z18-)
-shop-auction                                        # icon z16- (also has caption(optional) z16-)
-shop-bookmaker                                      # icon z16- (also has caption(optional) z16-)
+shop-auction                                        # icon z18- (also has caption(optional) z18-)
+shop-bookmaker                                      # icon z18- (also has caption(optional) z18-)
 shop-carpet                                         # icon z18- (also has caption(optional) z18-)
-shop-collector                                      # icon z16- (also has caption(optional) z18-)
+shop-collector                                      # icon z18- (also has caption(optional) z18-)
 shop-craft                                          # icon z18- (also has caption(optional) z18-)
 shop-curtain                                        # icon z18- (also has caption(optional) z18-)
-shop-fabric                                         # icon z16- (also has caption(optional) z16-)
+shop-fabric                                         # icon z18- (also has caption(optional) z18-)
 shop-fishing                                        # icon z18- (also has caption(optional) z18-)
-shop-funeral_directors                              # icon z16- (also has caption(optional) z16-)
+shop-funeral_directors                              # icon z18- (also has caption(optional) z18-)
 shop-gas                                            # icon z18- (also has caption(optional) z18-)
 shop-hearing_aids                                   # icon z18- (also has caption(optional) z18-)
 shop-herbalist                                      # icon z18- (also has caption(optional) z18-)
@@ -1152,7 +1152,7 @@ shop-pet_grooming                                   # icon z18- (also has captio
 shop-storage_rental                                 # icon z18- (also has caption(optional) z18-)
 shop-trade                                          # icon z18- (also has caption(optional) z18-)
 shop-watches                                        # icon z18- (also has caption(optional) z18-)
-shop-wholesale                                      # icon z17- (also has caption(optional) z17-)
+shop-wholesale                                      # icon z18- (also has caption(optional) z18-)
 === 500
 
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
@@ -2054,15 +2054,15 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
 # shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
-# shop-auction                                      # caption(optional) z16- (also has icon z16-)
-# shop-bookmaker                                    # caption(optional) z16- (also has icon z16-)
+# shop-auction                                      # caption(optional) z18- (also has icon z18-)
+# shop-bookmaker                                    # caption(optional) z18- (also has icon z18-)
 # shop-carpet                                       # caption(optional) z18- (also has icon z18-)
-# shop-collector                                    # caption(optional) z18- (also has icon z16-)
+# shop-collector                                    # caption(optional) z18- (also has icon z18-)
 # shop-craft                                        # caption(optional) z18- (also has icon z18-)
 # shop-curtain                                      # caption(optional) z18- (also has icon z18-)
-# shop-fabric                                       # caption(optional) z16- (also has icon z16-)
+# shop-fabric                                       # caption(optional) z18- (also has icon z18-)
 # shop-fishing                                      # caption(optional) z18- (also has icon z18-)
-# shop-funeral_directors                            # caption(optional) z16- (also has icon z16-)
+# shop-funeral_directors                            # caption(optional) z18- (also has icon z18-)
 # shop-gas                                          # caption(optional) z18- (also has icon z18-)
 # shop-hearing_aids                                 # caption(optional) z18- (also has icon z18-)
 # shop-herbalist                                    # caption(optional) z18- (also has icon z18-)
@@ -2074,7 +2074,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-storage_rental                               # caption(optional) z18- (also has icon z18-)
 # shop-trade                                        # caption(optional) z18- (also has icon z18-)
 # shop-watches                                      # caption(optional) z18- (also has icon z18-)
-# shop-wholesale                                    # caption(optional) z17- (also has icon z17-)
+# shop-wholesale                                    # caption(optional) z18- (also has icon z18-)
 # === -9500
 
 # amenity-shower                                    # caption(optional) z17- (also has icon z17-)
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 1386c98d93..6dfc8b70c9 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -1132,15 +1132,15 @@ office-diplomatic                                   # icon z17- (also has captio
 office-ngo                                          # icon z18- (also has caption(optional) z18-)
 office-telecommunication                            # icon z18- (also has caption(optional) z18-)
 shop-agrarian                                       # icon z18- (also has caption(optional) z18-)
-shop-auction                                        # icon z16- (also has caption(optional) z16-)
-shop-bookmaker                                      # icon z16- (also has caption(optional) z16-)
+shop-auction                                        # icon z18- (also has caption(optional) z18-)
+shop-bookmaker                                      # icon z18- (also has caption(optional) z18-)
 shop-carpet                                         # icon z18- (also has caption(optional) z18-)
-shop-collector                                      # icon z16- (also has caption(optional) z18-)
+shop-collector                                      # icon z18- (also has caption(optional) z18-)
 shop-craft                                          # icon z18- (also has caption(optional) z18-)
 shop-curtain                                        # icon z18- (also has caption(optional) z18-)
-shop-fabric                                         # icon z16- (also has caption(optional) z16-)
+shop-fabric                                         # icon z18- (also has caption(optional) z18-)
 shop-fishing                                        # icon z18- (also has caption(optional) z18-)
-shop-funeral_directors                              # icon z16- (also has caption(optional) z16-)
+shop-funeral_directors                              # icon z18- (also has caption(optional) z18-)
 shop-gas                                            # icon z18- (also has caption(optional) z18-)
 shop-hearing_aids                                   # icon z18- (also has caption(optional) z18-)
 shop-herbalist                                      # icon z18- (also has caption(optional) z18-)
@@ -1152,7 +1152,7 @@ shop-pet_grooming                                   # icon z18- (also has captio
 shop-storage_rental                                 # icon z18- (also has caption(optional) z18-)
 shop-trade                                          # icon z18- (also has caption(optional) z18-)
 shop-watches                                        # icon z18- (also has caption(optional) z18-)
-shop-wholesale                                      # icon z17- (also has caption(optional) z17-)
+shop-wholesale                                      # icon z18- (also has caption(optional) z18-)
 === 500
 
 amenity-shower                                      # icon z17- (also has caption(optional) z17-)
@@ -2055,15 +2055,15 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # office-ngo                                        # caption(optional) z18- (also has icon z18-)
 # office-telecommunication                          # caption(optional) z18- (also has icon z18-)
 # shop-agrarian                                     # caption(optional) z18- (also has icon z18-)
-# shop-auction                                      # caption(optional) z16- (also has icon z16-)
-# shop-bookmaker                                    # caption(optional) z16- (also has icon z16-)
+# shop-auction                                      # caption(optional) z18- (also has icon z18-)
+# shop-bookmaker                                    # caption(optional) z18- (also has icon z18-)
 # shop-carpet                                       # caption(optional) z18- (also has icon z18-)
-# shop-collector                                    # caption(optional) z18- (also has icon z16-)
+# shop-collector                                    # caption(optional) z18- (also has icon z18-)
 # shop-craft                                        # caption(optional) z18- (also has icon z18-)
 # shop-curtain                                      # caption(optional) z18- (also has icon z18-)
-# shop-fabric                                       # caption(optional) z16- (also has icon z16-)
+# shop-fabric                                       # caption(optional) z18- (also has icon z18-)
 # shop-fishing                                      # caption(optional) z18- (also has icon z18-)
-# shop-funeral_directors                            # caption(optional) z16- (also has icon z16-)
+# shop-funeral_directors                            # caption(optional) z18- (also has icon z18-)
 # shop-gas                                          # caption(optional) z18- (also has icon z18-)
 # shop-hearing_aids                                 # caption(optional) z18- (also has icon z18-)
 # shop-herbalist                                    # caption(optional) z18- (also has icon z18-)
@@ -2075,7 +2075,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-storage_rental                               # caption(optional) z18- (also has icon z18-)
 # shop-trade                                        # caption(optional) z18- (also has icon z18-)
 # shop-watches                                      # caption(optional) z18- (also has icon z18-)
-# shop-wholesale                                    # caption(optional) z17- (also has icon z17-)
+# shop-wholesale                                    # caption(optional) z18- (also has icon z18-)
 # === -9500
 
 # amenity-shower                                    # caption(optional) z17- (also has icon z17-)