diff --git a/src/aphront/response/Aphront404Response.php b/src/aphront/response/Aphront404Response.php
--- a/src/aphront/response/Aphront404Response.php
+++ b/src/aphront/response/Aphront404Response.php
@@ -8,16 +8,19 @@
 
   public function buildResponseString() {
     $request = $this->getRequest();
-    $user = $request->getUser();
+    $viewer = $request->getViewer();
 
     $dialog = id(new AphrontDialogView())
-      ->setUser($user)
+      ->setViewer($viewer)
       ->setTitle(pht('404 Not Found'))
-      ->addCancelButton('/', pht('Focus'))
+      ->addCancelButton('/', pht('Return to Charted Waters'))
       ->appendParagraph(
         pht(
-          'Do not dwell in the past, do not dream of the future, '.
-          'concentrate the mind on the present moment.'));
+          'You arrive at your destination, but there is nothing here.'))
+      ->appendParagraph(
+        pht(
+          'Perhaps the real treasure was the friends you made '.
+          'along the way.'));
 
     $view = id(new PhabricatorStandardPageView())
       ->setTitle(pht('404 Not Found'))
diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php
--- a/src/applications/search/controller/PhabricatorApplicationSearchController.php
+++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php
@@ -194,9 +194,10 @@
     if ($run_query && !$named_query && $user->isLoggedIn()) {
       $save_button = id(new PHUIButtonView())
         ->setTag('a')
+        ->setColor(PHUIButtonView::GREY)
         ->setHref('/search/edit/key/'.$saved_query->getQueryKey().'/')
         ->setText(pht('Save Query'))
-        ->setIcon('fa-floppy-o');
+        ->setIcon('fa-bookmark');
       $submit->addButton($save_button);
     }