diff --git a/amenities.mss b/amenities.mss
index b92701b1..7ed7ab2f 100644
--- a/amenities.mss
+++ b/amenities.mss
@@ -465,6 +465,14 @@
     marker-clip: false;
   }
 
+  [feature = 'emergency_defibrillator'][zoom >= 19] {
+    marker-file: url('symbols/osmfr/aed2.svg');
+    marker-placement: interior;
+    marker-clip: false;
+    [access != ''][access != 'permissive'][access != 'yes'] {
+      marker-opacity: 0.33;
+    }
+  }
   [feature = 'emergency_phone'][zoom >= 19] {
     marker-file: url('symbols/openstreetmap-carto/amenity/emergency_phone.svg');
     marker-fill: @amenity-common;
diff --git a/symbols/osmfr/aed2.svg b/symbols/osmfr/aed2.svg
new file mode 100644
index 00000000..b5b717fc
--- /dev/null
+++ b/symbols/osmfr/aed2.svg
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg18718"
+   x="0px"
+   y="0px"
+   width="12.645"
+   height="12.643"
+   viewBox="0 0 12.645 12.642999"
+   enable-background="new 0 0 177.6 177.6"
+   xml:space="preserve"
+   sodipodi:docname="aed2.svg"
+   inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)"><metadata
+   id="metadata1117"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs1115" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1596"
+   inkscape:window-height="861"
+   id="namedview1113"
+   showgrid="false"
+   inkscape:snap-global="false"
+   inkscape:zoom="30.462821"
+   inkscape:cx="-0.13331894"
+   inkscape:cy="6.5271829"
+   inkscape:window-x="0"
+   inkscape:window-y="37"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g3852"
+   fit-margin-top="0"
+   fit-margin-left="0"
+   fit-margin-right="0"
+   fit-margin-bottom="0" />
+<rect
+   x="0.31000257"
+   y="0.25600117"
+   fill="#ffffff"
+   width="12.047"
+   height="12.021"
+   id="rect1107" />
+<g
+   id="layer1"
+   transform="translate(-8893.737,-689.521)">
+	<g
+   id="g3852">
+		<path
+   id="path38787"
+   fill="#009262"
+   d="m 8893.737,689.521 v 12.643 h 12.645 v -12.643 z m 9.748,0.766 h 1.186 v 1.138 h 1.109 v 1.132 h -1.109 v 1.131 h -1.184 v -1.131 h -1.111 v -1.141 l 0.65,0.002 0.461,0.014 z m -6.178,3.037 c 0.574,-0.013 1.134,0.195 1.545,0.625 l 0.271,0.287 0.303,-0.279 c 0.5,-0.461 0.887,-0.606 1.696,-0.604 1.238,0.004 2.121,0.785 2.281,2.095 0.227,1.869 -0.827,3.466 -3.612,5.496 -0.714,0.521 -0.721,0.525 -0.769,0.448 l -0.767,-0.62 c -2.232,-1.703 -3.165,-2.909 -3.354,-4.333 -0.146,-1.096 0.061,-1.75 0.759,-2.41 0.483,-0.455 1.072,-0.689 1.647,-0.705 z m 2.681,1.449 -2.285,2.776 1.455,-0.011 -0.979,2.21 2.283,-2.818 -1.421,0.003 z"
+   style="fill:#666666;fill-opacity:1" />
+	</g>
+</g>
+</svg>
diff --git a/views.sql b/views.sql
index 1c2fdb3c..f881e0ce 100644
--- a/views.sql
+++ b/views.sql
@@ -304,7 +304,7 @@ CREATE VIEW cyclosm_amenities_point AS
           OR waterway IN ('waterfall')
           OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross', 'fort', 'wayside_shrine', 'castle', 'manor', 'city_gate')
           OR military IN ('bunker')
-          OR tags->'emergency'='phone'
+          OR tags->'emergency' IN ('defibrillator', 'phone')
           OR highway IN ('elevator', 'traffic_signals')
           OR ((highway='bus_stop' OR public_transport='platform') AND (tags->'shelter'='yes' OR covered='yes'))
           OR (power = 'generator' AND "generator:source"='wind')
@@ -317,7 +317,7 @@ CREATE VIEW cyclosm_amenities_point AS
                 WHEN shop IN ('bicycle', 'sports') THEN 0
                 WHEN amenity IN ('bicycle_rental') Then 10
                 -- Emergency
-                WHEN tags->'healthcare' IS NOT NULL OR tags->'emergency'='phone' OR amenity IN ('hospital', 'clinic', 'doctors', 'pharmacy') THEN 20
+                WHEN tags->'healthcare' IS NOT NULL OR tags->'emergency' IN ('defibrillator', 'phone') OR amenity IN ('hospital', 'clinic', 'doctors', 'pharmacy') THEN 20
                 -- Other emergency-related amenities
                 WHEN amenity IN ('bicycle_repair_station', 'compressed_air', 'drinking_water', 'police', 'toilets',
                   'water_point', 'charging_station') THEN 21
@@ -444,7 +444,7 @@ CREATE VIEW cyclosm_amenities_poly AS
           OR waterway IN ('waterfall')
           OR historic IN ('memorial', 'monument', 'archaeological_site', 'wayside_cross', 'fort', 'wayside_shrine', 'castle', 'manor', 'city_gate')
           OR military IN ('bunker')
-          OR tags->'emergency'='phone'
+          OR tags->'emergency' IN ('defibrillator', 'phone')
           OR highway IN ('elevator', 'traffic_signals')
           OR ((highway='bus_stop' OR public_transport='platform') AND (tags->'shelter'='yes' OR covered='yes'))
           OR (power = 'generator' AND "generator:source"='wind')
@@ -456,7 +456,7 @@ CREATE VIEW cyclosm_amenities_poly AS
                 WHEN shop IN ('bicycle', 'sports') THEN 0
                 WHEN amenity IN ('bicycle_rental') Then 10
                 -- Emergency
-                WHEN tags->'healthcare' IS NOT NULL OR tags->'emergency'='phone' OR amenity IN ('hospital', 'clinic', 'doctors', 'pharmacy') THEN 20
+                WHEN tags->'healthcare' IS NOT NULL OR tags->'emergency'IN ('defibrillator', 'phone') OR amenity IN ('hospital', 'clinic', 'doctors', 'pharmacy') THEN 20
                 -- Other emergency-related amenities
                 WHEN amenity IN ('bicycle_repair_station', 'compressed_air', 'drinking_water', 'police', 'toilets',
                   'water_point', 'charging_station') THEN 21