diff --git a/data/core.yaml b/data/core.yaml
index 0faecc857..5d68d0340 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -460,6 +460,10 @@ en:
       notes:
         tooltip: Note data from OpenStreetMap
         title: OpenStreetMap notes
+      custom:
+        tooltip: "Drag and drop a data file onto the page, or click the button to setup"
+        title: Custom Map Data
+        zoom: Zoom to data
     fill_area: Fill Areas
     map_features: Map Features
     autohidden: "These features have been automatically hidden because too many would be shown on the screen.  You can zoom in to edit them."
@@ -620,16 +624,6 @@ en:
     out: Zoom out
   cannot_zoom: "Cannot zoom out further in current mode."
   full_screen: Toggle Full Screen
-  gpx:
-    local_layer: "Add a GPX"
-    drag_drop: "Drag and drop a .gpx, .geojson or .kml file on the page, or click the button to the right to browse"
-    zoom: "Zoom to layer"
-    browse: "Browse for a file"
-  mvt:
-    local_layer: "Add a MVT"
-    drag_drop: "Drag and drop a .mvt or .pbf file on the page, or click the button to the right to browse"
-    zoom: "Zoom to layer"
-    browse: "Browse for a file"
   streetside:
     tooltip: "Streetside photos from Microsoft"
     title: "Photo Overlay (Bing Streetside)"
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 8489e25b1..0e247edf1 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -558,6 +558,11 @@
                 "notes": {
                     "tooltip": "Note data from OpenStreetMap",
                     "title": "OpenStreetMap notes"
+                },
+                "custom": {
+                    "tooltip": "Drag and drop a data file onto the page, or click the button to setup",
+                    "title": "Custom Map Data",
+                    "zoom": "Zoom to data"
                 }
             },
             "fill_area": "Fill Areas",
@@ -754,18 +759,6 @@
         },
         "cannot_zoom": "Cannot zoom out further in current mode.",
         "full_screen": "Toggle Full Screen",
-        "gpx": {
-            "local_layer": "Add a GPX",
-            "drag_drop": "Drag and drop a .gpx, .geojson or .kml file on the page, or click the button to the right to browse",
-            "zoom": "Zoom to layer",
-            "browse": "Browse for a file"
-        },
-        "mvt": {
-            "local_layer": "Add a MVT",
-            "drag_drop": "Drag and drop a .mvt or .pbf file on the page, or click the button to the right to browse",
-            "zoom": "Zoom to layer",
-            "browse": "Browse for a file"
-        },
         "streetside": {
             "tooltip": "Streetside photos from Microsoft",
             "title": "Photo Overlay (Bing Streetside)",
diff --git a/modules/ui/map_data.js b/modules/ui/map_data.js
index ad4ba47fd..0f8ff4e9c 100644
--- a/modules/ui/map_data.js
+++ b/modules/ui/map_data.js
@@ -245,7 +245,7 @@ export function uiMapData(context) {
         liEnter
             .append('button')
             .call(tooltip()
-                .title(t('gpx.zoom'))
+                .title(t('map_data.layers.custom.zoom'))
                 .placement((textDirection === 'rtl') ? 'right' : 'left')
             )
             .on('click', function() {
@@ -255,27 +255,10 @@ export function uiMapData(context) {
             })
             .call(svgIcon('#iD-icon-search'));
 
-        // liEnter
-        //     .append('button')
-        //     .attr('class', 'list-item-data-browse')
-        //     .call(tooltip()
-        //         .title(t('gpx.browse'))
-        //         .placement((textDirection === 'rtl') ? 'right' : 'left')
-        //     )
-        //     .on('click', function() {
-        //         d3_select(document.createElement('input'))
-        //             .attr('type', 'file')
-        //             .on('change', function() {
-        //                 dataLayer.files(d3_event.target.files);
-        //             })
-        //             .node().click();
-        //     })
-        //     .call(svgIcon('#iD-icon-geolocate'));
-
         var labelEnter = liEnter
             .append('label')
             .call(tooltip()
-                .title(t('gpx.drag_drop'))
+                .title(t('map_data.layers.custom.tooltip'))
                 .placement('top')
             );
 
@@ -286,7 +269,7 @@ export function uiMapData(context) {
 
         labelEnter
             .append('span')
-            .text(t('gpx.local_layer'));
+            .text(t('map_data.layers.custom.title'));
 
         // Update
         ul = ul