diff --git a/css/80_app.css b/css/80_app.css
index a7e430fe3..a64c2d821 100644
--- a/css/80_app.css
+++ b/css/80_app.css
@@ -2246,6 +2246,7 @@ div.full-screen > button:hover {
 
 .imagery-faq {
     margin-bottom: 10px;
+    white-space: nowrap;
 }
 
 .layer-list, .controls-list {
diff --git a/data/core.yaml b/data/core.yaml
index 7b593ce3d..4ccb518fc 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -380,7 +380,7 @@ en:
     custom_button: Edit custom background
     custom_prompt: "Enter a tile URL template. Valid tokens are:\n   - {zoom}/{z}, {x}, {y} for Z/X/Y tile scheme\n   - {ty} for flipped TMS-style Y coordinates\n   - {u} for quadtile scheme\n   - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}"
     overlays: Overlays
-    imagery_source_faq: Where does this imagery come from?
+    imagery_source_faq: Imagery Info / Report a Problem
     reset: reset
     display_options: Display Options
     brightness: Brightness
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 306c8ac3d..f944f7194 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -468,7 +468,7 @@
             "custom_button": "Edit custom background",
             "custom_prompt": "Enter a tile URL template. Valid tokens are:\n   - {zoom}/{z}, {x}, {y} for Z/X/Y tile scheme\n   - {ty} for flipped TMS-style Y coordinates\n   - {u} for quadtile scheme\n   - {switch:a,b,c} for DNS server multiplexing\n\nExample:\n{example}",
             "overlays": "Overlays",
-            "imagery_source_faq": "Where does this imagery come from?",
+            "imagery_source_faq": "Imagery Info / Report a Problem",
             "reset": "reset",
             "display_options": "Display Options",
             "brightness": "Brightness",
diff --git a/modules/ui/background.js b/modules/ui/background.js
index cbd5bfa15..d41bd9d24 100644
--- a/modules/ui/background.js
+++ b/modules/ui/background.js
@@ -192,10 +192,11 @@ export function uiBackground(context) {
 
 
     function renderBackgroundList(selection) {
-        var container = selection.selectAll('layer-background-list')
-            .data([0]);
 
         // the background list
+        var container = selection.selectAll('.layer-background-list')
+            .data([0]);
+
         _backgroundList = container.enter()
             .append('ul')
             .attr('class', 'layer-list layer-background-list')
@@ -204,7 +205,7 @@ export function uiBackground(context) {
 
 
         // add minimap toggle below list
-        var minimapEnter = selection.selectAll('minimap-toggle-list')
+        var minimapEnter = selection.selectAll('.minimap-toggle-list')
             .data([0])
             .enter()
             .append('ul')
@@ -231,11 +232,26 @@ export function uiBackground(context) {
         minimapLabelEnter
             .append('span')
             .text(t('background.minimap.description'));
+
+
+        // "Info / Report a Problem" link
+        selection.selectAll('.imagery-faq')
+            .data([0])
+            .enter()
+            .append('div')
+            .attr('class', 'imagery-faq')
+            .append('a')
+            .attr('target', '_blank')
+            .attr('tabindex', -1)
+            .call(svgIcon('#icon-out-link', 'inline'))
+            .attr('href', 'https://github.com/openstreetmap/iD/blob/master/FAQ.md#how-can-i-report-an-issue-with-background-imagery')
+            .append('span')
+            .text(t('background.imagery_source_faq'));
     }
 
 
     function renderOverlayList(selection) {
-        var container = selection.selectAll('layer-overlay-list')
+        var container = selection.selectAll('.layer-overlay-list')
             .data([0]);
 
         _overlayList = container.enter()
@@ -345,19 +361,6 @@ export function uiBackground(context) {
                 .content(renderBackgroundList)
             );
 
-            // "Where does this imagery come from?"
-        // pane
-        //     .append('div')
-        //     .attr('class', 'imagery-faq')
-        //     .append('a')
-        //     .attr('target', '_blank')
-        //     .attr('tabindex', -1)
-        //     .call(svgIcon('#icon-out-link', 'inline'))
-        //     .attr('href', 'https://github.com/openstreetmap/iD/blob/master/FAQ.md#how-can-i-report-an-issue-with-background-imagery')
-        //     .append('span')
-        //     .text(t('background.imagery_source_faq'));
-
-
         // overlay list
         pane
             .append('div')