diff --git a/assets/layers/charging_station/as3112.svg b/assets/layers/charging_station/as3112.svg
new file mode 100644
index 000000000..c42a47caf
--- /dev/null
+++ b/assets/layers/charging_station/as3112.svg
@@ -0,0 +1,6 @@
+<svg width="127" height="127" viewBox="0 0 127 127" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M16.3366 2H110.666C132.016 2 128.568 124.791 110.666 124.791H16.3366C-4.27329 124.791 -1.2237 2 16.3366 2Z" stroke="black" stroke-width="2.5" stroke-linejoin="round"/>
+<path d="M68.0922 78.6937H59.3214V105.468H68.0922V78.6937Z" fill="black"/>
+<path d="M45.1364 33.0528L37.5356 28.6761L24.1753 51.8784L31.7761 56.2551L45.1364 33.0528Z" fill="black"/>
+<path d="M82.2772 33.0528L89.878 28.6762L103.238 51.8785L95.6376 56.2552L82.2772 33.0528Z" fill="black"/>
+</svg>
diff --git a/assets/layers/charging_station/as3112.svg.license b/assets/layers/charging_station/as3112.svg.license
new file mode 100644
index 000000000..b4ccbe777
--- /dev/null
+++ b/assets/layers/charging_station/as3112.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Yanpas
+SPDX-License-Identifier: CC-BY-SA-4.0
\ No newline at end of file
diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 38a777db7..669f6bc1d 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -1300,6 +1300,252 @@
             "path": "./assets/layers/charging_station/bs1363.svg",
             "class": "medium"
           }
+        },
+        {
+          "if": "socket:nema5_15=1",
+          "ifnot": "socket:nema5_15=",
+          "then": {
+            "en": "<b>NEMA 5-15</b> (Type B)",
+            "nl": "<b>NEMA 5-15</b> (VS 3-pin)"
+          },
+          "icon": {
+            "path": "./assets/layers/charging_station/nema-5-15.svg",
+            "class": "medium"
+          },
+          "hideInAnswer": {
+            "and": [
+              "_country!=as",
+              "_country!=ai",
+              "_country!=ag",
+              "_country!=aw",
+              "_country!=bb",
+              "_country!=bz",
+              "_country!=bm",
+              "_country!=bo",
+              "_country!=vg",
+              "_country!=ky",
+              "_country!=co",
+              "_country!=cr",
+              "_country!=cu",
+              "_country!=do",
+              "_country!=ec",
+              "_country!=sv",
+              "_country!=pf",
+              "_country!=gu",
+              "_country!=gt",
+              "_country!=gy",
+              "_country!=ht",
+              "_country!=hn",
+              "_country!=jm",
+              "_country!=jp",
+              "_country!=jo",
+              "_country!=la",
+              "_country!=lb",
+              "_country!=lr",
+              "_country!=mx",
+              "_country!=fm",
+              "_country!=ms",
+              "_country!=ni",
+              "_country!=ne",
+              "_country!=pw",
+              "_country!=pa",
+              "_country!=py",
+              "_country!=pe",
+              "_country!=ph",
+              "_country!=pr",
+              "_country!=sr",
+              "_country!=th",
+              "_country!=tt",
+              "_country!=tm",
+              "_country!=ve",
+              "_country!=vn"
+            ]
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "socket:nema5_15~*",
+              "socket:nema5_15!=1"
+            ]
+          },
+          "then": {
+            "en": "<b>NEMA 5-15</b> (Type B)",
+            "nl": "<b>NEMA 5-15</b> (VS 3-pin)"
+          },
+          "hideInAnswer": true,
+          "icon": {
+            "path": "./assets/layers/charging_station/nema-5-15.svg",
+            "class": "medium"
+          }
+        },
+        {
+          "if": "socket:sev1011_t23=1",
+          "ifnot": "socket:sev1011_t23=",
+          "then": {
+            "en": "<b>SEV 1011 T23</b> (Type J)",
+            "nl": "<b>SEV 1011 T23</b> (Zwitserse 3-pin)"
+          },
+          "icon": {
+            "path": "./assets/layers/charging_station/typej.svg",
+            "class": "medium"
+          },
+          "hideInAnswer": {
+            "and": [
+              "_country!=jo",
+              "_country!=li",
+              "_country!=mg",
+              "_country!=mv",
+              "_country!=rw",
+              "_country!=ch"
+            ]
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "socket:sev1011_t23~*",
+              "socket:sev1011_t23!=1"
+            ]
+          },
+          "then": {
+            "en": "<b>SEV 1011 T23</b> (Type J)",
+            "nl": "<b>SEV 1011 T23</b> (Zwitserse 3-pin)"
+          },
+          "hideInAnswer": true,
+          "icon": {
+            "path": "./assets/layers/charging_station/typej.svg",
+            "class": "medium"
+          }
+        },
+        {
+          "if": "socket:as3112=1",
+          "ifnot": "socket:as3112=",
+          "then": {
+            "en": "<b>AS3112</b> (Type I)",
+            "nl": "<b>AS3112</b> (Australische 3-pin)"
+          },
+          "icon": {
+            "path": "./assets/layers/charging_station/as3112.svg",
+            "class": "medium"
+          },
+          "hideInAnswer": {
+            "and": [
+              "_country!=as",
+              "_country!=ar",
+              "_country!=au",
+              "_country!=cn",
+              "_country!=ck",
+              "_country!=fj",
+              "_country!=ki",
+              "_country!=nr",
+              "_country!=nz",
+              "_country!=nu",
+              "_country!=pg",
+              "_country!=sb",
+              "_country!=tj",
+              "_country!=to",
+              "_country!=tv",
+              "_country!=uy",
+              "_country!=uz",
+              "_country!=vu"
+            ]
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "socket:as3112~*",
+              "socket:as3112!=1"
+            ]
+          },
+          "then": {
+            "en": "<b>AS3112</b> (Type I)",
+            "nl": "<b>AS3112</b> (Australische 3-pin)"
+          },
+          "hideInAnswer": true,
+          "icon": {
+            "path": "./assets/layers/charging_station/as3112.svg",
+            "class": "medium"
+          }
+        },
+        {
+          "if": "socket:nema_5_20=1",
+          "ifnot": "socket:nema_5_20=",
+          "then": {
+            "en": "<b>NEMA 5-20</b> (Type B)",
+            "nl": "<b>NEMA 5-20</b> (VS 3-pin)"
+          },
+          "icon": {
+            "path": "./assets/layers/charging_station/nema-5-20.svg",
+            "class": "medium"
+          },
+          "hideInAnswer": {
+            "and": [
+              "_country!=as",
+              "_country!=ai",
+              "_country!=ag",
+              "_country!=aw",
+              "_country!=bb",
+              "_country!=bz",
+              "_country!=bm",
+              "_country!=bo",
+              "_country!=vg",
+              "_country!=ky",
+              "_country!=co",
+              "_country!=cr",
+              "_country!=cu",
+              "_country!=do",
+              "_country!=ec",
+              "_country!=sv",
+              "_country!=pf",
+              "_country!=gu",
+              "_country!=gt",
+              "_country!=gy",
+              "_country!=ht",
+              "_country!=hn",
+              "_country!=jm",
+              "_country!=jp",
+              "_country!=jo",
+              "_country!=la",
+              "_country!=lb",
+              "_country!=lr",
+              "_country!=mx",
+              "_country!=fm",
+              "_country!=ms",
+              "_country!=ni",
+              "_country!=ne",
+              "_country!=pw",
+              "_country!=pa",
+              "_country!=py",
+              "_country!=pe",
+              "_country!=ph",
+              "_country!=pr",
+              "_country!=sr",
+              "_country!=th",
+              "_country!=tt",
+              "_country!=tm",
+              "_country!=ve",
+              "_country!=vn"
+            ]
+          }
+        },
+        {
+          "if": {
+            "and": [
+              "socket:nema_5_20~*",
+              "socket:nema_5_20!=1"
+            ]
+          },
+          "then": {
+            "en": "<b>NEMA 5-20</b> (Type B)",
+            "nl": "<b>NEMA 5-20</b> (VS 3-pin)"
+          },
+          "hideInAnswer": true,
+          "icon": {
+            "path": "./assets/layers/charging_station/nema-5-20.svg",
+            "class": "medium"
+          }
         }
       ]
     },
@@ -1658,6 +1904,78 @@
             [
               "3kW"
             ]
+          ],
+          [
+            "socket:nema5_15",
+            "socket:nema5_15",
+            {
+              "en": "<b>NEMA 5-15</b> (Type B)",
+              "nl": "<b>NEMA 5-15</b> (VS 3-pin)"
+            },
+            "nema-5-15.svg",
+            [
+              "120"
+            ],
+            [
+              "15"
+            ],
+            [
+              "1.8 kW"
+            ]
+          ],
+          [
+            "socket:sev1011_t23",
+            "socket:sev1011_t23",
+            {
+              "en": "<b>SEV 1011 T23</b> (Type J)",
+              "nl": "<b>SEV 1011 T23</b> (Zwitserse 3-pin)"
+            },
+            "typej.svg",
+            [
+              "230"
+            ],
+            [
+              "16"
+            ],
+            [
+              "3.7 kW"
+            ]
+          ],
+          [
+            "socket:as3112",
+            "socket:as3112",
+            {
+              "en": "<b>AS3112</b> (Type I)",
+              "nl": "<b>AS3112</b> (Australische 3-pin)"
+            },
+            "as3112.svg",
+            [
+              "230"
+            ],
+            [
+              "10"
+            ],
+            [
+              "2.3 kW"
+            ]
+          ],
+          [
+            "socket:nema_5_20",
+            "socket:nema_5_20",
+            {
+              "en": "<b>NEMA 5-20</b> (Type B)",
+              "nl": "<b>NEMA 5-20</b> (VS 3-pin)"
+            },
+            "nema-5-20.svg",
+            [
+              "120"
+            ],
+            [
+              "20"
+            ],
+            [
+              "2.4 kW"
+            ]
           ]
         ]
       },
@@ -2717,6 +3035,34 @@
             "nl": "Heeft een <div style='display: inline-block'><b><b>BS1363</b> (VK 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/bs1363.svg'/></div>"
           },
           "osmTags": "socket:bs1363~*"
+        },
+        {
+          "question": {
+            "en": "Has a <div style='display: inline-block'><b><b>NEMA 5-15</b> (Type B)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/nema-5-15.svg'/></div> connector",
+            "nl": "Heeft een <div style='display: inline-block'><b><b>NEMA 5-15</b> (VS 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/nema-5-15.svg'/></div>"
+          },
+          "osmTags": "socket:nema5_15~*"
+        },
+        {
+          "question": {
+            "en": "Has a <div style='display: inline-block'><b><b>SEV 1011 T23</b> (Type J)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/typej.svg'/></div> connector",
+            "nl": "Heeft een <div style='display: inline-block'><b><b>SEV 1011 T23</b> (Zwitserse 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/typej.svg'/></div>"
+          },
+          "osmTags": "socket:sev1011_t23~*"
+        },
+        {
+          "question": {
+            "en": "Has a <div style='display: inline-block'><b><b>AS3112</b> (Type I)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/as3112.svg'/></div> connector",
+            "nl": "Heeft een <div style='display: inline-block'><b><b>AS3112</b> (Australische 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/as3112.svg'/></div>"
+          },
+          "osmTags": "socket:as3112~*"
+        },
+        {
+          "question": {
+            "en": "Has a <div style='display: inline-block'><b><b>NEMA 5-20</b> (Type B)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/nema-5-20.svg'/></div> connector",
+            "nl": "Heeft een <div style='display: inline-block'><b><b>NEMA 5-20</b> (VS 3-pin)</b> <img style='width:1rem; display: inline-block' src='./assets/layers/charging_station/nema-5-20.svg'/></div>"
+          },
+          "osmTags": "socket:nema_5_20~*"
         }
       ]
     }
@@ -2876,6 +3222,42 @@
           "mW",
           "kW"
         ]
+      },
+      "socket:nema5_15:voltage": "voltage",
+      "socket:nema5_15:current": "current",
+      "socket:nema5_15:output": {
+        "quantity": "power",
+        "denominations": [
+          "mW",
+          "kW"
+        ]
+      },
+      "socket:sev1011_t23:voltage": "voltage",
+      "socket:sev1011_t23:current": "current",
+      "socket:sev1011_t23:output": {
+        "quantity": "power",
+        "denominations": [
+          "mW",
+          "kW"
+        ]
+      },
+      "socket:as3112:voltage": "voltage",
+      "socket:as3112:current": "current",
+      "socket:as3112:output": {
+        "quantity": "power",
+        "denominations": [
+          "mW",
+          "kW"
+        ]
+      },
+      "socket:nema_5_20:voltage": "voltage",
+      "socket:nema_5_20:current": "current",
+      "socket:nema_5_20:output": {
+        "quantity": "power",
+        "denominations": [
+          "mW",
+          "kW"
+        ]
       }
     }
   ],
diff --git a/assets/layers/charging_station/license_info.json b/assets/layers/charging_station/license_info.json
index 8f25c84e1..e4c481f44 100644
--- a/assets/layers/charging_station/license_info.json
+++ b/assets/layers/charging_station/license_info.json
@@ -99,6 +99,16 @@
     ],
     "sources": []
   },
+  {
+    "path": "as3112.svg",
+    "license": "CC-BY-SA-4.0",
+    "authors": [
+      "Yanpas"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Plug_types.svg"
+    ]
+  },
   {
     "path": "bosch-3pin.svg",
     "license": "CC0-1.0",
@@ -125,6 +135,36 @@
       "https://commons.wikimedia.org/wiki/File:Plug_types.svg"
     ]
   },
+  {
+    "path": "nema-5-15.svg",
+    "license": "CC-BY-SA-4.0",
+    "authors": [
+      "Yanpas"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Plug_types.svg"
+    ]
+  },
+  {
+    "path": "nema-5-20.svg",
+    "license": "CC-BY-SA-4.0",
+    "authors": [
+      "Modified from Yanpas"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Plug_types.svg"
+    ]
+  },
+  {
+    "path": "typej.svg",
+    "license": "CC-BY-SA-4.0",
+    "authors": [
+      "Modified from Yanpas"
+    ],
+    "sources": [
+      "https://commons.wikimedia.org/wiki/File:Plug_types.svg"
+    ]
+  },
   {
     "path": "under_construction.svg",
     "license": "CC0-1.0",
diff --git a/assets/layers/charging_station/nema-5-15.svg b/assets/layers/charging_station/nema-5-15.svg
new file mode 100644
index 000000000..bba21647f
--- /dev/null
+++ b/assets/layers/charging_station/nema-5-15.svg
@@ -0,0 +1,6 @@
+<svg width="132" height="108" viewBox="0 0 132 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.518 2L122.265 2.19696C126.862 2.20596 129.459 4.82052 129.576 8.99805L130.135 52.9633C128.09 58.3092 127.741 58.4746 122.697 59.2836L94.6426 59.4452L94.7838 82.0482C89.4216 113.801 43.866 113.885 37.5029 81.803L36.9436 59.4727L9.12459 59.2389C5.76322 59.1612 1.50424 53.8838 2.04712 49.9019L2.44736 9.19159C2.82493 5.73227 4.60697 3.17927 8.518 2Z" stroke="black" stroke-width="2.5"/>
+<path d="M33.9379 18.4982H25.1671V45.2722H33.9379V18.4982Z" fill="black"/>
+<path d="M106.476 18.4982H97.7049V45.2722H106.476V18.4982Z" fill="black"/>
+<path d="M65.9505 89.1316C70.0927 89.1316 73.4505 85.7737 73.4505 81.6316C73.4505 77.4895 70.0927 74.1316 65.9505 74.1316C61.8084 74.1316 58.4506 77.4895 58.4506 81.6316C58.4506 85.7737 61.8084 89.1316 65.9505 89.1316Z" fill="black"/>
+</svg>
diff --git a/assets/layers/charging_station/nema-5-15.svg.license b/assets/layers/charging_station/nema-5-15.svg.license
new file mode 100644
index 000000000..b4ccbe777
--- /dev/null
+++ b/assets/layers/charging_station/nema-5-15.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Yanpas
+SPDX-License-Identifier: CC-BY-SA-4.0
\ No newline at end of file
diff --git a/assets/layers/charging_station/nema-5-20.svg b/assets/layers/charging_station/nema-5-20.svg
new file mode 100644
index 000000000..ca2035075
--- /dev/null
+++ b/assets/layers/charging_station/nema-5-20.svg
@@ -0,0 +1,7 @@
+<svg width="132" height="108" viewBox="0 0 132 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.518 2L122.265 2.19696C126.862 2.20596 129.459 4.82052 129.576 8.99805L130.135 52.9633C128.09 58.3092 127.741 58.4746 122.697 59.2836L94.6426 59.4452L94.7838 82.0482C89.4216 113.801 43.866 113.885 37.5029 81.803L36.9436 59.4727L9.12459 59.2389C5.76322 59.1612 1.50424 53.8838 2.04712 49.9019L2.44736 9.19159C2.82493 5.73227 4.60697 3.17927 8.518 2Z" stroke="black" stroke-width="2.5"/>
+<path d="M33.9379 18.4982H25.1671V45.2722H33.9379V18.4982Z" fill="black"/>
+<path d="M106.476 18.4982H97.7049V45.2722H106.476V18.4982Z" fill="black"/>
+<path d="M124.77 28H98V36.77H124.77V28Z" fill="black"/>
+<path d="M65.9505 89.1316C70.0927 89.1316 73.4505 85.7737 73.4505 81.6316C73.4505 77.4895 70.0927 74.1316 65.9505 74.1316C61.8084 74.1316 58.4506 77.4895 58.4506 81.6316C58.4506 85.7737 61.8084 89.1316 65.9505 89.1316Z" fill="black"/>
+</svg>
diff --git a/assets/layers/charging_station/nema-5-20.svg.license b/assets/layers/charging_station/nema-5-20.svg.license
new file mode 100644
index 000000000..9f0b3ad3c
--- /dev/null
+++ b/assets/layers/charging_station/nema-5-20.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Modified from Yanpas
+SPDX-License-Identifier: CC-BY-SA-4.0
\ No newline at end of file
diff --git a/assets/layers/charging_station/typej.svg b/assets/layers/charging_station/typej.svg
new file mode 100644
index 000000000..3511cf05e
--- /dev/null
+++ b/assets/layers/charging_station/typej.svg
@@ -0,0 +1,6 @@
+<svg width="143" height="65" viewBox="0 0 143 65" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M36.152 2.26385L106.901 2.10065L141.146 32.3409L107.176 62.8994H36.1008L1.85425 32.0145L36.152 2.26385Z" stroke="black" stroke-width="2.5" stroke-linejoin="round"/>
+<rect x="35" y="25" width="15" height="15" rx="3" fill="black"/>
+<rect x="96" y="25" width="15" height="15" rx="3" fill="black"/>
+<rect x="64" y="38" width="15" height="15" rx="3" fill="black"/>
+</svg>
diff --git a/assets/layers/charging_station/typej.svg.license b/assets/layers/charging_station/typej.svg.license
new file mode 100644
index 000000000..9f0b3ad3c
--- /dev/null
+++ b/assets/layers/charging_station/typej.svg.license
@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Modified from Yanpas
+SPDX-License-Identifier: CC-BY-SA-4.0
\ No newline at end of file
diff --git a/assets/layers/charging_station/types.csv b/assets/layers/charging_station/types.csv
index 4a9444e36..d73c64835 100644
--- a/assets/layers/charging_station/types.csv
+++ b/assets/layers/charging_station/types.csv
@@ -16,3 +16,7 @@ socket:USB-A,,usb_port.svg,<b>USB</b> to charge phones and small electronics,,,5
 socket:bosch_3pin,,bosch-3pin.svg,<b>Bosch Active Connect with 3 pins</b> and cable,,,,,,<b>Bosch Active Connect met 3 pinnen</b> aan een kabel,bicycle,car;motorcar;hgv;bus,
 socket:bosch_5pin,,bosch-5pin.svg,<b>Bosch Active Connect with 5 pins</b> and cable,,,,,,<b>Bosch Active Connect met 5 pinnen</b> aan een kabel,bicycle,car;motorcar;hgv;bus,
 socket:bs1363,,bs1363.svg,<b>BS1363</b> (Type G),bh;bd;bz;bt;bw;bn;kh;cy;dm;gh;gi;gd;gg;gy;id;iq;ie;im;je;jo;ke;kw;lb;mo;mw;mv;mt;mu;ng;om;pk;qa;rw;sa;sc;sl;sb;lk;sd;tz;ug;vu;vn;ye;zm;zw,,230,13,3kW,<b>BS1363</b> (VK 3-pin),*,,
+socket:nema5_15,,nema-5-15.svg,<b>NEMA 5-15</b> (Type B),as;ai;ag;aw;bb;bz;bm;bo;vg;ky;co;cr;cu;do;ec;sv;pf;gu;gt;gy;ht;hn;jm;jp;jo;la;lb;lr;mx;fm;ms;ni;ne;pw;pa;py;pe;ph;pr;sr;th;tt;tm;ve;vn,,120,15,1.8 kW,<b>NEMA 5-15</b> (VS 3-pin),*,,
+socket:sev1011_t23,,typej.svg,<b>SEV 1011 T23</b> (Type J),jo;li;mg;mv;rw;ch,,230,16,3.7 kW,<b>SEV 1011 T23</b> (Zwitserse 3-pin),*,,
+socket:as3112,,as3112.svg,<b>AS3112</b> (Type I),as;ar;au;cn;ck;fj;ki;nr;nz;nu;pg;sb;tj;to;tv;uy;uz;vu,,230,10,2.3 kW,<b>AS3112</b> (Australische 3-pin),*,,
+socket:nema_5_20,,nema-5-20.svg,<b>NEMA 5-20</b> (Type B),as;ai;ag;aw;bb;bz;bm;bo;vg;ky;co;cr;cu;do;ec;sv;pf;gu;gt;gy;ht;hn;jm;jp;jo;la;lb;lr;mx;fm;ms;ni;ne;pw;pa;py;pe;ph;pr;sr;th;tt;tm;ve;vn,,120,20,2.4 kW,<b>NEMA 5-20</b> (VS 3-pin),*,,