diff --git a/icons/poi_toilet.svg b/icons/poi_toilet.svg
new file mode 100755
index 000000000..756aac28e
--- /dev/null
+++ b/icons/poi_toilet.svg
@@ -0,0 +1,4 @@
+<svg width="15" height="18" xmlns="http://www.w3.org/2000/svg">
+ <path d="m2 8.5 3 9h4l3-9zM9.5 8.5v-8h5v8z" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
+ <path d="m12 8.5h-10.5s-1 0.5-1 1.5 1 1.5 1 1.5h9.5z" stroke="#fff" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/scripts/taginfo_template.json b/scripts/taginfo_template.json
index 9f332a06e..66f72e5f5 100644
--- a/scripts/taginfo_template.json
+++ b/scripts/taginfo_template.json
@@ -597,6 +597,14 @@
       "doc_url": "https://openmaptiles.org/schema/#poi",
       "icon_url": "https://raw.githubusercontent.com/osm-americana/openstreetmap-americana/main/icons/poi_fire_station.svg"
     },
+    {
+      "key": "amenity",
+      "value": "toilets",
+      "object_types": ["node", "area"],
+      "description": "Restrooms are marked by an icon representing a flush toilet.",
+      "doc_url": "https://openmaptiles.org/schema/#poi",
+      "icon_url": "https://raw.githubusercontent.com/ZeLonewolf/openstreetmap-americana/main/icons/poi_toilet.svg"
+    },
     {
       "key": "amenity",
       "value": "townhall",
diff --git a/src/layer/poi.js b/src/layer/poi.js
index 8fc48fc6b..6d21add50 100644
--- a/src/layer/poi.js
+++ b/src/layer/poi.js
@@ -268,6 +268,14 @@ var iconDefs = {
     color: Color.poi.infrastructure,
     description: "College or university",
   },
+  toilets: {
+    classes: {
+      toilets: ["toilets"],
+    },
+    sprite: "poi_toilet",
+    color: Color.poi.infrastructure,
+    description: "Restroom",
+  },
   townhall: {
     classes: {
       town_hall: ["townhall"],
@@ -356,6 +364,7 @@ export const poi = {
         "school",
         ...getSubclasses(iconDefs.college),
         "library",
+        "toilets",
         "townhall",
         ...getSubclasses(iconDefs.post_office),
         ...getSubclasses(iconDefs.pow_christian),
@@ -417,7 +426,7 @@ export const poi = {
         ...getSubclasses(iconDefs.hostel),
       ],
       16,
-      ["clinic", "doctors", "parking"],
+      ["clinic", "doctors", "parking", "toilets"],
       17,
       99,
     ],