Index: src/org/openstreetmap/josm/resources/data/defaultpresets.xml
===================================================================
--- src/org/openstreetmap/josm/resources/data/defaultpresets.xml    (revision 16316)
+++ src/org/openstreetmap/josm/resources/data/defaultpresets.xml    (working copy)
@@ -532,6 +532,14 @@
   <chunk id="wall_material">
     <combo key="material" text="Material" values="adobe,brick,concrete,masonry,reinforced_concrete,stone" />
   </chunk>
+    <chunk id="tower_construct">
+        <combo key="tower:construction" text="Type of construction" values_sort="false" values_searchable="true">
+            <list_entry value="lattice" display_value="lattice" icon="presets/landmark/Tower_lattice.svg" />
+            <list_entry value="freestanding" display_value="freestanding" icon="presets/landmark/Tower_freestanding.svg" />
+            <list_entry value="dome" display_value="Dome" icon="presets/landmark/Tower_dome.svg" />
+            <list_entry value="dish" display_value="Dish" icon="presets/landmark/Tower_dish.svg" />
+        </combo>
+    </chunk> <!-- Tower construction -->
   <!--  Groups -->
   <group name="Highways" icon="presets/transport/way/way_secondary.svg">
     <group name="Streets" icon="presets/transport/way/way_secondary.svg">
@@ -4933,17 +4941,34 @@
             </optional>
             <reference ref="link_contact_address" />
         </item> <!-- Non-public police facility -->
-        <item name="Tower" icon="presets/landmark/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Tower" icon="presets/landmark/Tower_dome.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=tower" />
             <space />
+            <preset_link preset_name="Big Communication Tower" text="For big communication towers, see:" />
+            <label text="Consider using man_made=mast for smaller constructions !" />
+            <space />
             <key key="man_made" value="tower" />
-            <text key="name" text="Name" />
-            <combo key="tower:type" text="Tower type" values="bell_tower,communication,cooling,defensive,observation,radar,watchtower" values_searchable="true" />
-            <optional>
-                <text key="height" text="Height (meters)" />
-                <text key="operator" text="Operator" />
-            </optional>
+            <combo key="tower:type" text="Type of tower" values="communication,observation,watchtower,defensive,cooling,radar,lighting,bell_tower,minaret" display_values="Communication tower,Observation tower,Watch Tower,Fortified defensive tower,Cooling tower,Radar tower,Lighting tower,Bell tower or church tower,Minaret" values_searchable="true" values_sort="false" />
+            <reference ref="tower_construct" />
+            <reference ref="optional_public_building" />
+            <reference ref="link_contact_address" />
         </item> <!-- Tower -->
+        <item name="Big Communication Tower" icon="presets/landmark/Communication_tower-14.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:man_made=communications_tower" />
+            <space />
+            <label text=" Big communication tower, usually 100 meters or higher." />
+            <space />
+            <preset_link preset_name="Tower" text="Use man_made=tower for smaller ones:" />
+            <space />
+            <key key="man_made" value="communications_tower" />
+            <multiselect key="tower:type" text="Type of tower" values_sort="false" default="communication" rows="3">
+                <list_entry value="communication" display_value="Communication tower" icon="presets/landmark/Tower_cantilever_communication.svg" />
+                <list_entry value="watchtower" display_value="Watch tower" icon="presets/landmark/Tower_observation.svg" />
+            </multiselect>
+            <reference ref="tower_construct" />
+            <reference ref="optional_public_building" />
+            <reference ref="link_contact_address" />
+        </item> <!-- Big Communication Tower -->
         <item name="Flagpole" icon="presets/misc/flag.svg" type="node" preset_name_label="true">
             <link wiki="Tag:man_made=flagpole" />
             <key key="man_made" value="flagpole" />