Index: trunk/resources/data/defaultpresets.xml
===================================================================
--- trunk/resources/data/defaultpresets.xml	(revision 16757)
+++ trunk/resources/data/defaultpresets.xml	(revision 16758)
@@ -542,4 +542,15 @@
             <reference ref="POI_access" />
         </optional>
+    </chunk>
+    <chunk id="communication">
+        <space />
+        <label text="Communication type:" />
+        <checkgroup columns="3">
+            <check key="communication:mobile_phone" text="Mobile phone" />
+            <check key="communication:television" text="Television" />
+            <check key="communication:radio" text="Radio" />
+            <check key="communication:microwave" text="Microwave" />
+            <check key="communication:gsm-r" text="GSM-R" />
+        </checkgroup>
     </chunk>
     <!-- Link chunks -->
@@ -3568,6 +3579,8 @@
             <space />
             <combo key="club" text="Type" values="amateur_radio,art,astronomy,automobile,board_games,card_games,charity,cinema,computer,cooking,culture,dog,doityourself,environment_protection,ethnic,fan,filmmaking,fishing,freemasonry,game,gardening,history,hunting,linux,motorcycle,music,nature,nudism,photography,politics,scout,smoke,social,sport,student,surf_life_saving,theatre,tourism,veterans,yachting,youth_movement" values_searchable="true" values_context="club" match="key!" />
-            <reference ref="name_operator_oh_wheelchair" />
-            <optional text="For sport:">
+            <optional>
+                <reference ref="name_operator_oh_wheelchair" />
+                <space />
+                <label text="In case of sport:" />
                 <reference ref="sport" />
             </optional>
@@ -5196,4 +5209,20 @@
             <reference ref="link_contact_address" />
         </item> <!-- Non-public police facility -->
+        <item name="Antenna" icon="presets/tower/antenna.svg" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:man_made=antenna" />
+            <space />
+            <key key="man_made" value="antenna" />
+            <optional>
+                <reference ref="name_ref_operator" />
+                <text key="height" text="Height (meters)" length="7" />
+                <text key="ele" text="Elevation (meters)" length="10" />
+                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="communication" />
+            </optional>
+            <preset_link preset_name="Mast" text="Similar but different tags:" />
+            <preset_link preset_name="Tower" text="Similar but different tags:" />
+            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
+            <preset_link preset_name="Telescope" text="Similar but different tags:" />
+        </item> <!-- Antenna -->
         <item name="Mast" icon="presets/tower/mast.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=mast" />
@@ -5213,6 +5242,7 @@
                 <text key="ele" text="Elevation (meters)" length="10" />
                 <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
-                <reference ref="POI_access" />
-            </optional>
+                <reference ref="communication" />
+            </optional>
+            <preset_link preset_name="Antenna" text="Similar but different tags:" />
             <preset_link preset_name="Tower" text="Similar but different tags:" />
             <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
@@ -5240,4 +5270,6 @@
                 <text key="ele" text="Elevation (meters)" length="10" />
                 <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="communication" />
+                <space />
                 <reference ref="POI_access" />
                 <reference ref="oh" />
@@ -5245,4 +5277,5 @@
                 <space />
             </optional>
+            <preset_link preset_name="Antenna" text="Similar but different tags:" />
             <preset_link preset_name="Mast" text="Similar but different tags:" />
             <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
@@ -5262,8 +5295,11 @@
                 <text key="ele" text="Elevation (meters)" length="10" />
                 <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="communication" />
+                <space />
                 <reference ref="POI_access" />
                 <reference ref="oh" />
                 <reference ref="fee_interval" />
             </optional>
+            <preset_link preset_name="Antenna" text="Similar but different tags:" />
             <preset_link preset_name="Mast" text="Similar but different tags:" />
             <preset_link preset_name="Tower" text="Similar but different tags:" />
@@ -5289,4 +5325,5 @@
                 <reference ref="POI_access" />
             </optional>
+            <preset_link preset_name="Antenna" text="Similar but different tags:" />
             <preset_link preset_name="Mast" text="Similar but different tags:" />
             <preset_link preset_name="Tower" text="Similar but different tags:" />
Index: trunk/resources/images/presets/tower/antenna.svg
===================================================================
--- trunk/resources/images/presets/tower/antenna.svg	(revision 16758)
+++ trunk/resources/images/presets/tower/antenna.svg	(revision 16758)
@@ -0,0 +1,64 @@
+<?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"
+   id="svg4138"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1"
+   sodipodi:docname="antenna.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="24.066588"
+     inkscape:cx="6.2857012"
+     inkscape:cy="6.6219765"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg4138" />
+  <metadata
+     id="metadata4146">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svgxml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs4144" />
+  <rect
+     style="fill:none;stroke:none;visibility:hidden"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="tower-freestanding-communication"
+     d="M 4,0.40625 C 2.23276,1.1855669 0.96875,2.9521023 0.96875,5 0.96875,7.047898 2.23276,8.814433 4,9.59375 V 8.4375 C 2.80447,7.746709 2,6.4881502 2,5 2,3.5118498 2.80447,2.2532914 4,1.5625 Z m 6,0 V 1.5625 C 11.19553,2.2532914 12,3.5118498 12,5 12,6.4881502 11.19553,7.746709 10,8.4375 V 9.59375 C 11.76724,8.814433 13.03125,7.047898 13.03125,5 13.03125,2.9521023 11.76724,1.1855669 10,0.40625 Z M 5,2.1875 C 3.842954,2.6043642 3,3.7033306 3,5 3,6.2966694 3.842954,7.395636 5,7.8125 V 6.71875 C 4.403081,6.3740292 4,5.7435697 4,5 4,4.2564303 4.403081,3.6259708 5,3.28125 Z m 4,0 V 3.28125 C 9.596919,3.6259708 10,4.2564303 10,5 10,5.7435697 9.596919,6.3740292 9,6.71875 V 7.8125 C 10.157046,7.395636 11,6.2966694 11,5 11,3.7033306 10.157046,2.6043642 9,2.1875 Z M 7,4 C 6.4022075,4 6,4.469217 6,5 v 9 H 8 V 5 C 8,4.503906 7.597793,4 7,4 Z"
+     style="fill:#666666;fill-opacity:1;stroke:none"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="csccsccccsccsccsccsccccsccscssccss" />
+</svg>
Index: trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- trunk/resources/styles/standard/elemstyles.mapcss	(revision 16757)
+++ trunk/resources/styles/standard/elemstyles.mapcss	(revision 16758)
@@ -1609,4 +1609,5 @@
 area[man_made=water_tower],
 area[man_made=telescope],
+area[man_made=antenna],
 area[man_made=mast],
 area[man_made=tower],
@@ -1624,4 +1625,8 @@
 node[man_made=telescope][telescope:type=optical] {
     icon-image: "presets/tower/telescope_dome.svg";
+    set icon_z17;
+}
+node[man_made=antenna] {
+    icon-image: "presets/tower/antenna.svg";
     set icon_z17;
 }