diff --git a/css/app.css b/css/app.css
index 7f01fbd68..102e0300b 100644
--- a/css/app.css
+++ b/css/app.css
@@ -742,28 +742,21 @@ a.selected:hover .toggle.icon  { background-position: -40px -180px;}
     top: 3px;
 }
 
-.preset-grid-search-wrap {
-    border-bottom: 1px solid #ccc;
-}
-
 .preset-grid-search-wrap .icon {
     display: block;
     position: absolute;
     left: 10px;
-    top: 20px;
+    top: 80px;
     pointer-events: none;
 }
 
 .preset-grid-search-wrap input {
-    left: 0;
-    right: 0;
-    top: 0;
-    bottom: 0;
-    border-radius: 0;
-    border: 0;
-    text-indent: 30px;
-    height: 100%;
     position: absolute;
+    top: 60px;
+    border-radius: 0;
+    border-width: 0;
+    border-bottom-width: 1px;
+    text-indent: 30px;
 }
 
 .preset-search-result {
diff --git a/js/id/ui.js b/js/id/ui.js
index ad8a8ad6d..e2cff652d 100644
--- a/js/id/ui.js
+++ b/js/id/ui.js
@@ -49,7 +49,7 @@ iD.ui = function(context) {
 
         container.append('div')
             .style('display', 'none')
-            .attr('class', 'help-wrap fillL col5');
+            .attr('class', 'help-wrap fillL col5 content');
 
         container.append('div')
             .attr('class', 'map-control zoombuttons')
diff --git a/js/id/ui/background.js b/js/id/ui/background.js
index 2da0862c9..b00a6066e 100644
--- a/js/id/ui/background.js
+++ b/js/id/ui/background.js
@@ -148,7 +148,7 @@ iD.ui.Background = function(context) {
         }
 
         var content = selection.append('div')
-                .attr('class', 'fillL map-overlay hide'),
+                .attr('class', 'fillL map-overlay content hide'),
             tooltip = bootstrap.tooltip()
                 .placement('right')
                 .html(true)
diff --git a/js/id/ui/geocoder.js b/js/id/ui/geocoder.js
index af65805df..42689c0d3 100644
--- a/js/id/ui/geocoder.js
+++ b/js/id/ui/geocoder.js
@@ -115,7 +115,7 @@ iD.ui.Geocoder = function(context) {
 
         var gcForm = selection.append('form');
 
-        var inputNode = gcForm.attr('class', 'fillL map-overlay hide')
+        var inputNode = gcForm.attr('class', 'fillL map-overlay content hide')
             .append('input')
             .attr({ type: 'text', placeholder: t('geocoder.placeholder') })
             .attr('tabindex', 1)
diff --git a/js/id/ui/preset_grid.js b/js/id/ui/preset_grid.js
index 242bc618b..6320b9414 100644
--- a/js/id/ui/preset_grid.js
+++ b/js/id/ui/preset_grid.js
@@ -47,9 +47,6 @@ iD.ui.PresetGrid = function(context, entity) {
 
         grid.call(drawGrid, defaultLimit);
 
-        var searchwrap = selection.append('div')
-            .attr('class', 'preset-grid-search-wrap inspector-inner');
-
         function keydown() {
             // hack to let delete shortcut work when search is autofocused
             if (search.property('value').length === 0 &&
@@ -92,8 +89,11 @@ iD.ui.PresetGrid = function(context, entity) {
             }
         }
 
+        var searchwrap = selection.append('div')
+            .attr('class', 'preset-grid-search-wrap');
+
         var search = searchwrap.append('input')
-            .attr('class', 'preset-grid-search major')
+            .attr('class', 'major')
             .attr('placeholder','Search')
             .attr('type', 'search')
             .on('keydown', keydown)