Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 12416)
+++ trunk/data/defaultpresets.xml	(revision 12417)
@@ -3777,13 +3777,17 @@
             <combo key="building" text="Building" values="hangar,yes" values_context="building" default="hangar" values_searchable="true" />
         </item> <!-- Hangar -->
-        <item name="Beacon" icon="presets/landmark/beacon.svg" type="node" preset_name_label="true">
-            <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
-                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:man_made=beacon"
-                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=beacon"
-                  ja.href="http://wiki.openstreetmap.org/wiki/JA:Tag:man_made=beacon"
-                  pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:man_made=beacon"
-                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:man_made=beacon" />
-            <key key="man_made" value="beacon" />
+        <item name="Beacon" icon="presets/transport/airport/airmark_beacon.svg" name_context="airmark" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:airmark=beacon"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:airmark=beacon"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:airmark=beacon" />
+            <key key="airmark" value="beacon" />
         </item> <!-- Beacon -->
+        <item name="Navigationaid" icon="presets/transport/airport/navigationaid.svg" type="node" preset_name_label="true">
+            <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=navigationaid"
+                  cs.href="http://wiki.openstreetmap.org/wiki/Cs:Tag:aeroway=navigationaid"
+                  ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:aeroway=navigationaid"
+                  de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:aeroway=navigationaid" />
+            <key key="aeroway" value="navigationaid" />
+        </item> <!-- Navigationaid -->
         <item name="Windsock" icon="presets/transport/airport/windsock.svg" type="node" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock"
@@ -7063,5 +7067,5 @@
             <text key="name" text="Name" />
         </item> <!-- Lighthouse -->
-        <item name="Beacon" icon="presets/landmark/beacon.svg" type="node,closedway" preset_name_label="true">
+        <item name="Beacon" icon="presets/landmark/beacon.svg" name_context="man_made" type="node,closedway" preset_name_label="true">
             <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon"
                   pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt-br:Tag:man_made=beacon"
Index: trunk/images/presets/landmark/beacon.svg
===================================================================
--- trunk/images/presets/landmark/beacon.svg	(revision 12416)
+++ trunk/images/presets/landmark/beacon.svg	(revision 12417)
@@ -10,11 +10,11 @@
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="13"
+   width="16"
    height="16"
-   viewBox="0 0 13 16"
+   viewBox="0 0 16 16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="beacon4.svg">
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="10.svg">
   <defs
      id="defs4" />
@@ -26,7 +26,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="45.254834"
-     inkscape:cx="10.048765"
-     inkscape:cy="12.542862"
+     inkscape:zoom="24.296875"
+     inkscape:cx="-4.3431112"
+     inkscape:cy="8.1240404"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -34,17 +34,16 @@
      units="px"
      inkscape:window-width="1680"
-     inkscape:window-height="988"
+     inkscape:window-height="987"
      inkscape:window-x="-8"
      inkscape:window-y="-8"
      inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
+     viewbox-height="16">
     <inkscape:grid
        type="xygrid"
        id="grid4136"
-       originx="-1"
-       originy="-1.7382813e-005" />
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
   </sodipodi:namedview>
   <metadata
@@ -75,34 +74,17 @@
      inkscape:groupmode="layer"
      id="layer1"
-     transform="translate(-1,-1036.3622)">
+     transform="translate(0,-1037.3622)">
     <rect
-       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
-       id="rect4153"
-       width="13"
-       height="16"
-       x="1"
-       y="1036.3622"
-       ry="0" />
+       style="opacity:1;fill:#666666;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4493-7"
+       width="2"
+       height="8"
+       x="7"
+       y="1045.3622" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.03509831px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 7.5,1052.3622 0,-15"
-       id="path4145"
+       style="fill:#ed0000;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="m 7,1045.3622 -3,-8 h 8 l -3,8 z"
+       id="path4534"
        inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.05475128px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 3,1038.8622 8.9,0"
-       id="path4149"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 2.4945081,1037.3622 c 0.4833948,7.4862 9.5054919,7.5966 10.0223199,0"
-       id="path4151"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       inkscape:connector-curvature="0"
-       id="path4170"
-       d="m 3.6,1040.8615 7.8,0"
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.98742092px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
 </svg>
Index: trunk/images/presets/transport/airport/airmark_beacon.svg
===================================================================
--- trunk/images/presets/transport/airport/airmark_beacon.svg	(revision 12417)
+++ trunk/images/presets/transport/airport/airmark_beacon.svg	(revision 12417)
@@ -0,0 +1,133 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="34.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="34.36097"
+     inkscape:cx="8.2408631"
+     inkscape:cy="6.8240288"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <rect
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#4d4d4d;stroke-width:0;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4510"
+       width="15.999998"
+       height="15.999997"
+       x="9.9999988e-007"
+       y="1037.3622" />
+    <rect
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.03218126"
+       id="rect2987-8"
+       width="16"
+       height="16"
+       x="0"
+       y="1037.3622"
+       ry="2.0000174"
+       inkscape:export-filename="C:\Users\Stefan\Desktop\mast2.png"
+       inkscape:export-xdpi="90.160004"
+       inkscape:export-ydpi="90.160004" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.053;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6,1044.3622 c 1,-1 3,-1 4,0"
+       id="path3770-1-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc"
+       inkscape:export-filename="C:\Users\Stefan\Desktop\mast2.png"
+       inkscape:export-xdpi="90.160004"
+       inkscape:export-ydpi="90.160004" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.19461477;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 4,1041.9178 c 3,-1.3519 5,-1.3519 8,-0.042 v 0 0"
+       id="path3772-7-82"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc"
+       inkscape:export-filename="C:\Users\Stefan\Desktop\mast2.png"
+       inkscape:export-xdpi="90.160004"
+       inkscape:export-ydpi="90.160004" />
+    <path
+       style="fill:none;stroke:#000000;stroke-width:1.16850221;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2,1039.6532 c 3.9557886,-1.3576 7.9540285,-1.3094 12,0 v 0"
+       id="path3774-4-8"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc"
+       inkscape:export-xdpi="90.160004"
+       inkscape:export-ydpi="90.160004"
+       inkscape:export-filename="C:\Users\Stefan\Desktop\mast2.png" />
+    <g
+       id="g2915"
+       style="fill:#000000"
+       transform="matrix(0.01362649,-0.01015404,0.0136759,0.01011735,1.6490894,1050.3959)">
+      <path
+         d="M 459.05707,51.95872 C 490.15573,20.862187 447.1424,-19.792747 416.43947,10.914453 L 303.05173,124.2976 43.301333,55.63552 0,98.936853 214.08853,211.68853 l -86.58666,86.58454 -67.314137,-8.2656 -34.2464,34.24533 76.367997,40.1536 40.15254,76.368 34.24533,-34.24747 -7.872,-66.92053 86.58667,-86.5856 110.33066,212.68267 43.30134,-43.30134 -65.73547,-254.4896 z"
+         id="path2917"
+         style="fill:#000000;stroke:none;stroke-width:1.06666672"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
Index: trunk/images/presets/transport/airport/navigationaid.svg
===================================================================
--- trunk/images/presets/transport/airport/navigationaid.svg	(revision 12417)
+++ trunk/images/presets/transport/airport/navigationaid.svg	(revision 12417)
@@ -0,0 +1,130 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   viewBox="0 0 16 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.92.0 r15299"
+   sodipodi:docname="40.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="24.296875"
+     inkscape:cx="-4.3636899"
+     inkscape:cy="8.1240404"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     viewbox-height="16">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="0"
+       originy="0"
+       spacingx="1"
+       spacingy="1" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1037.3622)">
+    <circle
+       style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.53846157;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4483"
+       cx="3.5000002"
+       cy="1042.8622"
+       r="3.2307692" />
+    <circle
+       cy="1042.8622"
+       cx="12.5"
+       id="ellipse4485"
+       style="opacity:1;fill:#ffff00;fill-opacity:1;stroke:#4d4d4d;stroke-width:0.53846157;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       r="3.2307692" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4487"
+       width="1"
+       height="2"
+       x="3"
+       y="1046.3622" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4489"
+       width="1"
+       height="2"
+       x="12"
+       y="1046.3622" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4491"
+       width="10"
+       height="1"
+       x="3"
+       y="1048.3622" />
+    <rect
+       style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4493"
+       width="2"
+       height="4"
+       x="7"
+       y="1049.3622" />
+    <circle
+       style="opacity:1;fill:#ffd700;fill-opacity:1;stroke:#ffd700;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4495"
+       cx="3.5"
+       cy="1042.8622"
+       r="0.5" />
+    <circle
+       style="opacity:1;fill:#ffd700;fill-opacity:1;stroke:#ffd700;stroke-width:0.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4497"
+       cx="12.5"
+       cy="1042.8622"
+       r="0.5" />
+  </g>
+</svg>
Index: trunk/images_nodist/presets/beacon.svg
===================================================================
--- trunk/images_nodist/presets/beacon.svg	(revision 12417)
+++ trunk/images_nodist/presets/beacon.svg	(revision 12417)
@@ -0,0 +1,108 @@
+<?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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="13"
+   height="16"
+   viewBox="0 0 13 16"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="beacon4.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="45.254834"
+     inkscape:cx="10.048765"
+     inkscape:cy="12.542862"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     units="px"
+     inkscape:window-width="1680"
+     inkscape:window-height="988"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4136"
+       originx="-1"
+       originy="-1.7382813e-005" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <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:license
+           rdf:resource="http://creativecommons.org/publicdomain/zero/1.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/publicdomain/zero/1.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-1,-1036.3622)">
+    <rect
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       id="rect4153"
+       width="13"
+       height="16"
+       x="1"
+       y="1036.3622"
+       ry="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.03509831px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.5,1052.3622 0,-15"
+       id="path4145"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.05475128px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 3,1038.8622 8.9,0"
+       id="path4149"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 2.4945081,1037.3622 c 0.4833948,7.4862 9.5054919,7.5966 10.0223199,0"
+       id="path4151"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path4170"
+       d="m 3.6,1040.8615 7.8,0"
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.98742092px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+  </g>
+</svg>
Index: trunk/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/styles/standard/elemstyles.mapcss	(revision 12416)
+++ trunk/styles/standard/elemstyles.mapcss	(revision 12417)
@@ -3597,4 +3597,12 @@
     set icon_z17;
 }
+node[airmark=beacon] {
+    icon-image: "presets/transport/airport/airmark_beacon.svg";
+    set icon_z17;
+}
+node[aeroway=navigationaid] {
+    icon-image: "presets/transport/airport/navigationaid.svg";
+    set icon_z17;
+}
 node[aeroway=windsock] {
     icon-image: "presets/transport/airport/windsock.svg";