diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 5dfe5cad50..ac82bb6b60 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -3306,7 +3306,7 @@ celerity_register_resource_map(array(
   ),
   'phabricator-search-results-css' =>
   array(
-    'uri' => '/res/f8a86e27/rsrc/css/application/search/search-results.css',
+    'uri' => '/res/9b749d7d/rsrc/css/application/search/search-results.css',
     'type' => 'css',
     'requires' =>
     array(
diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php
index 6bb6654d01..2b3d14a39b 100644
--- a/src/applications/search/controller/PhabricatorSearchController.php
+++ b/src/applications/search/controller/PhabricatorSearchController.php
@@ -143,6 +143,7 @@ final class PhabricatorSearchController
     $search_form
       ->setUser($user)
       ->setAction('/search/')
+      ->setNoShading(true)
       ->appendChild(
         phutil_tag(
           'input',
@@ -198,8 +199,7 @@ final class PhabricatorSearchController
         id(new AphrontFormSubmitControl())
           ->setValue('Search'));
 
-    $search_panel = new AphrontPanelView();
-    $search_panel->setHeader('Search Phabricator');
+    $search_panel = new AphrontListFilterView();
     $search_panel->appendChild($search_form);
 
     require_celerity_resource('phabricator-search-results-css');
@@ -241,6 +241,7 @@ final class PhabricatorSearchController
             ->setObject(idx($objects, $phid));
           $results[] = $view->render();
         }
+
         $results = hsprintf(
           '<div class="phabricator-search-result-list">'.
             '%s'.
@@ -254,17 +255,26 @@ final class PhabricatorSearchController
             '<p class="phabricator-search-no-results">No search results.</p>'.
           '</div>');
       }
+      $results = id(new PHUIBoxView())
+        ->addMargin(PHUI::MARGIN_LARGE)
+        ->addPadding(PHUI::PADDING_LARGE)
+        ->setShadow(true)
+        ->appendChild($results)
+        ->addClass('phabricator-search-result-box');
     } else {
       $results = null;
     }
 
-    return $this->buildStandardPageResponse(
+
+    return $this->buildApplicationPage(
       array(
         $search_panel,
         $results,
       ),
       array(
-        'title' => 'Search Results',
+        'title' => pht('Search Results'),
+        'device' => true,
+        'dust' => true,
       ));
   }
 
diff --git a/webroot/rsrc/css/application/search/search-results.css b/webroot/rsrc/css/application/search/search-results.css
index ce06648f9b..bd2082d230 100644
--- a/webroot/rsrc/css/application/search/search-results.css
+++ b/webroot/rsrc/css/application/search/search-results.css
@@ -2,29 +2,25 @@
  * @provides phabricator-search-results-css
  */
 
-.phabricator-search-result-list {
-  padding: 1em 3em 2em;
-}
-
 .phabricator-search-result {
   margin: 4px 0 16px;
 }
 
+.device-phone .phabricator-search-result-box .phui-box {
+  margin: 20px 0;
+}
+
 .phabricator-search-result .result-image {
   position: relative;
   float: left;
   width: 50px;
   height: 50px;
-}
-
-.phabricator-search-result .result-desc {
-  margin-left: 58px;
+  margin-right: 10px;
 }
 
 .phabricator-search-result .result-type {
-  color: #888888;
-  font-size: 11px;
   margin-top: 4px;
+  word-break: break-word;
 }
 
 .phabricator-search-result .result-name {