Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 16705)
+++ /trunk/resources/data/defaultpresets.xml	(revision 16706)
@@ -5020,15 +5020,76 @@
             <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="Mast" icon="presets/tower/mast.svg" type="node,closedway" preset_name_label="true">
+            <link wiki="Tag:man_made=mast" />
+            <space />
+            <key key="man_made" value="mast" />
+            <combo key="tower:type" text="Type" values_context="mast/tower" values_searchable="true">
+                <list_entry value="communication" icon="presets/tower/mast_communication.svg" />
+                <list_entry value="lighting" icon="presets/tower/mast_lighting.svg" />
+                <list_entry value="monitoring" />
+                <list_entry value="radar" />
+                <list_entry value="siren" />
+            </combo>
+            <optional>
+                <combo key="tower:construction" text="Type of construction" values="freestanding,guyed_lattice,guyed_tube,lattice" values_searchable="true" />
+                <reference ref="name_ref_operator" />
+                <text key="height" text="Height (meters)" length="7" />
+                <text key="ele" text="Elevation (meters)" lenght="10" />
+                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="POI_access" />
+            </optional>
+            <preset_link preset_name="Tower" text="Similar but different tags:" />
+            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
+        </item> <!-- Mast -->
+        <item name="Tower" icon="presets/tower/tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
             <link wiki="Tag:man_made=tower" />
             <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>
+            <combo key="tower:type" text="Type" values_context="mast/tower" values_searchable="true">
+                <list_entry value="bell_tower" icon="presets/tower/bell_tower.svg" />
+                <list_entry value="communication" icon="presets/tower/communication.svg" />
+                <list_entry value="cooling" icon="presets/tower/cooling.svg" />
+                <list_entry value="defensive" icon="presets/tower/defensive.svg" />
+                <list_entry value="lighting" icon="presets/tower/lighting.svg" />
+                <list_entry value="minaret" />
+                <list_entry value="observation" icon="presets/tower/observation.svg" />
+                <list_entry value="radar" />
+                <list_entry value="watchtower" icon="presets/tower/observation.svg" />
+            </combo>
+            <optional>
+                <combo key="tower:construction" text="Type of construction" values="dish,dome,freestanding,lattice" values_searchable="true" />
+                <reference ref="name_ref_operator" />
                 <text key="height" text="Height (meters)" length="7" />
-                <text key="operator" text="Operator" />
-            </optional>
+                <text key="ele" text="Elevation (meters)" lenght="10" />
+                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="POI_access" />
+                <reference ref="oh" />
+                <reference ref="fee_interval" />
+                <space />
+            </optional>
+            <preset_link preset_name="Mast" text="Similar but different tags:" />
+            <preset_link preset_name="Big Communication Tower" text="Similar but different tags:" />
+            <reference ref="link_contact_address" />
         </item> <!-- Tower -->
+        <item name="Big Communication Tower" icon="presets/tower/communications_tower.svg" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:man_made=communications_tower" />
+            <space />
+            <label text="Big communication tower, usually higher than 100 meters." />
+            <key key="man_made" value="communications_tower" />
+            <optional>
+                <combo key="tower:type" text="Type" values="communication,observation" default="communication" values_context="mast/tower" />
+                <combo key="tower:construction" text="Type of construction" values="dish,dome,freestanding,lattice" values_searchable="true" />
+                <reference ref="name_ref_operator" />
+                <text key="height" text="Height (meters)" length="7" />
+                <text key="ele" text="Elevation (meters)" lenght="10" />
+                <combo key="material" text="Material" values="adobe,brick,concrete,glass,masonry,metal,plastic,reinforced_concrete,steel,stone,wood" />
+                <reference ref="POI_access" />
+                <reference ref="oh" />
+                <reference ref="fee_interval" />
+            </optional>
+            <preset_link preset_name="Mast" text="Similar but different tags:" />
+            <preset_link preset_name="Tower" text="Similar but different tags:" />
+            <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" />
@@ -5183,5 +5244,5 @@
         </item> <!-- Manhole -->
         <separator/>
-        <item name="Water Tower" icon="presets/landmark/water_tower.svg" type="node,closedway" preset_name_label="true">
+        <item name="Water Tower" icon="presets/tower/water_tower.svg" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:man_made=water_tower" />
             <space />
Index: /trunk/resources/images/presets/tower/bell_tower.svg
===================================================================
--- /trunk/resources/images/presets/tower/bell_tower.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/bell_tower.svg	(revision 16706)
@@ -0,0 +1,31 @@
+<?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"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   id="svg109"
+   version="1.1">
+  <metadata
+     id="metadata115">
+    <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="defs113" />
+  <path
+     id="rect4517"
+     d="M 7 0 L 3 3 L 3 14 L 4 14 L 4 6 A 3 3 0 0 1 7 3 A 3 3 0 0 1 10 6 L 10 14 L 11 14 L 11 3 L 7 0 z M 6.6425781 4.5 C 5.1713456 5.5990112 5.6263833 6.1171551 5.125 8.0292969 C 5.0267045 8.1297436 4.5 8.4517303 4.5 8.7597656 L 4.5 9 L 9.5 9 L 9.5 8.7597656 C 9.5065855 8.4517303 8.9283731 8.1297433 8.8300781 8.0292969 C 8.3366263 6.1474042 8.7614816 5.3429388 7.3574219 4.5 L 6.6425781 4.5 z M 7 9.75 A 0.75 0.75 0 0 0 6.25 10.5 A 0.75 0.75 0 0 0 7 11.25 A 0.75 0.75 0 0 0 7.75 10.5 A 0.75 0.75 0 0 0 7 9.75 z "
+     style="opacity:1;fill:#555;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.68416572;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke fill markers" />
+</svg>
Index: /trunk/resources/images/presets/tower/communication.svg
===================================================================
--- /trunk/resources/images/presets/tower/communication.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/communication.svg	(revision 16706)
@@ -0,0 +1,38 @@
+<?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"
+   id="svg4138"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <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 C 0.96875 7.047898 2.23276 8.814433 4 9.59375 L 4 8.4375 C 2.80447 7.746709 2 6.4881502 2 5 C 2 3.5118498 2.80447 2.2532914 4 1.5625 L 4 0.40625 z M 10 0.40625 L 10 1.5625 C 11.19553 2.2532914 12 3.5118498 12 5 C 12 6.4881502 11.19553 7.746709 10 8.4375 L 10 9.59375 C 11.76724 8.814433 13.03125 7.047898 13.03125 5 C 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 C 3 6.2966694 3.842954 7.395636 5 7.8125 L 5 6.71875 C 4.403081 6.3740292 4 5.7435697 4 5 C 4 4.2564303 4.403081 3.6259708 5 3.28125 L 5 2.1875 z M 9 2.1875 L 9 3.28125 C 9.596919 3.6259708 10 4.2564303 10 5 C 10 5.7435697 9.596919 6.3740292 9 6.71875 L 9 7.8125 C 10.157046 7.395636 11 6.2966694 11 5 C 11 3.7033306 10.157046 2.6043642 9 2.1875 z M 7 4 C 6.4022075 4 6 4.469217 6 5 L 6 11 L 5 11 L 5 12 L 3 12 L 3 14 L 11 14 L 11 12 L 9 12 L 9 11 L 8 11 L 8 5 C 8 4.503906 7.597793 4 7 4 z "
+     style="fill:#555555;fill-opacity:1;stroke:none" />
+</svg>
Index: /trunk/resources/images/presets/tower/communications_tower.svg
===================================================================
--- /trunk/resources/images/presets/tower/communications_tower.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/communications_tower.svg	(revision 16706)
@@ -0,0 +1,57 @@
+<?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"
+   id="svg20"
+   viewBox="0 0 14 14"
+   version="1.1"
+   height="14"
+   width="14">
+  <defs
+     id="defs7">
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y1="3"
+       x2="7"
+       x1="7"
+       id="linearGradient837">
+      <stop
+         id="stop2"
+         offset="0" />
+      <stop
+         id="stop4"
+         offset="1"
+         stop-opacity="0" />
+    </linearGradient>
+  </defs>
+  <metadata
+     id="metadata9">
+    <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>
+  <rect
+     visibility="hidden"
+     fill="none"
+     height="14"
+     width="14"
+     x="-15"
+     id="canvas" />
+  <path
+     id="path12"
+     style="fill:#555555;fill-opacity:1;stroke:none"
+     d="M 6 0 L 6 3.2714844 A 2 2 0 0 0 5 5 A 2 2 0 0 0 6 6.7304688 L 6 14 L 8 14 L 8 6.7285156 A 2 2 0 0 0 9 5 A 2 2 0 0 0 8 3.2695312 L 8 0 L 6 0 z M 11.005859 0 L 11.005859 1.28125 C 12.202359 1.99175 12.953125 3.1940094 12.953125 4.7246094 C 12.953125 6.2552094 12.202359 7.477 11.005859 8.1875 L 11.005859 9.4863281 C 12.774559 8.6847681 14.003906 6.8309094 14.003906 4.7246094 C 14.003906 2.6183094 12.774459 0.8015 11.005859 0 z M 3 0.00390625 C 1.2313 0.80546625 0.00390625 2.6358875 0.00390625 4.7421875 C 0.00390625 6.8484875 1.2314 8.7024063 3 9.5039062 L 3 8.2792969 C 1.8035 7.5687969 1.0351562 6.2006219 1.0351562 4.6699219 C 1.0351562 3.1393219 1.80345 1.944875 3 1.234375 L 3 0.00390625 z M 4 1.859375 C 2.842 2.288135 2 3.4085875 2 4.7421875 C 2 6.0758875 2.84197 7.2079188 4 7.6367188 L 4 6.4921875 C 3.4026 6.1376275 3.0722656 5.4717313 3.0722656 4.7070312 C 3.0722656 3.9422412 3.4026 3.3662188 4 3.0117188 L 4 1.859375 z M 10.005859 1.8691406 L 10.005859 2.9746094 C 10.603259 3.3291694 11.023437 3.9773875 11.023438 4.7421875 C 11.023438 5.5069775 10.603279 6.0458906 10.005859 6.4003906 L 10.005859 7.5253906 C 11.163859 7.0966306 11.970703 6.0758875 11.970703 4.7421875 C 11.970703 3.4084875 11.163889 2.2978406 10.005859 1.8691406 z " />
+  <path
+     id="path14"
+     style="fill:#555555;fill-opacity:1;stroke:none"
+     d="m4 14 3-3 3 3z" />
+</svg>
Index: /trunk/resources/images/presets/tower/cooling.svg
===================================================================
--- /trunk/resources/images/presets/tower/cooling.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/cooling.svg	(revision 16706)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="14" height="14" version="1.1" viewBox="0 0 14 14" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <metadata>
+  <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/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
+ <g>
+  <rect x="4" y="1" width="6" height="13"
+  style="fill:#555555;fill-opacity:1;stroke:none"/>
+  <path d="m2 14 2-6h6l2 6z" fill-rule="evenodd"
+  style="fill:#555555;fill-opacity:1;stroke:none"/>
+  <path d="m3 1 1 2h6l1-2z" fill-rule="evenodd"
+  style="fill:#555555;fill-opacity:1;stroke:none"/>
+ </g>
+</svg>
Index: /trunk/resources/images/presets/tower/defensive.svg
===================================================================
--- /trunk/resources/images/presets/tower/defensive.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/defensive.svg	(revision 16706)
@@ -0,0 +1,40 @@
+<?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"
+   version="1.1"
+   height="14"
+   width="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <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="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 2.5,0 0,3 9,0 0,-3 L 10,0 10,1 8,1 8,0 6,0 6,1 4,1 4,0 z M 3,4 2.5,13 1,13 1,14 5.5,14 C 5.5,13 5.7770449,11.5 7,11.5 8.2738548,11.52672 8.5,13 8.5,14 L 13,14 13,13 11.5,13 11,4 z M 7,6 C 8,6 8,7 8,7 L 8,8 6,8 6,7 C 6,7 6,6 7,6 z"
+     id="watchtower"
+     style="fill:#555555;fill-opacity:1;stroke:none" />
+</svg>
Index: /trunk/resources/images/presets/tower/lighting.svg
===================================================================
--- /trunk/resources/images/presets/tower/lighting.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/lighting.svg	(revision 16706)
@@ -0,0 +1,38 @@
+<?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"
+   id="svg2"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <metadata
+     id="metadata8">
+    <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="defs6" />
+  <rect
+     style="visibility:hidden;fill:none;stroke:none"
+     id="canvas"
+     y="0"
+     x="0"
+     height="14"
+     width="14" />
+  <path
+     id="tower_lighting"
+     d="M 7 1 C 6.4022075 1 6 1.4692172 6 2 L 6 11 L 5 11 L 5 12 L 3 12 L 3 14 L 11 14 L 11 12 L 9 12 L 9 11 L 8 11 L 8 2 C 8 1.5039063 7.5977925 1 7 1 z M 2.7148438 1.5449219 C 2.5475777 1.6291099 2.4854767 1.9211987 2.7148438 2.0136719 L 4.5898438 2.7636719 C 4.8962727 2.887214 5.0831658 2.4182195 4.7773438 2.2949219 L 2.9023438 1.5449219 C 2.8258838 1.5140979 2.7705987 1.5168599 2.7148438 1.5449219 z M 11 1.5957031 L 9.125 2.3457031 C 8.819178 2.4690007 9.006071 2.9379952 9.3125 2.8144531 L 11.1875 2.0644531 C 11.493323 1.9411555 11.305822 1.4724055 11 1.5957031 z M 2.7460938 3.3261719 C 2.4163518 3.3261719 2.4163518 3.8261719 2.7460938 3.8261719 L 4.7460938 3.8261719 C 5.0764898 3.8261719 5.0758357 3.3261719 4.7460938 3.3261719 L 2.7460938 3.3261719 z M 9.15625 3.3769531 C 8.826508 3.3769531 8.825854 3.8769531 9.15625 3.8769531 L 11.15625 3.8769531 C 11.485991 3.8769531 11.485991 3.3769531 11.15625 3.3769531 L 9.15625 3.3769531 z M 4.5898438 4.4511719 L 2.7148438 5.2011719 C 2.4090217 5.3244695 2.5959147 5.793464 2.9023438 5.6699219 L 4.7773438 4.9199219 C 5.0831658 4.7966243 4.8956657 4.3278743 4.5898438 4.4511719 z M 9.125 4.5019531 C 8.957734 4.5861401 8.895633 4.8782299 9.125 4.9707031 L 11 5.7207031 C 11.306429 5.8442452 11.493322 5.3752507 11.1875 5.2519531 L 9.3125 4.5019531 C 9.23605 4.4711291 9.180755 4.4738911 9.125 4.5019531 z "
+     style="fill:#555555;fill-opacity:1;stroke:none" /> />
+</svg>
Index: /trunk/resources/images/presets/tower/mast.svg
===================================================================
--- /trunk/resources/images/presets/tower/mast.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/mast.svg	(revision 16706)
@@ -0,0 +1,37 @@
+<?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"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="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
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="M 7,1 C 6.4022075,1 6,1.4692172 6,2 L 6,9 3.1132812,14 4.2675781,14 6,11 6,14 8,14 8,11 9.7324219,14 10.886719,14 8,9 8,2 C 8,1.5039063 7.5977925,1 7,1 Z"
+     id="mast" style="fill:#666666;fill-opacity:1;stroke:none" />
+</svg>
Index: /trunk/resources/images/presets/tower/mast_communication.svg
===================================================================
--- /trunk/resources/images/presets/tower/mast_communication.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/mast_communication.svg	(revision 16706)
@@ -0,0 +1,38 @@
+<?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"
+   id="svg4138"
+   viewBox="0 0 14 14"
+   height="14"
+   width="14"
+   version="1.1">
+  <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="mast-communication"
+     d="M 4 0.40625 C 2.23276 1.1855669 0.96875 2.9521023 0.96875 5 C 0.96875 7.047898 2.23276 8.814433 4 9.59375 L 4 8.4375 C 2.80447 7.746709 2 6.4881502 2 5 C 2 3.5118498 2.80447 2.2532914 4 1.5625 L 4 0.40625 z M 10 0.40625 L 10 1.5625 C 11.19553 2.2532914 12 3.5118498 12 5 C 12 6.4881502 11.19553 7.746709 10 8.4375 L 10 9.59375 C 11.76724 8.814433 13.03125 7.047898 13.03125 5 C 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 C 3 6.2966694 3.842954 7.395636 5 7.8125 L 5 6.71875 C 4.403081 6.3740292 4 5.7435697 4 5 C 4 4.2564303 4.403081 3.6259708 5 3.28125 L 5 2.1875 z M 9 2.1875 L 9 3.28125 C 9.596919 3.6259708 10 4.2564303 10 5 C 10 5.7435697 9.596919 6.3740292 9 6.71875 L 9 7.8125 C 10.157046 7.395636 11 6.2966694 11 5 C 11 3.7033306 10.157046 2.6043642 9 2.1875 z M 7 4 C 6.4022075 4 6 4.4692172 6 5 L 6 9 L 3.1132812 14 L 4.2675781 14 L 6 11 L 6 14 L 8 14 L 8 11 L 9.7324219 14 L 10.886719 14 L 8 9 L 8 5 C 8 4.5039063 7.5977925 4 7 4 z "
+     style="fill:#555555;fill-opacity:1;stroke:none" />
+</svg>
Index: /trunk/resources/images/presets/tower/mast_lighting.svg
===================================================================
--- /trunk/resources/images/presets/tower/mast_lighting.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/mast_lighting.svg	(revision 16706)
@@ -0,0 +1,38 @@
+<?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"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <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="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="visibility:hidden;fill:none;stroke:none" />
+  <path
+     id="mast_lighting"
+     d="M 7 1 C 6.4022075 1 6 1.4692172 6 2 L 6 9 L 3.1132812 14 L 4.2675781 14 L 6 11 L 6 14 L 8 14 L 8 11 L 9.7324219 14 L 10.886719 14 L 8 9 L 8 2 C 8 1.5039063 7.5977925 1 7 1 z M 2.7148438 1.5449219 C 2.5475777 1.6291099 2.4854766 1.9211987 2.7148438 2.0136719 L 4.5898438 2.7636719 C 4.8962727 2.887214 5.0831658 2.4182195 4.7773438 2.2949219 L 2.9023438 1.5449219 C 2.8258838 1.5140979 2.7705987 1.5168599 2.7148438 1.5449219 z M 11 1.5957031 L 9.125 2.3457031 C 8.819178 2.4690007 9.006071 2.9379952 9.3125 2.8144531 L 11.1875 2.0644531 C 11.493323 1.9411555 11.305822 1.4724055 11 1.5957031 z M 2.7460938 3.3261719 C 2.4163518 3.3261719 2.4163518 3.8261719 2.7460938 3.8261719 L 4.7460938 3.8261719 C 5.0764898 3.8261719 5.0758357 3.3261719 4.7460938 3.3261719 L 2.7460938 3.3261719 z M 9.15625 3.3769531 C 8.826508 3.3769531 8.825854 3.8769531 9.15625 3.8769531 L 11.15625 3.8769531 C 11.485991 3.8769531 11.485991 3.3769531 11.15625 3.3769531 L 9.15625 3.3769531 z M 4.5898438 4.4511719 L 2.7148438 5.2011719 C 2.4090217 5.3244695 2.5959147 5.793464 2.9023438 5.6699219 L 4.7773438 4.9199219 C 5.0831658 4.7966243 4.8956656 4.3278743 4.5898438 4.4511719 z M 9.125 4.5019531 C 8.957734 4.5861401 8.895633 4.8782299 9.125 4.9707031 L 11 5.7207031 C 11.306429 5.8442452 11.493322 5.3752507 11.1875 5.2519531 L 9.3125 4.5019531 C 9.23605 4.4711291 9.180755 4.4738911 9.125 4.5019531 z " 
+     style="fill:#555555;fill-opacity:1;stroke:none" />
+</svg>
Index: /trunk/resources/images/presets/tower/observation.svg
===================================================================
--- /trunk/resources/images/presets/tower/observation.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/observation.svg	(revision 16706)
@@ -0,0 +1,38 @@
+<?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"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="svg2">
+  <metadata
+     id="metadata8">
+    <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="defs6" />
+  <rect
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     id="tower_observation"
+     d="M 7 0 L 2 2 L 2 6 L 12 6 L 12 2 L 7 0 z M 3 3 L 5 3 L 5 5 L 3 5 L 3 3 z M 6 3 L 8 3 L 8 5 L 6 5 L 6 3 z M 9 3 L 11 3 L 11 5 L 9 5 L 9 3 z M 3.90625 6.625 L 3 14 L 4.5 14 L 4.6875 12.53125 L 7 11 L 9.3125 12.5625 L 9.5 14 L 11 14 L 10.09375 6.65625 L 3.90625 6.625 z M 5.34375 7.1875 L 8.65625 7.21875 L 8.84375 8.78125 L 7 10 L 5.15625 8.78125 L 5.34375 7.1875 z M 5.03125 9.6875 L 6.25 10.5 L 4.8125 11.46875 L 5.03125 9.6875 z M 8.96875 9.6875 L 9.1875 11.46875 L 7.75 10.5 L 8.96875 9.6875 z "
+     style="fill:#555555;fill-opacity:1;stroke:none" />
+</svg>
Index: /trunk/resources/images/presets/tower/tower.svg
===================================================================
--- /trunk/resources/images/presets/tower/tower.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/tower.svg	(revision 16706)
@@ -0,0 +1,38 @@
+<?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"
+   version="1.1"
+   width="14"
+   height="14"
+   viewBox="0 0 14 14"
+   id="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
+     width="14"
+     height="14"
+     x="0"
+     y="0"
+     id="canvas"
+     style="fill:none;stroke:none;visibility:hidden" />
+  <path
+     d="m 6,2 0,9 -1,0 0,1 -2,0 0,2 8,0 0,-2 -2,0 0,-1 -1,0 0,-9 C 8,1.5039063 7.5977925,1 7,1 6.4022075,1 6,1.4692172 6,2 Z"
+     id="tower-freestanding" 
+     style="fill:#666666;fill-opacity:1;stroke:none" />
+</svg>
Index: /trunk/resources/images/presets/tower/water_tower.svg
===================================================================
--- /trunk/resources/images/presets/tower/water_tower.svg	(revision 16706)
+++ /trunk/resources/images/presets/tower/water_tower.svg	(revision 16706)
@@ -0,0 +1,24 @@
+<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" 
+	version="1.1" 
+   width="16"
+   height="16"
+	viewBox="0 0 16 16" 
+	id="svg2">
+  <metadata id="metadata8">
+    <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/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs id="defs6"/>
+  <rect width="16" height="16" x="0" y="0" id="canvas" style="fill:none;stroke:none;visibility:hidden"/>
+  <path d="M 2,0 2,3.5 C 2,4.9469172 2.7905512,5.9802716 3.90625,6.625 L 3,14 4.5,14 4.6875,12.53125 7,11 9.3125,12.5625 9.5,14 11,14 10.09375,6.65625 C 11.21821,6.0132746 12,4.9628112 12,3.5 l 0,-3.5 -1.5,0 0,1.5 -0.5,0 C 8.8728814,2 8,2 7,1.5 6,1 5.0381356,1 4,1.5 l -0.5,0 0,-1.5 z m 3.34375,7.1875 c 1.069224,0.2671613 2.2426846,0.2935662 3.3125,0.03125 L 8.84375,8.78125 7,10 5.15625,8.78125 z m -0.3125,2.5 L 6.25,10.5 4.8125,11.46875 z m 3.9375,0 L 9.1875,11.46875 7.75,10.5 z" id="water-tower"
+  style="fill:#555555;fill-opacity:1" transform="translate(1,1)"/>
+</svg>
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16705)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 16706)
@@ -1540,8 +1540,6 @@
 }
 area[man_made=reservoir_covered],
-area[man_made=tower],
 area[man_made=wastewater_plant],
 area[man_made=watermill],
-area[man_made=water_tower],
 area[man_made=water_well],
 area[man_made=windmill],
@@ -1562,8 +1560,4 @@
     set icon_z17;
 }
-node[man_made=tower] {
-    icon-image: "presets/landmark/tower.svg";
-    set icon_z17;
-}
 node[man_made=wastewater_plant] {
     icon-image: "presets/landmark/wastewater_plant.svg";
@@ -1572,8 +1566,4 @@
 node[man_made=watermill] {
     icon-image: "presets/landmark/watermill.svg";
-    set icon_z17;
-}
-node[man_made=water_tower] {
-    icon-image: "presets/landmark/water_tower.svg";
     set icon_z17;
 }
@@ -1603,4 +1593,63 @@
 node[man_made=cutline] {
     icon-image: "presets/misc/deprecated.svg";
+    set icon_z17;
+}
+
+area[man_made=water_tower],
+area[man_made=mast],
+area[man_made=tower],
+area[man_made=communications_tower] {
+    fill-color: manmade#d8d8d8;
+}
+node[man_made=water_tower] {
+    icon-image: "presets/tower/water_tower.svg";
+    set icon_z17;
+}
+node[man_made=mast] {
+    icon-image: "presets/tower/mast.svg";
+    set icon_z17;
+}
+node[man_made=mast][tower:type=communication] {
+    icon-image: "presets/tower/mast_communication.svg";
+    set icon_z17;
+}
+node[man_made=mast][tower:type=lighting] {
+    icon-image: "presets/tower/mast_lighting.svg";
+    set icon_z17;
+}
+node[man_made=tower] {
+    icon-image: "presets/tower/tower.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=bell_tower] {
+    icon-image: "presets/tower/bell_tower.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=communication] {
+    icon-image: "presets/tower/communication.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=cooling] {
+    icon-image: "presets/tower/cooling.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=defensive] {
+    icon-image: "presets/tower/defensive.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=lighting] {
+    icon-image: "presets/tower/lighting.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=observation] {
+    icon-image: "presets/tower/observation.svg";
+    set icon_z17;
+}
+node[man_made=tower][tower:type=watchtower] {
+    icon-image: "presets/tower/observation.svg";
+    set icon_z17;
+}
+node[man_made=communications_tower] {
+    icon-image: "presets/tower/communications_tower.svg";
     set icon_z17;
 }