diff --git a/src/main/assets/images/icons/png/poi_arch.png b/src/main/assets/images/icons/png/poi_arch.png
new file mode 100644
index 000000000..bfd7af4b8
Binary files /dev/null and b/src/main/assets/images/icons/png/poi_arch.png differ
diff --git a/src/main/assets/images/icons/png/poi_hill.png b/src/main/assets/images/icons/png/poi_hill.png
new file mode 100644
index 000000000..3031316b4
Binary files /dev/null and b/src/main/assets/images/icons/png/poi_hill.png differ
diff --git a/src/main/assets/preset.xml b/src/main/assets/preset.xml
index 90ce17794..4c70dbfce 100644
--- a/src/main/assets/preset.xml
+++ b/src/main/assets/preset.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" version="5.68.0" shortdescription="Default OpenStreetMap Preset for Vespucci and JOSM" description="General purpose OpenStreetMap preset for Vespucci and JOSM, based on the original JOSM version" object_keys="advertising,attraction,area:highway,building:part,cemetery,club,departures_board,disc_golf,golf,ford,harbour,hazard,noexit,indoor,playground,pipeline,piste:type,police,public_transport,seamark:type,traffic_calming,traffic_sign,traffic_sign:backward,traffic_sign:forward,marker,mountain_pass,telecom,roller_coaster,climbing,disused:amenity,disused:building,disused:highway,disused:leisure,disused:man_made,disused:military,disused:railway,disused:shop,abandoned:amenity,abandoned:building,abandoned:highway,abandoned:leisure,abandoned:man_made,abandoned:military,abandoned:railway,abandoned:shop,">
+<presets xmlns="http://josm.openstreetmap.de/tagging-preset-1.0" version="5.69.0" shortdescription="Default OpenStreetMap Preset for Vespucci and JOSM" description="General purpose OpenStreetMap preset for Vespucci and JOSM, based on the original JOSM version" object_keys="advertising,attraction,area:highway,building:part,cemetery,club,departures_board,disc_golf,golf,ford,harbour,hazard,noexit,indoor,playground,pipeline,piste:type,police,public_transport,seamark:type,traffic_calming,traffic_sign,traffic_sign:backward,traffic_sign:forward,marker,mountain_pass,telecom,roller_coaster,climbing,disused:amenity,disused:building,disused:highway,disused:leisure,disused:man_made,disused:military,disused:railway,disused:shop,abandoned:amenity,abandoned:building,abandoned:highway,abandoned:leisure,abandoned:man_made,abandoned:military,abandoned:railway,abandoned:shop,">
 <!--
     Icons have been derived from mainly from
   
@@ -288,6 +288,7 @@
             <check key="embankment" text="Embankment" disable_off="true"/>
             <check key="lit" text="Lit" disable_off="true"/>
             <check key="toll" text="Toll" disable_off="true"/>
+            <check key="toll:hgv" text="HGV toll" disable_off="true"/>
             <check key="lane_markings" text="Lane markings"/>
             <check key="winter_road" text="Winter road" disable_off="true"/>
             <check key="ice_road" text="Ice road" disable_off="true"/>
@@ -13577,18 +13578,25 @@
             <reference ref="name_wikipedia"/>
             <text key="ele" text="Elevation (meters)" length="10"/>
             <optional>
-            <combo key="volcano:status" text="Current Status" values_context="volcano">
-                <list_entry value="active" display_value="Active"/>
-                <list_entry value="dormant" display_value="Dormant" short_description="Was active in historical times"/>
-                <list_entry value="extinct" display_value="Extinct" short_description="Not erupted in recorded history"/>
-            </combo>
-            <combo key="volcano:type" text="Type">
-                <list_entry value="scoria" display_value="Scoria (volcanic cone)"/>
-                <list_entry value="shield" display_value="Shield volcano (low profile)"/>
-                <list_entry value="stratovolcano" display_value="Stratovolcano (composite volcano)"/>
-            </combo>
-        </optional>
+                <combo key="volcano:status" text="Current Status" values_context="volcano">
+                    <list_entry value="active" display_value="Active"/>
+                    <list_entry value="dormant" display_value="Dormant" short_description="Was active in historical times"/>
+                    <list_entry value="extinct" display_value="Extinct" short_description="Not erupted in recorded history"/>
+                </combo>
+                <combo key="volcano:type" text="Type">
+                    <list_entry value="scoria" display_value="Scoria (volcanic cone)"/>
+                    <list_entry value="shield" display_value="Shield volcano (low profile)"/>
+                    <list_entry value="stratovolcano" display_value="Stratovolcano (composite volcano)"/>
+                </combo>
+            </optional>
         </item> <!-- Volcano -->
+        <item name="Hill" icon="icons/png/poi_hill.png" type="node,closedway,multipolygon" preset_name_label="true">
+            <link wiki="Tag:natural=hill"/>
+            <space/>
+            <key key="natural" value="hill"/>
+            <reference ref="name_wikipedia"/>
+            <text key="ele" text="Elevation (meters)" length="10"/>
+        </item> <!-- Hill -->
         <item name="Ar&#xEA;te" icon="icons/png/poi_arete_sp.png" type="way" preset_name_label="true">
             <link wiki="Tag:natural=arete"/>
             <space/>
@@ -13657,6 +13665,14 @@
             <reference ref="general_access"/>
             <reference ref="fee"/>
         </item> <!-- Cave Entrance -->
+        <item name="Arch" icon="icons/png/poi_arch.png" type="node,way,closedway,multipolygon" preset_name_label="true" name_context="natural">
+            <link wiki="Tag:natural=arch"/>
+            <space/>
+            <label text="A rock arch naturally formed by erosion, with an opening underneath."/>
+            <space/>
+            <key key="natural" value="arch"/>
+            <reference ref="optional_name_wikipedia"/>
+        </item> <!-- Arch -->
         <item name="Geyser" icon="icons/png/natural_fountain_12060.png" type="node,closedway" preset_name_label="true">
             <link wiki="Tag:natural=geyser"/>
             <space/>
diff --git a/taginfo.json b/taginfo.json
index 8c2a46182..a4e5b23ec 100644
--- a/taginfo.json
+++ b/taginfo.json
@@ -134,6 +134,7 @@
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "embankment","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "lit","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "toll","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "toll:hgv","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "lane_markings","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "winter_road","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "ice_road","object_types": ["way"]},
@@ -256,6 +257,7 @@
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "embankment","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "lit","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "toll","object_types": ["way"]},
+{"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "toll:hgv","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "lane_markings","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "winter_road","object_types": ["way"]},
 {"description":"Highways/Streets/Motorway Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_dual_sp.png","key": "ice_road","object_types": ["way"]},
@@ -379,6 +381,7 @@
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "embankment","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "lit","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "toll","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "toll:hgv","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "lane_markings","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "winter_road","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "ice_road","object_types": ["way"]},
@@ -502,6 +505,7 @@
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "embankment","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "lit","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "toll","object_types": ["way"]},
+{"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "toll:hgv","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "lane_markings","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "winter_road","object_types": ["way"]},
 {"description":"Highways/Streets/Trunk Link","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/highway_car_29023.png","key": "ice_road","object_types": ["way"]},
@@ -44086,6 +44090,14 @@
 {"description":"Geography/Geography/Volcano","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_volcano.png","key": "volcano:type","value": "scoria","object_types": ["node"]},
 {"description":"Geography/Geography/Volcano","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_volcano.png","key": "volcano:type","value": "shield","object_types": ["node"]},
 {"description":"Geography/Geography/Volcano","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_volcano.png","key": "volcano:type","value": "stratovolcano","object_types": ["node"]},
+{"description":"Geography/Geography/Hill","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_hill.png","key": "natural","value": "hill","object_types": ["node","area"]},
+{"description":"Geography/Geography/Hill","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_hill.png","key": "name","object_types": ["node","area"]},
+{"description":"Geography/Geography/Hill","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_hill.png","key": "wikipedia","object_types": ["node","area"]},
+{"description":"Geography/Geography/Hill","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_hill.png","key": "wikidata","object_types": ["node","area"]},
+{"description":"Geography/Geography/Hill","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_hill.png","key": "image","object_types": ["node","area"]},
+{"description":"Geography/Geography/Hill","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_hill.png","key": "mapillary","object_types": ["node","area"]},
+{"description":"Geography/Geography/Hill","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_hill.png","key": "wikimedia_commons","object_types": ["node","area"]},
+{"description":"Geography/Geography/Hill","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_hill.png","key": "ele","object_types": ["node","area"]},
 {"description":"Geography/Geography/Arête","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arete_sp.png","key": "natural","value": "arete","object_types": ["way"]},
 {"description":"Geography/Geography/Arête","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arete_sp.png","key": "name","object_types": ["way"]},
 {"description":"Geography/Geography/Arête","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arete_sp.png","key": "wikipedia","object_types": ["way"]},
@@ -44174,6 +44186,13 @@
 {"description":"Geography/Geography/Cave Entrance","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_cave.png","key": "fee","value": "no","object_types": ["node","area"]},
 {"description":"Geography/Geography/Cave Entrance","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_cave.png","key": "fee:conditional","value": "yes @ Mo-Fr 09:00-19:00","object_types": ["node","area"]},
 {"description":"Geography/Geography/Cave Entrance","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_cave.png","key": "fee:conditional","value": "no @ stay < 1 hour","object_types": ["node","area"]},
+{"description":"Geography/Geography/Arch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arch.png","key": "natural","value": "arch","object_types": ["node","way","area"]},
+{"description":"Geography/Geography/Arch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arch.png","key": "name","object_types": ["node","way","area"]},
+{"description":"Geography/Geography/Arch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arch.png","key": "wikipedia","object_types": ["node","way","area"]},
+{"description":"Geography/Geography/Arch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arch.png","key": "wikidata","object_types": ["node","way","area"]},
+{"description":"Geography/Geography/Arch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arch.png","key": "image","object_types": ["node","way","area"]},
+{"description":"Geography/Geography/Arch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arch.png","key": "mapillary","object_types": ["node","way","area"]},
+{"description":"Geography/Geography/Arch","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/poi_arch.png","key": "wikimedia_commons","object_types": ["node","way","area"]},
 {"description":"Geography/Geography/Geyser","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/natural_fountain_12060.png","key": "natural","value": "geyser","object_types": ["node","area"]},
 {"description":"Geography/Geography/Geyser","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/natural_fountain_12060.png","key": "name","object_types": ["node","area"]},
 {"description":"Geography/Geography/Geyser","icon_url":"https://simonpoole.github.io/beautified-JOSM-preset/icons/png/natural_fountain_12060.png","key": "wikipedia","object_types": ["node","area"]},