diff --git a/data/classificator.txt b/data/classificator.txt
index 82a622e4c7..6418a4cc33 100644
--- a/data/classificator.txt
+++ b/data/classificator.txt
@@ -234,6 +234,8 @@ world  +
         gardener  -
         handicraft  -
         hvac  -
+        key_cutter  -
+        locksmith  -
         metal_construction  -
         painter  -
         photographer  -
@@ -1108,25 +1110,31 @@ world  +
         shuttle_train  -
         {}
     shop  +
+        agrarian  -
         alcohol  -
         antiques  -
+        appliance  -
         art  -
         baby_goods  -
         bag  -
         bakery  -
+        bathroom_furnishing  -
         beauty  -
+        bed  -
         beverages  -
         bicycle  -
         bookmaker  -
         books  -
         boutique  -
         butcher  -
+        cannabis  -
         car  -
         car_parts  -
         car_repair  +
             tyres  -
             {}
         caravan  -
+        carpet  -
         charity  -
         cheese  -
         chemist  -
@@ -1139,6 +1147,7 @@ world  +
         copyshop  -
         cosmetics  -
         craft  -
+        curtain  -
         dairy  -
         deli  -
         department_store  -
@@ -1149,17 +1158,21 @@ world  +
         erotic  -
         fabric  -
         farm  -
+        fashion_accessories  -
         fishing  -
         florist  -
         funeral_directors  -
         furniture  -
         garden_centre  -
+        gas  -
         gift  -
         greengrocer  -
         grocery  -
         hairdresser  -
         hardware  -
         health_food  -
+        herbalist  -
+        hifi  -
         houseware  -
         interior_decoration  -
         jewelry  -
@@ -1173,17 +1186,20 @@ world  +
         mobile_phone  -
         money_lender  -
         motorcycle  -
+        motorcycle_repair  -
         music  -
         musical_instrument  -
         newsagent  -
         nutrition_supplements  -
         optician  -
         outdoor  -
+        outpost  -
         paint  -
         pastry  -
         pawnbroker  -
         perfumery  -
         pet  -
+        pet_grooming  -
         photo  -
         seafood  -
         second_hand  -
diff --git a/data/drules_proto.bin b/data/drules_proto.bin
index bcb427f70e..0dc9873c20 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 cc823999ad..3d6df7578f 100644
--- a/data/drules_proto.txt
+++ b/data/drules_proto.txt
@@ -13074,6 +13074,76 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-key_cutter"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+}
+cont {
+  name: "craft-locksmith"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "craft-metal_construction"
   element {
@@ -90083,6 +90153,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-agrarian"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-alcohol"
   element {
@@ -90210,6 +90337,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-appliance"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-art"
   element {
@@ -90451,6 +90635,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-bathroom_furnishing"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-beauty"
   element {
@@ -90521,6 +90762,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-bed"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-beverages"
   element {
@@ -90928,6 +91226,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-cannabis"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-car"
   element {
@@ -91294,6 +91649,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-carpet"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-charity"
   element {
@@ -92095,6 +92507,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-curtain"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-dairy"
   element {
@@ -92766,6 +93235,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-fashion_accessories"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-fishing"
   element {
@@ -93103,6 +93629,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-gas"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-gift"
   element {
@@ -93523,6 +94106,120 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-herbalist"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
+cont {
+  name: "shop-hifi"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-houseware"
   element {
@@ -94413,6 +95110,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-motorcycle_repair"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-music"
   element {
@@ -94815,6 +95569,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-outpost"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-paint"
   element {
@@ -95134,6 +95945,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-pet_grooming"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-photo"
   element {
diff --git a/data/drules_proto_clear.bin b/data/drules_proto_clear.bin
index a2c3b7c09b..a8612cb472 100644
Binary files a/data/drules_proto_clear.bin and b/data/drules_proto_clear.bin differ
diff --git a/data/drules_proto_clear.txt b/data/drules_proto_clear.txt
index 7a8ac25c97..c545826955 100644
--- a/data/drules_proto_clear.txt
+++ b/data/drules_proto_clear.txt
@@ -12843,6 +12843,76 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-key_cutter"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+}
+cont {
+  name: "craft-locksmith"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 4473924
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "craft-metal_construction"
   element {
@@ -89585,6 +89655,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-agrarian"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-alcohol"
   element {
@@ -89712,6 +89839,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-appliance"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-art"
   element {
@@ -89953,6 +90137,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-bathroom_furnishing"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-beauty"
   element {
@@ -90023,6 +90264,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-bed"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-beverages"
   element {
@@ -90430,6 +90728,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-cannabis"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-car"
   element {
@@ -90796,6 +91151,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-carpet"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-charity"
   element {
@@ -91597,6 +92009,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-curtain"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-dairy"
   element {
@@ -92268,6 +92737,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-fashion_accessories"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-fishing"
   element {
@@ -92605,6 +93131,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-gas"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-gift"
   element {
@@ -93025,6 +93608,120 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-herbalist"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
+cont {
+  name: "shop-hifi"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-houseware"
   element {
@@ -93915,6 +94612,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-motorcycle_repair"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-music"
   element {
@@ -94317,6 +95071,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-outpost"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-paint"
   element {
@@ -94636,6 +95447,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-pet_grooming"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 4473924
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-photo"
   element {
diff --git a/data/drules_proto_dark.bin b/data/drules_proto_dark.bin
index 3d62f1bfc3..76b55f52ee 100644
Binary files a/data/drules_proto_dark.bin and b/data/drules_proto_dark.bin differ
diff --git a/data/drules_proto_dark.txt b/data/drules_proto_dark.txt
index fd5b17e581..cb8c3c6891 100644
--- a/data/drules_proto_dark.txt
+++ b/data/drules_proto_dark.txt
@@ -12843,6 +12843,76 @@ cont {
     }
   }
 }
+cont {
+  name: "craft-key_cutter"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+}
+cont {
+  name: "craft-locksmith"
+  element {
+    scale: 18
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "hand-m"
+      priority: 16586
+    }
+    caption {
+      primary {
+        height: 11
+        color: 5592405
+        offset_y: 1
+        is_optional: true
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "craft-metal_construction"
   element {
@@ -89670,6 +89740,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-agrarian"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-alcohol"
   element {
@@ -89797,6 +89924,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-appliance"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-art"
   element {
@@ -90038,6 +90222,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-bathroom_furnishing"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-beauty"
   element {
@@ -90108,6 +90349,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-bed"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-beverages"
   element {
@@ -90515,6 +90813,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-cannabis"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-car"
   element {
@@ -90881,6 +91236,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-carpet"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-charity"
   element {
@@ -91682,6 +92094,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-curtain"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-dairy"
   element {
@@ -92353,6 +92822,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-fashion_accessories"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-fishing"
   element {
@@ -92690,6 +93216,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-gas"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-gift"
   element {
@@ -93110,6 +93693,120 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-herbalist"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
+cont {
+  name: "shop-hifi"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-houseware"
   element {
@@ -94000,6 +94697,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-motorcycle_repair"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-music"
   element {
@@ -94402,6 +95156,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-outpost"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-paint"
   element {
@@ -94721,6 +95532,63 @@ cont {
     }
   }
 }
+cont {
+  name: "shop-pet_grooming"
+  element {
+    scale: 16
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 17
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 18
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+  element {
+    scale: 19
+    symbol {
+      name: "shop-m"
+      priority: 16586
+      min_distance: 10
+    }
+    caption {
+      primary {
+        height: 10
+        color: 5592405
+        offset_y: 1
+      }
+      priority: 15586
+    }
+  }
+}
 cont {
   name: "shop-photo"
   element {
diff --git a/data/types.txt b/data/types.txt
index e3fc842816..6b0bfa8445 100644
--- a/data/types.txt
+++ b/data/types.txt
@@ -881,7 +881,7 @@ mapswithme
 mapswithme
 *entrance
 *entrance|main
-mapswithme
+*shop|agrarian
 *tourism|artwork
 railway|subway|tunnel
 railway|subway|tunnel
@@ -956,7 +956,7 @@ mapswithme
 *craft|winery
 *waterway|waterfall
 *craft|electronics_repair
-mapswithme
+*shop|appliance
 *amenity|casino
 *amenity|brothel
 *place|neighbourhood
@@ -1218,9 +1218,9 @@ leisure|sports_centre
 *shop|sewing
 *railway|station|subway|warszawa
 *railway|subway_entrance|warszawa
-mapswithme
-mapswithme
-mapswithme
+*shop|bed
+*shop|outpost
+*shop|gas
 *natural|desert
 *natural|water|tunnel
 *place|square
@@ -1548,3 +1548,14 @@ mapswithme
 *railway|subway_entrance|yerevan
 *railway|subway_entrance|yokohama
 *railway|subway_entrance|bilbao
+*craft|key_cutter
+*craft|locksmith
+*shop|carpet
+*shop|motorcycle_repair
+*shop|pet_grooming
+*shop|hifi
+*shop|bathroom_furnishing
+*shop|curtain
+*shop|fashion_accessories
+*shop|cannabis
+*shop|herbalist
diff --git a/data/visibility.txt b/data/visibility.txt
index c861c424e4..2e3330c8dd 100644
--- a/data/visibility.txt
+++ b/data/visibility.txt
@@ -234,6 +234,8 @@ world  00000000000000000000  +
         gardener  00000000000000000000  -
         handicraft  00000000000000000000  -
         hvac  00000000000000000000  -
+        key_cutter  00000000000000000000  -
+        locksmith  00000000000000000000  -
         metal_construction  00000000000000000000  -
         painter  00000000000000000000  -
         photographer  00000000000000000000  -
@@ -1108,25 +1110,31 @@ world  00000000000000000000  +
         shuttle_train  00000000000000000000  -
         {}
     shop  00000000000000000000  +
+        agrarian  00000000000000000000  -
         alcohol  00000000000000000000  -
         antiques  00000000000000000000  -
+        appliance  00000000000000000000  -
         art  00000000000000000000  -
         baby_goods  00000000000000000000  -
         bag  00000000000000000000  -
         bakery  00000000000000000000  -
+        bathroom_furnishing  00000000000000000000  -
         beauty  00000000000000000000  -
+        bed  00000000000000000000  -
         beverages  00000000000000000000  -
         bicycle  00000000000000000000  -
         bookmaker  00000000000000000000  -
         books  00000000000000000000  -
         boutique  00000000000000000000  -
         butcher  00000000000000000000  -
+        cannabis  00000000000000000000  -
         car  00000000000000000111  -
         car_parts  00000000000000000111  -
         car_repair  00000000000000000111  +
             tyres  00000000000000011111  -
             {}
         caravan  00000000000000000111  -
+        carpet  00000000000000000000  -
         charity  00000000000000000000  -
         cheese  00000000000000000000  -
         chemist  00000000000000000000  -
@@ -1139,6 +1147,7 @@ world  00000000000000000000  +
         copyshop  00000000000000000000  -
         cosmetics  00000000000000000000  -
         craft  00000000000000000000  -
+        curtain  00000000000000000000  -
         dairy  00000000000000000000  -
         deli  00000000000000000000  -
         department_store  00000000000000000000  -
@@ -1149,17 +1158,21 @@ world  00000000000000000000  +
         erotic  00000000000000000000  -
         fabric  00000000000000000000  -
         farm  00000000000000000000  -
+        fashion_accessories  00000000000000000000  -
         fishing  00000000000000000000  -
         florist  00000000000000000000  -
         funeral_directors  00000000000000000000  -
         furniture  00000000000000000000  -
         garden_centre  00000000000000000000  -
+        gas  00000000000000000000  -
         gift  00000000000000000000  -
         greengrocer  00000000000000000000  -
         grocery  00000000000000000000  -
         hairdresser  00000000000000000000  -
         hardware  00000000000000000000  -
         health_food  00000000000000000000  -
+        herbalist  00000000000000000000  -
+        hifi  00000000000000000000  -
         houseware  00000000000000000000  -
         interior_decoration  00000000000000000000  -
         jewelry  00000000000000000000  -
@@ -1173,17 +1186,20 @@ world  00000000000000000000  +
         mobile_phone  00000000000000000000  -
         money_lender  00000000000000000000  -
         motorcycle  00000000000000000111  -
+        motorcycle_repair  00000000000000000000  -
         music  00000000000000000000  -
         musical_instrument  00000000000000000000  -
         newsagent  00000000000000000000  -
         nutrition_supplements  00000000000000000000  -
         optician  00000000000000000000  -
         outdoor  00000000000000000000  -
+        outpost  00000000000000000000  -
         paint  00000000000000000000  -
         pastry  00000000000000000000  -
         pawnbroker  00000000000000000000  -
         perfumery  00000000000000000000  -
         pet  00000000000000000000  -
+        pet_grooming  00000000000000000000  -
         photo  00000000000000000000  -
         seafood  00000000000000000000  -
         second_hand  00000000000000000000  -