diff --git a/css/30_highways.css b/css/30_highways.css
index 931533625..d1f2e90c4 100644
--- a/css/30_highways.css
+++ b/css/30_highways.css
@@ -458,7 +458,7 @@ path.line.casing.tag-service {
 }
 
 /* special service roads and bus guideways */
-/* with `service=* tag`  (e.g. parking_aisle, alley, drive-through */
+/* with `service=* tag`  (e.g. parking_aisle, alley, drive-through) */
 .preset-icon .icon.iD-highway-bus_guideway,
 .preset-icon .icon.iD-highway-service.tag-service {
     color: #dca;
diff --git a/css/50_misc.css b/css/50_misc.css
index 265d641bb..fe454adab 100644
--- a/css/50_misc.css
+++ b/css/50_misc.css
@@ -3,6 +3,7 @@
 path.line.shadow.tag-aerialway,
 path.line.shadow.tag-attraction-summer_toboggan,
 path.line.shadow.tag-attraction-water_slide,
+path.line.shadow.tag-golf-cartpath,
 path.line.shadow.tag-man_made-pipeline,
 path.line.shadow.tag-natural-tree_row,
 path.line.shadow.tag-piste {
@@ -11,6 +12,7 @@ path.line.shadow.tag-piste {
 path.line.casing.tag-aerialway,
 path.line.casing.tag-attraction-summer_toboggan,
 path.line.casing.tag-attraction-water_slide,
+path.line.casing.tag-golf-cartpath,
 path.line.casing.tag-man_made-pipeline,
 path.line.casing.tag-natural-tree_row,
 path.line.casing.tag-piste {
@@ -19,6 +21,7 @@ path.line.casing.tag-piste {
 path.line.stroke.tag-aerialway,
 path.line.stroke.tag-attraction-summer_toboggan,
 path.line.stroke.tag-attraction-water_slide,
+path.line.stroke.tag-golf-cartpath,
 path.line.stroke.tag-man_made-pipeline,
 path.line.stroke.tag-natural-tree_row,
 path.line.stroke.tag-piste {
@@ -28,6 +31,7 @@ path.line.stroke.tag-piste {
 .low-zoom path.line.shadow.tag-aerialway,
 .low-zoom path.line.shadow.tag-attraction-summer_toboggan,
 .low-zoom path.line.shadow.tag-attraction-water_slide,
+.low-zoom path.line.shadow.tag-golf-cartpath,
 .low-zoom path.line.shadow.tag-man_made-pipeline,
 .low-zoom path.line.shadow.tag-natural-tree_row,
 .low-zoom path.line.shadow.tag-piste {
@@ -36,6 +40,7 @@ path.line.stroke.tag-piste {
 .low-zoom path.line.casing.tag-aerialway,
 .low-zoom path.line.casing.tag-attraction-summer_toboggan,
 .low-zoom path.line.casing.tag-attraction-water_slide,
+.low-zoom path.line.casing.tag-golf-cartpath,
 .low-zoom path.line.casing.tag-man_made-pipeline,
 .low-zoom path.line.casing.tag-natural-tree_row,
 .low-zoom path.line.casing.tag-piste {
@@ -44,6 +49,7 @@ path.line.stroke.tag-piste {
 .low-zoom path.line.stroke.tag-aerialway,
 .low-zoom path.line.stroke.tag-attraction-summer_toboggan,
 .low-zoom path.line.stroke.tag-attraction-water_slide,
+.low-zoom path.line.stroke.tag-golf-cartpath,
 .low-zoom path.line.stroke.tag-man_made-pipeline,
 .low-zoom path.line.stroke.tag-natural-tree_row,
 .low-zoom path.line.stroke.tag-piste {
@@ -84,6 +90,7 @@ path.line.casing.tag-aerialway {
     stroke: #444;
 }
 
+
 /* pistes */
 path.line.stroke.tag-piste {
     stroke: #9ac;
@@ -92,6 +99,36 @@ path.line.casing.tag-piste {
     stroke: #444;
 }
 
+
+/* Attractions */
+path.line.stroke.tag-attraction-summer_toboggan {
+    stroke: #9e9e9e;
+}
+path.line.casing.tag-attraction-summer_toboggan {
+    stroke: #666;
+}
+
+path.line.stroke.tag-attraction-water_slide {
+    stroke: #aae0cb;
+}
+path.line.casing.tag-attraction-water_slide {
+    stroke: #3d6c71;
+}
+
+
+/* golf cartpaths (like service roads) */
+.preset-icon .icon.tag-golf-cartpath {
+    color: #dca;
+    fill: #666;
+}
+path.line.stroke.tag-golf-cartpath {
+    stroke: #dca;
+}
+path.line.casing.tag-golf-cartpath {
+    stroke: #666;
+}
+
+
 /* power and pipeline */
 .preset-icon .icon.tag-man_made-pipeline,
 .preset-icon .icon.tag-power {
@@ -362,6 +399,7 @@ path.fill.tag-building {
 
 
 /* "Special" paths - platforms, piers, crossings */
+.preset-icon .icon.tag-golf-path,
 .preset-icon .icon.tag-public_transport-platform,
 .preset-icon .icon.tag-railway-platform,
 .preset-icon .icon.tag-man_made-pier,
@@ -371,6 +409,7 @@ path.fill.tag-building {
     fill: #dca;
 }
 
+.preset-icon-fill-area.tag-golf-path,
 .preset-icon-fill-area.tag-public_transport-platform,
 .preset-icon-fill-area.tag-railway-platform,
 .preset-icon-fill-area.tag-man_made-pier,
@@ -380,6 +419,7 @@ path.fill.tag-building {
     background-color: #dca;
 }
 
+path.line.shadow.tag-golf-path,
 path.line.shadow.tag-public_transport-platform,
 path.line.shadow.tag-railway-platform,
 path.line.shadow.tag-man_made-pier,
@@ -387,6 +427,7 @@ path.line.shadow.tag-footway.tag-footway-crossing,
 path.line.shadow.tag-crossing {
     stroke-width: 16;
 }
+path.line.casing.tag-golf-path,
 path.line.casing.tag-public_transport-platform,
 path.line.casing.tag-railway-platform,
 path.line.casing.tag-man_made-pier,
@@ -397,6 +438,7 @@ path.line.casing.tag-crossing {
     stroke-linecap: round;
     stroke-dasharray: none;
 }
+path.line.stroke.tag-golf-path,
 path.line.stroke.tag-public_transport-platform,
 path.line.stroke.tag-railway-platform,
 path.line.stroke.tag-man_made-pier,
@@ -408,6 +450,7 @@ path.line.stroke.tag-crossing {
     stroke-dasharray: 6, 6;
 }
 
+.low-zoom path.line.shadow.tag-golf-path,
 .low-zoom path.line.shadow.tag-public_transport-platform,
 .low-zoom path.line.shadow.tag-railway-platform,
 .low-zoom path.line.shadow.tag-man_made-pier,
@@ -415,6 +458,7 @@ path.line.stroke.tag-crossing {
 .low-zoom path.line.shadow.tag-crossing {
     stroke-width: 12;
 }
+.low-zoom path.line.casing.tag-golf-path,
 .low-zoom path.line.casing.tag-public_transport-platform,
 .low-zoom path.line.casing.tag-railway-platform,
 .low-zoom path.line.casing.tag-man_made-pier,
@@ -422,6 +466,7 @@ path.line.stroke.tag-crossing {
 .low-zoom path.line.casing.tag-crossing {
     stroke-width: 3;
 }
+.low-zoom path.line.stroke.tag-golf-path,
 .low-zoom path.line.stroke.tag-public_transport-platform,
 .low-zoom path.line.stroke.tag-railway-platform,
 .low-zoom path.line.stroke.tag-man_made-pier,
@@ -432,6 +477,7 @@ path.line.stroke.tag-crossing {
     stroke-dasharray: 3, 3;
 }
 
+g.midpoint.tag-golf-path .fill,
 g.midpoint.tag-public_transport-platform .fill,
 g.midpoint.tag-railway-platform .fill,
 g.midpoint.tag-man_made-pier .fill,
@@ -462,18 +508,3 @@ path.line.stroke.tag-crossing.tag-crossing-zebra {
 .low-zoom path.line.stroke.tag-crossing.tag-crossing-zebra {
     stroke-dasharray: 3, 2;
 }
-
-/* Attractions */
-path.line.stroke.tag-attraction-summer_toboggan {
-    stroke: #9e9e9e;
-}
-path.line.casing.tag-attraction-summer_toboggan {
-    stroke: #666;
-}
-
-path.line.stroke.tag-attraction-water_slide {
-    stroke: #aae0cb;
-}
-path.line.casing.tag-attraction-water_slide {
-    stroke: #3d6c71;
-}
diff --git a/data/presets.yaml b/data/presets.yaml
index 312d2fa88..c41f314c4 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -5,7 +5,9 @@ en:
         name: Barrier Features
       category-building:
         name: Building Features
-      category-golf:
+      category-golf-area:
+        name: Golf Features
+      category-golf-line:
         name: Golf Features
       category-landuse:
         name: Land Use Features
@@ -3780,6 +3782,18 @@ en:
         name: Sand Trap
         # 'terms: hazard,bunker'
         terms: '<translate with synonyms or related terms for ''Sand Trap'', separated by commas>'
+      golf/cartpath:
+        # 'golf=cartpath, golf_cart=designated'
+        name: Golf Cartpath
+        terms: '<translate with synonyms or related terms for ''Golf Cartpath'', separated by commas>'
+      golf/cartpath_service:
+        # 'highway=service, golf=cartpath, golf_cart=designated'
+        name: Golf Cartpath / Service Road
+        terms: '<translate with synonyms or related terms for ''Golf Cartpath / Service Road'', separated by commas>'
+      golf/driving_range:
+        # 'golf=driving_range, landuse=grass'
+        name: Driving Range
+        terms: '<translate with synonyms or related terms for ''Driving Range'', separated by commas>'
       golf/fairway:
         # 'golf=fairway, landuse=grass'
         name: Fairway
@@ -3792,14 +3806,14 @@ en:
         # golf=hole
         name: Golf Hole
         terms: '<translate with synonyms or related terms for ''Golf Hole'', separated by commas>'
-      golf/lateral_water_hazard_area:
+      golf/lateral_water_hazard:
         # 'golf=lateral_water_hazard, natural=water'
         name: Lateral Water Hazard
         terms: '<translate with synonyms or related terms for ''Lateral Water Hazard'', separated by commas>'
-      golf/lateral_water_hazard_line:
-        # golf=lateral_water_hazard
-        name: Lateral Water Hazard
-        terms: '<translate with synonyms or related terms for ''Lateral Water Hazard'', separated by commas>'
+      golf/path:
+        # 'golf=path, foot=designated'
+        name: Golf Walking Path
+        terms: '<translate with synonyms or related terms for ''Golf Walking Path'', separated by commas>'
       golf/rough:
         # 'golf=rough, landuse=grass'
         name: Rough
@@ -3809,14 +3823,10 @@ en:
         name: Tee Box
         # 'terms: teeing ground'
         terms: '<translate with synonyms or related terms for ''Tee Box'', separated by commas>'
-      golf/water_hazard_area:
+      golf/water_hazard:
         # 'golf=water_hazard, natural=water'
         name: Water Hazard
         terms: '<translate with synonyms or related terms for ''Water Hazard'', separated by commas>'
-      golf/water_hazard_line:
-        # golf=water_hazard
-        name: Water Hazard
-        terms: '<translate with synonyms or related terms for ''Water Hazard'', separated by commas>'
       healthcare:
         # healthcare=*
         name: Healthcare Facility
diff --git a/data/presets/categories.json b/data/presets/categories.json
index c1a7c16a0..b4343a4a2 100644
--- a/data/presets/categories.json
+++ b/data/presets/categories.json
@@ -29,18 +29,30 @@
         "building/residential"
       ]
     },
-    "category-golf": {
+    "category-golf-area": {
       "icon": "maki-golf",
       "geometry": "area",
       "name": "Golf Features",
       "members": [
         "golf/fairway",
         "golf/green",
-        "golf/lateral_water_hazard_area",
+        "golf/lateral_water_hazard",
         "golf/rough",
         "golf/bunker",
         "golf/tee",
-        "golf/water_hazard_area"
+        "golf/water_hazard",
+        "golf/driving_range"
+      ]
+    },
+    "category-golf-line": {
+      "icon": "maki-golf",
+      "geometry": "line",
+      "name": "Golf Features",
+      "members": [
+        "golf/hole",
+        "golf/cartpath",
+        "golf/cartpath_service",
+        "golf/path"
       ]
     },
     "category-landuse": {
diff --git a/data/presets/categories/golf.json b/data/presets/categories/golf-area.json
similarity index 69%
rename from data/presets/categories/golf.json
rename to data/presets/categories/golf-area.json
index 0416577f8..4e43047b9 100644
--- a/data/presets/categories/golf.json
+++ b/data/presets/categories/golf-area.json
@@ -5,10 +5,11 @@
     "members": [
         "golf/fairway",
         "golf/green",
-        "golf/lateral_water_hazard_area",
+        "golf/lateral_water_hazard",
         "golf/rough",
         "golf/bunker",
         "golf/tee",
-        "golf/water_hazard_area"
+        "golf/water_hazard",
+        "golf/driving_range"
     ]
 }
diff --git a/data/presets/categories/golf-line.json b/data/presets/categories/golf-line.json
new file mode 100644
index 000000000..f108f968d
--- /dev/null
+++ b/data/presets/categories/golf-line.json
@@ -0,0 +1,11 @@
+{
+    "icon": "maki-golf",
+    "geometry": "line",
+    "name": "Golf Features",
+    "members": [
+        "golf/hole",
+        "golf/cartpath",
+        "golf/cartpath_service",
+        "golf/path"
+    ]
+}
diff --git a/data/presets/presets.json b/data/presets/presets.json
index 7b5f723e2..7c629c849 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -375,15 +375,17 @@
     "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "terms": ["entrance", "exit", "door"], "tags": {"entrance": "*"}, "fields": ["entrance", "access_simple", "address"], "name": "Entrance/Exit"},
     "ford": {"geometry": ["vertex"], "tags": {"ford": "yes"}, "name": "Ford"},
     "golf/bunker": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "bunker", "natural": "sand"}, "terms": ["hazard", "bunker"], "reference": {"key": "golf", "value": "bunker"}, "name": "Sand Trap"},
+    "golf/cartpath_service": {"icon": "maki-golf", "fields": ["{golf/path}", "maxspeed"], "geometry": ["line"], "tags": {"highway": "service", "golf": "cartpath", "golf_cart": "designated"}, "reference": {"key": "golf", "value": "cartpath"}, "name": "Golf Cartpath / Service Road"},
+    "golf/cartpath": {"icon": "maki-golf", "fields": ["{golf/path}"], "geometry": ["line"], "tags": {"golf": "cartpath", "golf_cart": "designated"}, "reference": {"key": "golf", "value": "cartpath"}, "name": "Golf Cartpath"},
+    "golf/driving_range": {"icon": "maki-golf", "fields": ["name", "capacity"], "geometry": ["area"], "tags": {"golf": "driving_range", "landuse": "grass"}, "reference": {"key": "golf", "value": "driving_range"}, "name": "Driving Range"},
     "golf/fairway": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "fairway", "landuse": "grass"}, "reference": {"key": "golf", "value": "fairway"}, "name": "Fairway"},
     "golf/green": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "green", "landuse": "grass", "leisure": "pitch", "sport": "golf"}, "reference": {"key": "golf", "value": "green"}, "name": "Putting Green"},
     "golf/hole": {"icon": "maki-golf", "fields": ["name", "ref_golf_hole", "par", "handicap"], "geometry": ["line"], "tags": {"golf": "hole"}, "name": "Golf Hole"},
-    "golf/lateral_water_hazard_area": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "lateral_water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "lateral_water_hazard"}, "name": "Lateral Water Hazard"},
-    "golf/lateral_water_hazard_line": {"icon": "maki-golf", "fields": ["name"], "geometry": ["line"], "tags": {"golf": "lateral_water_hazard"}, "name": "Lateral Water Hazard"},
+    "golf/lateral_water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "lateral_water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "lateral_water_hazard"}, "name": "Lateral Water Hazard"},
+    "golf/path": {"icon": "maki-golf", "fields": ["name", "surface", "width", "structure", "incline"], "geometry": ["line"], "tags": {"golf": "path", "foot": "designated"}, "reference": {"key": "golf", "value": "path"}, "name": "Golf Walking Path"},
     "golf/rough": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "rough", "landuse": "grass"}, "reference": {"key": "golf", "value": "rough"}, "name": "Rough"},
     "golf/tee": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "tee", "landuse": "grass"}, "terms": ["teeing ground"], "reference": {"key": "golf", "value": "tee"}, "name": "Tee Box"},
-    "golf/water_hazard_area": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "water_hazard"}, "name": "Water Hazard"},
-    "golf/water_hazard_line": {"icon": "maki-golf", "fields": ["name"], "geometry": ["line"], "tags": {"golf": "water_hazard"}, "name": "Water Hazard"},
+    "golf/water_hazard": {"icon": "maki-golf", "fields": ["name"], "geometry": ["area"], "tags": {"golf": "water_hazard", "natural": "water"}, "reference": {"key": "golf", "value": "water_hazard"}, "name": "Water Hazard"},
     "healthcare": {"icon": "maki-hospital", "fields": ["name", "healthcare", "operator", "healthcare/speciality", "address", "building_area"], "moreFields": ["opening_hours", "payment_multi", "brand", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "tags": {"healthcare": "*"}, "terms": ["clinic", "doctor", "disease", "health", "institution", "sick", "surgery", "wellness"], "name": "Healthcare Facility"},
     "healthcare/alternative": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["acupuncture", "anthroposophical", "applied kinesiology", "aromatherapy", "ayurveda", "herbalism", "homeopathy", "hydrotherapy", "hypnosis", "naturopathy", "osteopathy", "reflexology", "reiki", "shiatsu", "traditional", "tuina", "unani"], "tags": {"healthcare": "alternative"}, "name": "Alternative Medicine"},
     "healthcare/alternative/chiropractic": {"icon": "maki-hospital", "geometry": ["point", "area"], "terms": ["back", "pain", "spine"], "tags": {"healthcare": "alternative", "healthcare:speciality": "chiropractic"}, "name": "Chiropractor"},
diff --git a/data/presets/presets/golf/cartpath.json b/data/presets/presets/golf/cartpath.json
new file mode 100644
index 000000000..45e5892c9
--- /dev/null
+++ b/data/presets/presets/golf/cartpath.json
@@ -0,0 +1,18 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "{golf/path}"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "golf": "cartpath",
+        "golf_cart": "designated"
+    },
+    "reference": {
+        "key": "golf",
+        "value": "cartpath"
+    },
+    "name": "Golf Cartpath"
+}
diff --git a/data/presets/presets/golf/cartpath_service.json b/data/presets/presets/golf/cartpath_service.json
new file mode 100644
index 000000000..ff3d463b1
--- /dev/null
+++ b/data/presets/presets/golf/cartpath_service.json
@@ -0,0 +1,20 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "{golf/path}",
+        "maxspeed"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "highway": "service",
+        "golf": "cartpath",
+        "golf_cart": "designated"
+    },
+    "reference": {
+        "key": "golf",
+        "value": "cartpath"
+    },
+    "name": "Golf Cartpath / Service Road"
+}
diff --git a/data/presets/presets/golf/driving_range.json b/data/presets/presets/golf/driving_range.json
new file mode 100644
index 000000000..4db26eada
--- /dev/null
+++ b/data/presets/presets/golf/driving_range.json
@@ -0,0 +1,19 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "name",
+        "capacity"
+    ],
+    "geometry": [
+        "area"
+    ],
+    "tags": {
+        "golf": "driving_range",
+        "landuse": "grass"
+    },
+    "reference": {
+        "key": "golf",
+        "value": "driving_range"
+    },
+    "name": "Driving Range"
+}
diff --git a/data/presets/presets/golf/lateral_water_hazard_area.json b/data/presets/presets/golf/lateral_water_hazard.json
similarity index 100%
rename from data/presets/presets/golf/lateral_water_hazard_area.json
rename to data/presets/presets/golf/lateral_water_hazard.json
diff --git a/data/presets/presets/golf/lateral_water_hazard_line.json b/data/presets/presets/golf/lateral_water_hazard_line.json
deleted file mode 100644
index ea9617b8a..000000000
--- a/data/presets/presets/golf/lateral_water_hazard_line.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "icon": "maki-golf",
-    "fields": [
-        "name"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "golf": "lateral_water_hazard"
-    },
-    "name": "Lateral Water Hazard"
-}
diff --git a/data/presets/presets/golf/path.json b/data/presets/presets/golf/path.json
new file mode 100644
index 000000000..8f4941788
--- /dev/null
+++ b/data/presets/presets/golf/path.json
@@ -0,0 +1,22 @@
+{
+    "icon": "maki-golf",
+    "fields": [
+        "name",
+        "surface",
+        "width",
+        "structure",
+        "incline"
+    ],
+    "geometry": [
+        "line"
+    ],
+    "tags": {
+        "golf": "path",
+        "foot": "designated"
+    },
+    "reference": {
+        "key": "golf",
+        "value": "path"
+    },
+    "name": "Golf Walking Path"
+}
diff --git a/data/presets/presets/golf/water_hazard_area.json b/data/presets/presets/golf/water_hazard.json
similarity index 100%
rename from data/presets/presets/golf/water_hazard_area.json
rename to data/presets/presets/golf/water_hazard.json
diff --git a/data/presets/presets/golf/water_hazard_line.json b/data/presets/presets/golf/water_hazard_line.json
deleted file mode 100644
index c913830c6..000000000
--- a/data/presets/presets/golf/water_hazard_line.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "icon": "maki-golf",
-    "fields": [
-        "name"
-    ],
-    "geometry": [
-        "line"
-    ],
-    "tags": {
-        "golf": "water_hazard"
-    },
-    "name": "Water Hazard"
-}
diff --git a/data/taginfo.json b/data/taginfo.json
index 39d613059..711676da7 100644
--- a/data/taginfo.json
+++ b/data/taginfo.json
@@ -375,12 +375,12 @@
     {"key": "entrance", "description": "🄿 Entrance/Exit, 🄵 Type", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/entrance-alt1-15.svg?sanitize=true"},
     {"key": "ford", "value": "yes", "description": "🄿 Ford", "object_types": ["node"]},
     {"key": "natural", "value": "sand", "description": "🄿 Sand Trap, 🄿 Sand", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
-    {"key": "landuse", "value": "grass", "description": "🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
+    {"key": "golf_cart", "value": "designated", "description": "🄿 Golf Cartpath / Service Road, 🄿 Golf Cartpath", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
+    {"key": "landuse", "value": "grass", "description": "🄿 Driving Range, 🄿 Fairway, 🄿 Rough, 🄿 Tee Box, 🄿 Grass", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "sport", "value": "golf", "description": "🄿 Putting Green", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "golf", "value": "hole", "description": "🄿 Golf Hole", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "natural", "value": "water", "description": "🄿 Lateral Water Hazard, 🄿 Water Hazard, 🄿 Water", "object_types": ["area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
-    {"key": "golf", "value": "lateral_water_hazard", "description": "🄿 Lateral Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
-    {"key": "golf", "value": "water_hazard", "description": "🄿 Water Hazard", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
+    {"key": "foot", "value": "designated", "description": "🄿 Golf Walking Path, 🄵 Allowed Access", "object_types": ["way"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/golf-15.svg?sanitize=true"},
     {"key": "healthcare", "description": "🄿 Healthcare Facility, 🄵 Type", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
     {"key": "healthcare", "value": "alternative", "description": "🄿 Alternative Medicine", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
     {"key": "healthcare:speciality", "value": "chiropractic", "description": "🄿 Chiropractor", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/hospital-15.svg?sanitize=true"},
@@ -1035,7 +1035,6 @@
     {"key": "foot", "value": "no", "description": "🄵 Allowed Access"},
     {"key": "foot", "value": "permissive", "description": "🄵 Allowed Access"},
     {"key": "foot", "value": "private", "description": "🄵 Allowed Access"},
-    {"key": "foot", "value": "designated", "description": "🄵 Allowed Access"},
     {"key": "foot", "value": "destination", "description": "🄵 Allowed Access"},
     {"key": "foot", "value": "dismount", "description": "🄵 Allowed Access"},
     {"key": "foot", "value": "permit", "description": "🄵 Allowed Access"},
diff --git a/dist/locales/en.json b/dist/locales/en.json
index af16c735a..9681ac07d 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1973,7 +1973,10 @@
                 "category-building": {
                     "name": "Building Features"
                 },
-                "category-golf": {
+                "category-golf-area": {
+                    "name": "Golf Features"
+                },
+                "category-golf-line": {
                     "name": "Golf Features"
                 },
                 "category-landuse": {
@@ -5286,6 +5289,18 @@
                     "name": "Sand Trap",
                     "terms": "hazard,bunker"
                 },
+                "golf/cartpath_service": {
+                    "name": "Golf Cartpath / Service Road",
+                    "terms": ""
+                },
+                "golf/cartpath": {
+                    "name": "Golf Cartpath",
+                    "terms": ""
+                },
+                "golf/driving_range": {
+                    "name": "Driving Range",
+                    "terms": ""
+                },
                 "golf/fairway": {
                     "name": "Fairway",
                     "terms": ""
@@ -5298,12 +5313,12 @@
                     "name": "Golf Hole",
                     "terms": ""
                 },
-                "golf/lateral_water_hazard_area": {
+                "golf/lateral_water_hazard": {
                     "name": "Lateral Water Hazard",
                     "terms": ""
                 },
-                "golf/lateral_water_hazard_line": {
-                    "name": "Lateral Water Hazard",
+                "golf/path": {
+                    "name": "Golf Walking Path",
                     "terms": ""
                 },
                 "golf/rough": {
@@ -5314,11 +5329,7 @@
                     "name": "Tee Box",
                     "terms": "teeing ground"
                 },
-                "golf/water_hazard_area": {
-                    "name": "Water Hazard",
-                    "terms": ""
-                },
-                "golf/water_hazard_line": {
+                "golf/water_hazard": {
                     "name": "Water Hazard",
                     "terms": ""
                 },
diff --git a/modules/svg/tag_classes.js b/modules/svg/tag_classes.js
index 0e0a08479..9d3b4a158 100644
--- a/modules/svg/tag_classes.js
+++ b/modules/svg/tag_classes.js
@@ -15,7 +15,7 @@ export function svgTagClasses() {
     var secondaries = [
         'oneway', 'bridge', 'tunnel', 'embankment', 'cutting', 'barrier',
         'surface', 'tracktype', 'footway', 'crossing', 'service', 'sport',
-        'public_transport', 'location', 'parking'
+        'public_transport', 'location', 'parking', 'golf'
     ];
     var _tags = function(entity) { return entity.tags; };
 
diff --git a/modules/ui/raw_tag_editor.js b/modules/ui/raw_tag_editor.js
index 6e3cac6e5..50b37de57 100644
--- a/modules/ui/raw_tag_editor.js
+++ b/modules/ui/raw_tag_editor.js
@@ -145,6 +145,7 @@ export function uiRawTagEditor(context) {
             .append('button')
             .attr('tabindex', -1)
             .attr('class', 'form-field-button remove')
+            .attr('title', t('icons.remove'))
             .call(svgIcon('#iD-operation-delete'));