diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 08f25f4af9..838c2866dc 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -922,7 +922,7 @@ celerity_register_resource_map(array(
   ),
   'conpherence-message-pane-css' =>
   array(
-    'uri' => '/res/6b49a2d9/rsrc/css/application/conpherence/message-pane.css',
+    'uri' => '/res/52cf7ca3/rsrc/css/application/conpherence/message-pane.css',
     'type' => 'css',
     'requires' =>
     array(
diff --git a/src/applications/settings/controller/PhabricatorSettingsMainController.php b/src/applications/settings/controller/PhabricatorSettingsMainController.php
index fd84c0951a..57dabf112d 100644
--- a/src/applications/settings/controller/PhabricatorSettingsMainController.php
+++ b/src/applications/settings/controller/PhabricatorSettingsMainController.php
@@ -30,6 +30,8 @@ final class PhabricatorSettingsMainController
       $nav,
       array(
         'title' => $panel->getPanelName(),
+        'device' => true,
+        'dust' => true,
       ));
   }
 
@@ -85,4 +87,9 @@ final class PhabricatorSettingsMainController
     return $nav;
   }
 
+  public function buildApplicationMenu() {
+    $panels = $this->buildPanels();
+    return $this->renderSideNav($panels)->getMenu();
+  }
+
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php b/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
index aa37553c9c..70cf74f565 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelAccount.php
@@ -89,14 +89,13 @@ final class PhabricatorSettingsPanelAccount
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save')));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Account Settings'));
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Account Settings'));
 
     return array(
       $notice,
-      $panel,
+      $header,
+      $form,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php b/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
index f31adec2b1..a4851f2c44 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelConduit.php
@@ -78,10 +78,8 @@ final class PhabricatorSettingsPanelConduit
           ->setHeight(AphrontFormTextAreaControl::HEIGHT_SHORT)
           ->setValue($user->getConduitCertificate()));
 
-    $cert = new AphrontPanelView();
-    $cert->setHeader(pht('Arcanist Certificate'));
-    $cert->appendChild($cert_form);
-    $cert->setNoBackground();
+    $header1 = new PhabricatorHeaderView();
+    $header1->setHeader(pht('Arcanist Certificate'));
 
     $regen_instruction = pht('You can regenerate this certificate, which '.
       'will invalidate the old certificate and create a new one.');
@@ -97,15 +95,15 @@ final class PhabricatorSettingsPanelConduit
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Regenerate Certificate')));
 
-    $regen = new AphrontPanelView();
-    $regen->setHeader(pht('Regenerate Certificate'));
-    $regen->appendChild($regen_form);
-    $regen->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Regenerate Certificate'));
 
     return array(
       $notice,
-      $cert,
-      $regen,
+      $header1,
+      $cert_form,
+      $header,
+      $regen_form,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
index 708ab2ba80..dd44bc0b83 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelConpherencePreferences.php
@@ -56,10 +56,8 @@ final class PhabricatorSettingsPanelConpherencePreferences
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save Preferences')));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Conpherence Preferences'));
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Conpherence Preferences'));
 
     $error_view = null;
     if ($request->getBool('saved')) {
@@ -71,7 +69,8 @@ final class PhabricatorSettingsPanelConpherencePreferences
 
     return array(
       $error_view,
-      $panel,
+      $header,
+      $form,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
index ff717909eb..4254e8e355 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelDiffPreferences.php
@@ -58,10 +58,8 @@ final class PhabricatorSettingsPanelDiffPreferences
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save Preferences')));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Diff Preferences'));
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Diff Preferences'));
 
     $error_view = null;
     if ($request->getBool('saved')) {
@@ -73,7 +71,8 @@ final class PhabricatorSettingsPanelDiffPreferences
 
     return array(
       $error_view,
-      $panel,
+      $header,
+      $form,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
index 4ee8aa05cf..12fdf82451 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
@@ -157,10 +157,8 @@ EXAMPLE;
       id(new AphrontFormSubmitControl())
         ->setValue(pht('Save Preferences')));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Display Preferences'));
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Display Preferences'));
 
     $error_view = null;
     if ($request->getStr('saved') === 'true') {
@@ -172,7 +170,8 @@ EXAMPLE;
 
     return array(
       $error_view,
-      $panel,
+      $header,
+      $form,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
index 655cbd1f46..29e4170a3d 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailPreferences.php
@@ -203,16 +203,15 @@ final class PhabricatorSettingsPanelEmailPreferences
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save Preferences')));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Email Preferences'));
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Email Preferences'));
 
     return id(new AphrontNullView())
       ->appendChild(
         array(
           $notice,
-          $panel,
+          $header,
+          $form,
         ));
   }
 
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php b/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php
index d0855173e7..83c2d863e1 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelLDAP.php
@@ -69,19 +69,22 @@ final class PhabricatorSettingsPanelLDAP
       $forms['Unlink Account'] = $unlink_form;
     }
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('LDAP Account Settings'));
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('LDAP Account Settings'));
 
+    $formbox = new PHUIBoxView();
     foreach ($forms as $name => $form) {
       if ($name) {
-        $panel->appendChild(hsprintf('<br /><h1>%s</h1><br />', $name));
+        $head = new PhabricatorHeaderView();
+        $head->setHeader($name);
+        $formbox->appendChild($head);
       }
-      $panel->appendChild($form);
+      $formbox->appendChild($form);
     }
 
     return array(
-      $panel,
+      $header,
+      $formbox,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php b/src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
index 6a7686227f..0ae40dd29a 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelOAuth.php
@@ -128,7 +128,7 @@ final class PhabricatorSettingsPanelOAuth
       }
 
       if (!$provider->isProviderLinkPermanent()) {
-        $unlink = pht('Unlink %s Account');
+        $unlink = pht('Unlink %s Account', $provider_name);
         $unlink_form = new AphrontFormView();
         $unlink_form
           ->setUser($user)
@@ -208,22 +208,25 @@ final class PhabricatorSettingsPanelOAuth
       $forms['Account Token Information'] = $token_form;
     }
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('%s Account Settings', $provider_name));
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('%s Account Settings', $provider_name));
 
+    $formbox = new PHUIBoxView();
     foreach ($forms as $name => $form) {
       if ($name) {
-        $panel->appendChild(hsprintf('<br /><h1>%s</h1><br />', $name));
+        $head = new PhabricatorHeaderView();
+        $head->setHeader($name);
+        $formbox->appendChild($head);
       }
-      $panel->appendChild($form);
+      $formbox->appendChild($form);
     }
 
     return id(new AphrontNullView())
       ->appendChild(
         array(
           $notice,
-          $panel,
+          $header,
+          $formbox,
         ));
   }
 
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php b/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
index e33f679c76..155037428e 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelPassword.php
@@ -159,14 +159,13 @@ final class PhabricatorSettingsPanelPassword
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save')));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Change Password'));
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Change Password'));
 
     return array(
       $notice,
-      $panel,
+      $header,
+      $form,
     );
   }
 }
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php b/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php
index 3c9c9a736d..3a82fe12a2 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelProfile.php
@@ -217,14 +217,13 @@ final class PhabricatorSettingsPanelProfile
         ->setValue(pht('Save'))
         ->addCancelButton('/p/'.$user->getUsername().'/'));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Edit Profile Details'));
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Edit Profile Details'));
 
     return array(
       $error_view,
-      $panel,
+      $header,
+      $form,
     );
   }
 
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
index e349cd4dfd..e47a2e2c3d 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelSSHKeys.php
@@ -152,16 +152,15 @@ final class PhabricatorSettingsPanelSSHKeys
           ->addCancelButton($this->getPanelURI())
           ->setValue($save));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader($header);
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header_title = new PhabricatorHeaderView();
+    $header_title->setHeader($header);
 
     return id(new AphrontNullView())
       ->appendChild(
         array(
           $error_view,
-          $panel,
+          $header_title,
+          $form,
         ));
   }
 
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
index 2e1c4017c1..0d851f4ff4 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelSearchPreferences.php
@@ -50,10 +50,8 @@ final class PhabricatorSettingsPanelSearchPreferences
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Save')));
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Search Preferences'));
-    $panel->appendChild($form);
-    $panel->setNoBackground();
+    $header = new PhabricatorHeaderView();
+    $header->setHeader(pht('Search Preferences'));
 
     $error_view = null;
     if ($request->getStr('saved') === 'true') {
@@ -65,7 +63,8 @@ final class PhabricatorSettingsPanelSearchPreferences
 
     return array(
       $error_view,
-      $panel,
+      $header,
+      $form,
     );
   }
 }