diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index a3234ee337..5d4c11c9ed 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 14cf0e64f5..658a3492f9 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -121368,24 +121368,36 @@ cont {
   name: "shop-pasta"
   element {
     scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin
index 33d7aa0da1..49e48da823 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 4cebf3e8d4..ad4b3d12b2 100644
--- a/data/drules_proto_default_dark.txt
+++ b/data/drules_proto_default_dark.txt
@@ -116896,24 +116896,36 @@ cont {
   name: "shop-pasta"
   element {
     scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin
index 3f73d2f4da..0a8d0ce045 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 8d08b06dc2..607ea116b4 100644
--- a/data/drules_proto_default_light.txt
+++ b/data/drules_proto_default_light.txt
@@ -116681,24 +116681,36 @@ cont {
   name: "shop-pasta"
   element {
     scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin
index f6337a59ac..09a68a5018 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 c3782d56b9..4ecc6ec380 100644
--- a/data/drules_proto_outdoors_dark.txt
+++ b/data/drules_proto_outdoors_dark.txt
@@ -121876,24 +121876,36 @@ cont {
   name: "shop-pasta"
   element {
     scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 9211020
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin
index d9330ec5e5..d8095194ce 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 7f49790148..6907b7a31f 100644
--- a/data/drules_proto_outdoors_light.txt
+++ b/data/drules_proto_outdoors_light.txt
@@ -121661,24 +121661,36 @@ cont {
   name: "shop-pasta"
   element {
     scale: 16
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
     scale: 17
+    symbol {
+      name: "shop-m"
+      priority: 2550
+      min_distance: 10
+    }
     caption {
       primary {
         height: 10
         color: 4473924
         offset_y: 1
+        is_optional: true
       }
-      priority: 2550
+      priority: -7450
     }
   }
   element {
diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt
index 23f9159655..cf9ca56b06 100644
--- a/data/styles/default/include/priorities_4_overlays.prio.txt
+++ b/data/styles/default/include/priorities_4_overlays.prio.txt
@@ -780,7 +780,7 @@ shop-butcher                                        # icon z16- (also has captio
 shop-cheese                                         # icon z16- (also has caption(optional) z16-)
 shop-chocolate                                      # icon z16- (also has caption(optional) z16-)
 shop-confectionery                                  # icon z16- (also has caption(optional) z16-)
-shop-pasta                                          # icon z18- and caption z16-17 (also has caption(optional) z18-)
+shop-pasta                                          # icon z16- (also has caption(optional) z16-)
 shop-pastry                                         # icon z16- (also has caption(optional) z16-)
 shop-seafood                                        # icon z16- (also has caption(optional) z16-)
 === 2550
@@ -1733,7 +1733,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-cheese                                       # caption(optional) z16- (also has icon z16-)
 # shop-chocolate                                    # caption(optional) z16- (also has icon z16-)
 # shop-confectionery                                # caption(optional) z16- (also has icon z16-)
-# shop-pasta                                        # caption(optional) z18- (also has icon z18-, caption z16-17)
+# shop-pasta                                        # caption(optional) z16- (also has icon z16-)
 # shop-pastry                                       # caption(optional) z16- (also has icon z16-)
 # shop-seafood                                      # caption(optional) z16- (also has icon z16-)
 # === -7450
diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
index 7981c4dd40..3ed9f27184 100644
--- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt
+++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt
@@ -780,7 +780,7 @@ shop-butcher                                        # icon z16- (also has captio
 shop-cheese                                         # icon z16- (also has caption(optional) z16-)
 shop-chocolate                                      # icon z16- (also has caption(optional) z16-)
 shop-confectionery                                  # icon z16- (also has caption(optional) z16-)
-shop-pasta                                          # icon z18- and caption z16-17 (also has caption(optional) z18-)
+shop-pasta                                          # icon z16- (also has caption(optional) z16-)
 shop-pastry                                         # icon z16- (also has caption(optional) z16-)
 shop-seafood                                        # icon z16- (also has caption(optional) z16-)
 === 2550
@@ -1733,7 +1733,7 @@ leisure-swimming_pool-private                       # icon z17- (also has captio
 # shop-cheese                                       # caption(optional) z16- (also has icon z16-)
 # shop-chocolate                                    # caption(optional) z16- (also has icon z16-)
 # shop-confectionery                                # caption(optional) z16- (also has icon z16-)
-# shop-pasta                                        # caption(optional) z18- (also has icon z18-, caption z16-17)
+# shop-pasta                                        # caption(optional) z16- (also has icon z16-)
 # shop-pastry                                       # caption(optional) z16- (also has icon z16-)
 # shop-seafood                                      # caption(optional) z16- (also has icon z16-)
 # === -7450