diff --git a/css/80_app.css b/css/80_app.css
index 0ac12ee94..b7c914476 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -1194,6 +1194,9 @@ a.hide-toggle {
 .preset-icon-iD {
     transform: scale(1);
 }
+.preset-icon-iD.framed {
+    transform: scale(0.74);
+}
 .preset-icon-iD.framed.line-geom {
     transform: translateY(-30%) scale(0.74);
 }
diff --git a/data/presets.yaml b/data/presets.yaml
index 10167ae48..28b08d5ff 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5,17 +5,11 @@ en:
         name: Barrier Features
       category-building:
         name: Building Features
-      category-golf-area:
-        name: Golf Features
-      category-golf-line:
+      category-golf:
         name: Golf Features
       category-landuse:
         name: Land Use Features
-      category-natural-area:
-        name: Natural Features
-      category-natural-line:
-        name: Natural Features
-      category-natural-point:
+      category-natural:
         name: Natural Features
       category-path:
         name: Path Features
@@ -29,9 +23,7 @@ en:
         name: Route Features
       category-utility:
         name: Utility Features
-      category-water-area:
-        name: Water Features
-      category-water-line:
+      category-water:
         name: Water Features
     fields:
       access:
diff --git a/data/presets/categories.json b/data/presets/categories.json
index b4343a4a2..463cad012 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -2,7 +2,6 @@
   "categories": {
     "category-barrier": {
       "icon": "maki-roadblock",
-      "geometry": "line",
       "name": "Barrier Features",
       "members": [
         "barrier/fence",
@@ -16,7 +15,6 @@
     },
     "category-building": {
       "icon": "maki-building",
-      "geometry": "area",
       "name": "Building Features",
       "members": [
         "building",
@@ -29,9 +27,8 @@
         "building/residential"
       ]
     },
-    "category-golf-area": {
+    "category-golf": {
       "icon": "maki-golf",
-      "geometry": "area",
       "name": "Golf Features",
       "members": [
         "golf/fairway",
@@ -41,14 +38,7 @@
         "golf/bunker",
         "golf/tee",
         "golf/water_hazard",
-        "golf/driving_range"
-      ]
-    },
-    "category-golf-line": {
-      "icon": "maki-golf",
-      "geometry": "line",
-      "name": "Golf Features",
-      "members": [
+        "golf/driving_range",
         "golf/hole",
         "golf/cartpath",
         "golf/cartpath_service",
@@ -57,7 +47,6 @@
     },
     "category-landuse": {
       "icon": "maki-landuse",
-      "geometry": "area",
       "name": "Land Use Features",
       "members": [
         "landuse/residential",
@@ -74,9 +63,8 @@
         "landuse/religious"
       ]
     },
-    "category-natural-area": {
+    "category-natural": {
       "icon": "maki-natural",
-      "geometry": "area",
       "name": "Natural Features",
       "members": [
         "natural/water",
@@ -88,20 +76,9 @@
         "natural/bare_rock",
         "natural/beach",
         "natural/cave_entrance",
-        "natural/glacier"
-      ]
-    },
-    "category-natural-line": {
-      "icon": "maki-natural",
-      "geometry": "line",
-      "name": "Natural Features",
-      "members": ["natural/coastline", "natural/tree_row"]
-    },
-    "category-natural-point": {
-      "icon": "maki-natural",
-      "geometry": "point",
-      "name": "Natural Features",
-      "members": [
+        "natural/glacier",
+        "natural/coastline",
+        "natural/tree_row",
         "natural/peak",
         "natural/cliff",
         "natural/beach",
@@ -110,7 +87,6 @@
     },
     "category-path": {
       "icon": "iD-category-path",
-      "geometry": "line",
       "name": "Path Features",
       "members": [
         "highway/footway/marked",
@@ -125,20 +101,21 @@
     },
     "category-rail": {
       "icon": "iD-category-rail",
-      "geometry": "line",
       "name": "Rail Features",
       "members": [
         "railway/rail",
         "railway/subway",
         "railway/tram",
-        "railway/monorail",
         "railway/disused",
-        "railway/abandoned"
+        "railway/level_crossing",
+        "railway/crossing",
+        "railway/switch",
+        "railway/buffer_stop",
+        "railway/signal"
       ]
     },
     "category-restriction": {
       "icon": "iD-restriction",
-      "geometry": "relation",
       "name": "Restriction Features",
       "members": [
         "type/restriction/no_left_turn",
@@ -154,7 +131,6 @@
     },
     "category-road": {
       "icon": "iD-category-roads",
-      "geometry": "line",
       "name": "Road Features",
       "members": [
         "highway/residential",
@@ -177,7 +153,6 @@
     },
     "category-route": {
       "icon": "iD-route",
-      "geometry": "relation",
       "name": "Route Features",
       "members": [
         "type/route/road",
@@ -201,7 +176,6 @@
     },
     "category-utility": {
       "icon": "iD-category-utility",
-      "geometry": "line",
       "name": "Utility Features",
       "members": [
         "power/line",
@@ -210,22 +184,14 @@
         "power/cable/underground"
       ]
     },
-    "category-water-area": {
+    "category-water": {
       "icon": "maki-water",
-      "geometry": "area",
       "name": "Water Features",
       "members": [
         "natural/water/lake",
         "natural/water/pond",
         "natural/water/reservoir",
-        "natural/water"
-      ]
-    },
-    "category-water-line": {
-      "icon": "iD-category-water",
-      "geometry": "line",
-      "name": "Water Features",
-      "members": [
+        "natural/water",
         "waterway/river",
         "waterway/stream",
         "waterway/canal",
diff --git a/data/presets/categories/barrier.json b/data/presets/categories/barrier.json
index e3fb9e5fe..752db1d27 100644
--- a/data/presets/categories/barrier.json
+++ b/data/presets/categories/barrier.json
@@ -1,6 +1,5 @@
 {
     "icon": "maki-roadblock",
-    "geometry": "line",
     "name": "Barrier Features",
     "members": [
         "barrier/fence",
diff --git a/data/presets/categories/building.json b/data/presets/categories/building.json
index 05a116721..0b020a285 100644
--- a/data/presets/categories/building.json
+++ b/data/presets/categories/building.json
@@ -1,6 +1,5 @@
 {
     "icon": "maki-building",
-    "geometry": "area",
     "name": "Building Features",
     "members": [
         "building",
diff --git a/data/presets/categories/golf-line.json b/data/presets/categories/golf-line.json
deleted file mode 100644
index f108f968d..000000000
--- a/data/presets/categories/golf-line.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "icon": "maki-golf",
-    "geometry": "line",
-    "name": "Golf Features",
-    "members": [
-        "golf/hole",
-        "golf/cartpath",
-        "golf/cartpath_service",
-        "golf/path"
-    ]
-}
diff --git a/data/presets/categories/golf-area.json b/data/presets/categories/golf.json
similarity index 66%
rename from data/presets/categories/golf-area.json
rename to data/presets/categories/golf.json
index 4e43047b9..8b175b4ed 100644
--- a/data/presets/categories/golf-area.json
+++ b/data/presets/categories/golf.json
@@ -1,6 +1,5 @@
 {
     "icon": "maki-golf",
-    "geometry": "area",
     "name": "Golf Features",
     "members": [
         "golf/fairway",
@@ -10,6 +9,10 @@
         "golf/bunker",
         "golf/tee",
         "golf/water_hazard",
-        "golf/driving_range"
+        "golf/driving_range",
+        "golf/hole",
+        "golf/cartpath",
+        "golf/cartpath_service",
+        "golf/path"
     ]
 }
diff --git a/data/presets/categories/landuse.json b/data/presets/categories/landuse.json
index 7d92de866..e4e6ed9c5 100644
--- a/data/presets/categories/landuse.json
+++ b/data/presets/categories/landuse.json
@@ -1,6 +1,5 @@
 {
     "icon": "maki-landuse",
-    "geometry": "area",
     "name": "Land Use Features",
     "members": [
         "landuse/residential",
diff --git a/data/presets/categories/natural-line.json b/data/presets/categories/natural-line.json
deleted file mode 100644
index 12f1b1705..000000000
--- a/data/presets/categories/natural-line.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "icon": "maki-natural",
-    "geometry": "line",
-    "name": "Natural Features",
-    "members": [
-        "natural/coastline",
-        "natural/tree_row"
-    ]
-}
diff --git a/data/presets/categories/natural-point.json b/data/presets/categories/natural-point.json
deleted file mode 100644
index e10d5a1ef..000000000
--- a/data/presets/categories/natural-point.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "icon": "maki-natural",
-    "geometry": "point",
-    "name": "Natural Features",
-    "members": [
-        "natural/peak",
-        "natural/cliff",
-        "natural/beach",
-        "natural/cave_entrance"
-    ]
-}
diff --git a/data/presets/categories/natural-area.json b/data/presets/categories/natural.json
similarity index 63%
rename from data/presets/categories/natural-area.json
rename to data/presets/categories/natural.json
index 607f3b11d..020c8e9ae 100644
--- a/data/presets/categories/natural-area.json
+++ b/data/presets/categories/natural.json
@@ -1,6 +1,5 @@
 {
     "icon": "maki-natural",
-    "geometry": "area",
     "name": "Natural Features",
     "members": [
         "natural/water",
@@ -12,6 +11,12 @@
         "natural/bare_rock",
         "natural/beach",
         "natural/cave_entrance",
-        "natural/glacier"
+        "natural/glacier",
+        "natural/coastline",
+        "natural/tree_row",
+        "natural/peak",
+        "natural/cliff",
+        "natural/beach",
+        "natural/cave_entrance"
     ]
 }
diff --git a/data/presets/categories/path.json b/data/presets/categories/path.json
index 275e726f3..df2713284 100644
--- a/data/presets/categories/path.json
+++ b/data/presets/categories/path.json
@@ -1,6 +1,5 @@
 {
     "icon": "iD-category-path",
-    "geometry": "line",
     "name": "Path Features",
     "members": [
         "highway/footway/marked",
diff --git a/data/presets/categories/rail.json b/data/presets/categories/rail.json
index f7489a689..c37347bba 100644
--- a/data/presets/categories/rail.json
+++ b/data/presets/categories/rail.json
@@ -1,13 +1,15 @@
 {
     "icon": "iD-category-rail",
-    "geometry": "line",
     "name": "Rail Features",
     "members": [
         "railway/rail",
         "railway/subway",
         "railway/tram",
-        "railway/monorail",
         "railway/disused",
-        "railway/abandoned"
+        "railway/level_crossing",
+        "railway/crossing",
+        "railway/switch",
+        "railway/buffer_stop",
+        "railway/signal"
     ]
 }
diff --git a/data/presets/categories/restriction.json b/data/presets/categories/restriction.json
index bf5bb5d06..52d52f2f3 100644
--- a/data/presets/categories/restriction.json
+++ b/data/presets/categories/restriction.json
@@ -1,6 +1,5 @@
 {
     "icon": "iD-restriction",
-    "geometry": "relation",
     "name": "Restriction Features",
     "members": [
         "type/restriction/no_left_turn",
diff --git a/data/presets/categories/road.json b/data/presets/categories/road.json
index eaabdf505..eedbb8b71 100644
--- a/data/presets/categories/road.json
+++ b/data/presets/categories/road.json
@@ -1,6 +1,5 @@
 {
     "icon": "iD-category-roads",
-    "geometry": "line",
     "name": "Road Features",
     "members": [
         "highway/residential",
diff --git a/data/presets/categories/route.json b/data/presets/categories/route.json
index 6c05b0b03..35a16337f 100644
--- a/data/presets/categories/route.json
+++ b/data/presets/categories/route.json
@@ -1,6 +1,5 @@
 {
     "icon": "iD-route",
-    "geometry": "relation",
     "name": "Route Features",
     "members": [
         "type/route/road",
diff --git a/data/presets/categories/utility.json b/data/presets/categories/utility.json
index 63aae92d0..1509c4ab1 100644
--- a/data/presets/categories/utility.json
+++ b/data/presets/categories/utility.json
@@ -1,6 +1,5 @@
 {
     "icon": "iD-category-utility",
-    "geometry": "line",
     "name": "Utility Features",
     "members": [
         "power/line",
diff --git a/data/presets/categories/water-area.json b/data/presets/categories/water-area.json
deleted file mode 100644
index 99c83125a..000000000
--- a/data/presets/categories/water-area.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "icon": "maki-water",
-    "geometry": "area",
-    "name": "Water Features",
-    "members": [
-        "natural/water/lake",
-        "natural/water/pond",
-        "natural/water/reservoir",
-        "natural/water"
-    ]
-}
diff --git a/data/presets/categories/water-line.json b/data/presets/categories/water.json
similarity index 56%
rename from data/presets/categories/water-line.json
rename to data/presets/categories/water.json
index 7a7c8c3ff..06c7f4818 100644
--- a/data/presets/categories/water-line.json
+++ b/data/presets/categories/water.json
@@ -1,8 +1,11 @@
 {
-    "icon": "iD-category-water",
-    "geometry": "line",
+    "icon": "maki-water",
     "name": "Water Features",
     "members": [
+        "natural/water/lake",
+        "natural/water/pond",
+        "natural/water/reservoir",
+        "natural/water",
         "waterway/river",
         "waterway/stream",
         "waterway/canal",
diff --git a/data/presets/defaults.json b/data/presets/defaults.json
index 71247c4da..8d2de9016 100644
--- a/data/presets/defaults.json
+++ b/data/presets/defaults.json
@@ -3,8 +3,8 @@
     "area": [
       "category-landuse",
       "category-building",
-      "category-water-area",
-      "category-natural-area",
+      "category-water",
+      "category-natural",
       "leisure/park",
       "amenity/hospital",
       "amenity/place_of_worship",
@@ -16,14 +16,14 @@
       "category-road",
       "category-rail",
       "category-path",
-      "category-water-line",
+      "category-water",
       "category-barrier",
-      "category-natural-line",
+      "category-natural",
       "category-utility",
       "line"
     ],
     "point": [
-      "category-natural-point",
+      "category-natural",
       "leisure/park",
       "amenity/hospital",
       "amenity/place_of_worship",
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 50f0bea75..58f9d3a84 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -2065,22 +2065,13 @@
                 "category-building": {
                     "name": "Building Features"
                 },
-                "category-golf-area": {
-                    "name": "Golf Features"
-                },
-                "category-golf-line": {
+                "category-golf": {
                     "name": "Golf Features"
                 },
                 "category-landuse": {
                     "name": "Land Use Features"
                 },
-                "category-natural-area": {
-                    "name": "Natural Features"
-                },
-                "category-natural-line": {
-                    "name": "Natural Features"
-                },
-                "category-natural-point": {
+                "category-natural": {
                     "name": "Natural Features"
                 },
                 "category-path": {
@@ -2101,10 +2092,7 @@
                 "category-utility": {
                     "name": "Utility Features"
                 },
-                "category-water-area": {
-                    "name": "Water Features"
-                },
-                "category-water-line": {
+                "category-water": {
                     "name": "Water Features"
                 }
             },
diff --git a/modules/presets/category.js b/modules/presets/category.js
index 3a538aae0..582ef71ca 100644
--- a/modules/presets/category.js
+++ b/modules/presets/category.js
@@ -14,6 +14,17 @@ export function presetCategory(id, category, all) {
     }));
 
 
+    category.geometry = category.members.collection.reduce(function(geometries, preset) {
+        for (var index in preset.geometry) {
+            var geometry = preset.geometry[index];
+            if (geometries.indexOf(geometry) === -1) {
+                geometries.push(geometry);
+            }
+        }
+        return geometries;
+    }, []);
+
+
     category.matchGeometry = function(geometry) {
         return category.geometry.indexOf(geometry) >= 0;
     };
diff --git a/modules/ui/preset_list.js b/modules/ui/preset_list.js
index 8aecda79b..1e8ab2d46 100644
--- a/modules/ui/preset_list.js
+++ b/modules/ui/preset_list.js
@@ -339,11 +339,12 @@ export function uiPresetList(context) {
                     .style('padding-bottom', '0px');
             } else {
                 shown = true;
-                sublist.call(drawList, preset.members);
+                var members = preset.members.matchGeometry(context.geometry(_entityID));
+                sublist.call(drawList, members);
                 box.transition()
                     .duration(200)
                     .style('opacity', '1')
-                    .style('max-height', 200 + preset.members.collection.length * 190 + 'px')
+                    .style('max-height', 200 + members.collection.length * 190 + 'px')
                     .style('padding-bottom', '10px');
             }
         };