diff --git a/resources/icons/emergency_hydrant.n.16.png b/resources/icons/emergency_hydrant.n.16.png
new file mode 100644
index 00000000..c214fdf6
Binary files /dev/null and b/resources/icons/emergency_hydrant.n.16.png differ
diff --git a/resources/stylesheets/core_pois.css b/resources/stylesheets/core_pois.css
index cf5dffd6..ab80baac 100644
--- a/resources/stylesheets/core_pois.css
+++ b/resources/stylesheets/core_pois.css
@@ -51,6 +51,8 @@ node[amenity=toilets] { icon-image: icons/amenity_toilets.n.16.png; z-index: 20;
 node[amenity=vending_machine] { icon-image: icons/shopping_vending_machine.n.16.png; z-index: 20; }
 node[amenity=veterinary] { icon-image: icons/health_veterinary.n.8E7409.16.png; z-index: 20; }
 node[amenity=waste_basket] { icon-image: icons/amenity_waste_bin.n.16.png; z-index: 20; }
+node[amenity=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
+node[emergency=fire_hydrant] { icon-image: icons/emergency_hydrant.n.16.png; z-index: 20; }
 /* Shops */
 node[shop=alcohol] { icon-image: icons/shopping_alcohol.n.16.png; z-index: 20; }
 node[shop=bakery] { icon-image: icons/shopping_bakery.n.16.png; z-index: 20; }
diff --git a/resources_src/emergency_hydrant.svg b/resources_src/emergency_hydrant.svg
new file mode 100644
index 00000000..e76c7584
--- /dev/null
+++ b/resources_src/emergency_hydrant.svg
@@ -0,0 +1,266 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="fire_hydrant.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata1976">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="1000"
+     inkscape:window-width="1215"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="1.4706897"
+     inkscape:cx="290"
+     inkscape:cy="290"
+     inkscape:window-x="65"
+     inkscape:window-y="24"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective3653" />
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="10"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="ArrowStart">
+      <path
+         id="path2111"
+         d="M 10 0 L 0 5 L 10 10 z" />
+    </marker>
+    <marker
+       viewBox="0 0 10 10"
+       refY="5"
+       refX="0"
+       orient="auto"
+       markerWidth="4"
+       markerUnits="strokeWidth"
+       markerHeight="3"
+       id="ArrowEnd">
+      <path
+         id="path2108"
+         d="M 0 0 L 10 5 L 0 10 z" />
+    </marker>
+    <inkscape:perspective
+       id="perspective2512"
+       inkscape:persp3d-origin="177.51199 : 145.02 : 1"
+       inkscape:vp_z="355.02399 : 217.53 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 217.53 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3305"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3354"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3569"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3604"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4346"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="g1327"
+     style="fill:#734a08">
+    <path
+       d="M 66.275,1.768 C 24.94,1.768 1.704,23.139 1.704,66.804 L 1.704,516.927 C 1.704,557.771 22.6,579.156 63.896,579.156 L 515.92,579.156 C 557.227,579.156 578.149,558.842 578.149,516.927 L 578.149,66.804 C 578.149,24.203 557.227,1.768 514.628,1.768 C 514.624,1.768 66.133,1.625 66.275,1.768 z"
+       style="fill:#734a08;stroke:#eeeeee;stroke-width:3.40799998999999998"
+       id="path1329" />
+  </g>
+  <g
+     id="g2117"
+     transform="matrix(1.1975036,0,0,1.1975036,80.128205,34.575832)"
+     style="fill:#000000">
+    <g
+       id="g2119"
+       style="fill:#000000">
+      <g
+         id="g2121"
+         style="fill:#000000">
+        <path
+           id="path2125"
+           style="fill:#000000;stroke:none"
+           d="" />
+      </g>
+      <g
+         id="g2127"
+         style="fill:#000000">
+        <path
+           id="path2131"
+           style="fill:#000000;stroke:none"
+           d="" />
+      </g>
+    </g>
+  </g>
+  <image
+     y="573.99469"
+     x="-1801.1931"
+     id="image3356"
+     height="190"
+     width="239"
+     sodipodi:absref="/home/tomasz/Obrazy/firestation_pliki/pastedpic_10102008_233747.html"
+     xlink:href="/home/tomasz/Obrazy/firestation_pliki/pastedpic_10102008_233747.html" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="rect3179"
+     width="62.113358"
+     height="24.14827"
+     x="259.84937"
+     y="43.789841" />
+  <path
+     sodipodi:type="arc"
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="path3171"
+     sodipodi:cx="265.6701"
+     sodipodi:cy="298.78839"
+     sodipodi:rx="51.51778"
+     sodipodi:ry="49.497475"
+     d="m 317.18789,298.78839 a 51.51778,49.497475 0 1 1 -103.03557,0 51.51778,49.497475 0 1 1 103.03557,0 z"
+     transform="matrix(1.8228464,0,0,1.6276548,-195.26953,-346.60639)"
+     clip-path="none" />
+  <g
+     id="g3233"
+     transform="matrix(1.5460417,0,0,1.4653908,-130.91546,-263.4443)"
+     style="fill:#ffffff;stroke:none">
+    <rect
+       y="343.65182"
+       x="149.201"
+       height="39.002003"
+       width="24.71629"
+       id="rect3272"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <rect
+       inkscape:transform-center-y="-48.818727"
+       inkscape:transform-center-x="-96.907101"
+       y="317.9295"
+       x="170.71945"
+       height="90.446655"
+       width="37.999222"
+       id="rect3199"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+  <g
+     id="g3237"
+     transform="matrix(-1.5558371,0,0,-1.4653908,716.18905,800.87734)"
+     style="fill:#ffffff;stroke:none">
+    <rect
+       y="343.65182"
+       x="149.201"
+       height="39.002003"
+       width="24.71629"
+       id="rect3239"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+    <rect
+       inkscape:transform-center-y="-48.818727"
+       inkscape:transform-center-x="-96.907101"
+       y="317.9295"
+       x="170.71945"
+       height="90.446655"
+       width="37.999222"
+       id="rect3241"
+       style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none" />
+  </g>
+  <rect
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="rect3159"
+     width="160.28299"
+     height="304.72409"
+     x="210.7244"
+     y="187.35373" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="rect3233"
+     width="296.81149"
+     height="28.21312"
+     x="144.50032"
+     y="506.99518" />
+  <rect
+     style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+     id="rect3215"
+     width="241.177"
+     height="54.510426"
+     x="169.01765"
+     y="118.65439"
+     clip-path="none" />
+  <rect
+     style="fill:#734a08;fill-opacity:1;stroke:none"
+     id="rect3246"
+     width="190.47105"
+     height="16.403059"
+     x="197.86635"
+     y="173.30386" />
+</svg>