diff --git a/data/defaultpresets.xml b/data/defaultpresets.xml
index 21f033c04..a900dc4e5 100644
--- a/data/defaultpresets.xml
+++ b/data/defaultpresets.xml
@@ -5847,7 +5847,7 @@
             <key key="shop" value="electronics" />
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
-        </item> <!-- Computer -->
+        </item> <!-- Electronics -->
         <item name="Mobile Phone" icon="presets/shop/mobile_phone.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:shop=mobile_phone" />
             <space />
@@ -6017,6 +6017,13 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Antiques -->
+        <item name="Lighting" icon="presets/shop/lighting.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=lighting" />
+            <space />
+            <key key="shop" value="lighting" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Lighting -->
     </group> <!-- Home decoration -->
     <group name="Printed Material" icon="presets/shop/stationery.svg">
         <item name="Stationery" icon="presets/shop/stationery.svg" type="node,closedway,multipolygon" preset_name_label="true">
@@ -6310,6 +6317,20 @@
             <reference ref="name_oh_wheelchair" />
             <reference ref="link_contact_address_payment" />
         </item> <!-- Funeral Directors -->
+        <item name="Pest Control" icon="presets/shop/pest_control.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=pest_control" />
+            <space />
+            <key key="shop" value="pest_control" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Pest Control -->
+        <item name="Security" icon="presets/shop/security.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:shop=security" />
+            <space />
+            <key key="shop" value="security" />
+            <reference ref="name_oh_wheelchair" />
+            <reference ref="link_contact_address_payment" />
+        </item> <!-- Security -->
     </group> <!-- Other -->
         <separator/>
     <item name="Vending Machine" icon="presets/transport/ticket-machine.svg" type="node" preset_name_label="true">
diff --git a/styles/standard/elemstyles.mapcss b/styles/standard/elemstyles.mapcss
index 6a3ad866c..a4a241bcc 100644
--- a/styles/standard/elemstyles.mapcss
+++ b/styles/standard/elemstyles.mapcss
@@ -2057,7 +2057,10 @@ area[shop=wine],
 area[shop=farm],
 area[shop=tattoo],
 area[shop=art],
-area[shop=bag] {
+area[shop=bag],
+area[shop=lighting],
+area[shop=pest_control],
+area[shop=security] {
     fill-color: shop#00005f;
 }
 node[shop=supermarket] {
@@ -2433,6 +2436,18 @@ node[shop=bag] {
     icon-image: "presets/shop/bag.svg";
     set icon_z17;
 }
+node[shop=lighting] {
+    icon-image: "presets/shop/lighting.svg";
+    set icon_z17;
+}
+node[shop=pest_control] {
+    icon-image: "presets/shop/pest_control.svg";
+    set icon_z17;
+}
+node[shop=security] {
+    icon-image: "presets/shop/security.svg";
+    set icon_z17;
+}
 
 /******************/
 /* emergency tags */