diff --git a/data/presets/presets.json b/data/presets/presets.json
index 3eb9a09d8..80aea6991 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2181,6 +2181,7 @@
             "name": "Shelter"
         },
         "amenity/social_facility": {
+            "icon": "poi-social-facility",
             "fields": [
                 "operator",
                 "address",
@@ -2201,6 +2202,7 @@
             "name": "Social Facility"
         },
         "amenity/social_facility/food_bank": {
+            "icon": "poi-social-facility",
             "fields": [
                 "operator",
                 "address",
@@ -2221,6 +2223,7 @@
             "name": "Food Bank"
         },
         "amenity/social_facility/group_home": {
+            "icon": "wheelchair",
             "fields": [
                 "operator",
                 "address",
@@ -2247,6 +2250,7 @@
             "name": "Elderly Group Home"
         },
         "amenity/social_facility/homeless_shelter": {
+            "icon": "poi-social-facility",
             "fields": [
                 "operator",
                 "address",
diff --git a/data/presets/presets/amenity/social_facility.json b/data/presets/presets/amenity/social_facility.json
index 58dfa0402..ef77abf70 100644
--- a/data/presets/presets/amenity/social_facility.json
+++ b/data/presets/presets/amenity/social_facility.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-social-facility",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/amenity/social_facility/food_bank.json b/data/presets/presets/amenity/social_facility/food_bank.json
index 680a7619d..69dc1d80e 100644
--- a/data/presets/presets/amenity/social_facility/food_bank.json
+++ b/data/presets/presets/amenity/social_facility/food_bank.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-social-facility",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/amenity/social_facility/group_home.json b/data/presets/presets/amenity/social_facility/group_home.json
index 620540fac..6f83f8743 100644
--- a/data/presets/presets/amenity/social_facility/group_home.json
+++ b/data/presets/presets/amenity/social_facility/group_home.json
@@ -1,4 +1,5 @@
 {
+    "icon": "wheelchair",
     "fields": [
         "operator",
         "address",
diff --git a/data/presets/presets/amenity/social_facility/homeless_shelter.json b/data/presets/presets/amenity/social_facility/homeless_shelter.json
index 96b6128af..f27325d73 100644
--- a/data/presets/presets/amenity/social_facility/homeless_shelter.json
+++ b/data/presets/presets/amenity/social_facility/homeless_shelter.json
@@ -1,4 +1,5 @@
 {
+    "icon": "poi-social-facility",
     "fields": [
         "operator",
         "address",
diff --git a/svg/iD-sprite.json b/svg/iD-sprite.json
index 53c2f2d5e..51c441b8b 100644
--- a/svg/iD-sprite.json
+++ b/svg/iD-sprite.json
@@ -268,6 +268,7 @@
     "poi-clock":                { "viewBox": "535 320 15 15" },
     "poi-ruins":                { "viewBox": "550 320 15 15" },
     "poi-junction":             { "viewBox": "565 320 15 15" },
+    "poi-social-facility":      { "viewBox": "580 320 15 15" },
 
     "poi-foot-shape":              { "fill": "currentColor" },
     "poi-traffic-signals-shape":   { "fill": "currentColor" },
@@ -281,6 +282,7 @@
     "poi-clock-shape":             { "fill": "currentColor" },
     "poi-ruins-shape":             { "fill": "currentColor" },
     "poi-junction-shape":          { "fill": "currentColor" },
+    "poi-social-facility-shape":   { "fill": "currentColor" },
 
     "poi-vending-machine":      { "viewBox": "400 335 15 15" },
     "poi-dice":                 { "viewBox": "415 335 15 15" },
diff --git a/svg/iD-sprite.src.idraw b/svg/iD-sprite.src.idraw
index d045654fe..891421d66 100644
Binary files a/svg/iD-sprite.src.idraw and b/svg/iD-sprite.src.idraw differ
diff --git a/svg/iD-sprite.src.svg b/svg/iD-sprite.src.svg
index de7f0946c..709675b68 100644
--- a/svg/iD-sprite.src.svg
+++ b/svg/iD-sprite.src.svg
@@ -268,6 +268,9 @@
     <g id="poi-vending-machine">
       <path d="M413,335 L413,350 L402,350 L402,335 L413,335 z M411.5,336.5 L403.5,336.5 L403.5,348.5 L411.5,348.5 L411.5,336.5 z M409,345.25 L406,345.25 L406,346.75 L409,346.75 L409,345.25 z M410,338 L405,338 L405,339 L410,339 L410,338 z M410,340 L405,340 L405,341 L410,341 L410,340 z M410,342 L405,342 L405,343 L410,343 L410,342 z" fill="#000000" id="poi-vending-machine-shape"/>
     </g>
+    <g id="poi-social-facility">
+      <path d="M580,328.5 C580,328.5 582,329 582,329 C582,329 584.5,330 584.5,330 C584.5,330 585.5,329.5 586,329.5 L588,329.5 L591,329 C591,329 591.5,329.5 591,330 C590.646,330.354 588.5,331 588,331 C587.5,331 588.5,331.5 588.5,331.5 L590,331.5 C590,331.5 592,331.5 593,331 C594,330.5 595,330 595,330.5 C595,330.594 594.674,330.822 594.5,331 C593.754,331.764 592,333 592,333 C592,333 590,333.5 588,333.5 C587.5,333.5 586,332.5 585.5,332.5 C585,332.5 580,333 580,332.5 L580,328.5 z M592.513,320.507 C594.183,321.221 594.513,321.896 593.853,323.539 C593.013,324.945 591.999,326.239 590.835,327.391 C590.701,327.531 590.478,327.537 590.337,327.403 C590.333,327.399 590.329,327.395 590.325,327.391 C589.158,326.24 588.141,324.946 587.3,323.539 C585.992,320.924 589.312,319.178 590.576,321.793 C591.078,320.791 591.47,320.757 592.513,320.507 z" fill="#000000" id="poi-social-facility-shape"/>
+    </g>
     <g id="poi-junction">
       <path d="M577.718,322.04 C578.598,322.128 578.272,321.956 578.774,322.367 C579.124,322.794 579.061,323.424 578.633,323.774 L573.5,327.974 L573.5,333 C573.5,333.552 573.052,334 572.5,334 C571.948,334 571.5,333.552 571.5,333 L571.5,327.974 L566.367,323.774 C565.939,323.424 565.876,322.794 566.226,322.367 C566.576,321.939 567.206,321.876 567.633,322.226 L572.5,326.208 L577.367,322.226 L577.718,322.04 z" fill="#000000" id="poi-junction-shape"/>
     </g>