diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 717079efea..52dd572c07 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
 return array(
   'names' =>
   array(
-    'core.pkg.css' => '979bfb39',
+    'core.pkg.css' => '5ebae357',
     'core.pkg.js' => 'c907bd96',
     'darkconsole.pkg.js' => 'ca8671ce',
     'differential.pkg.css' => '827749c1',
@@ -132,7 +132,7 @@ return array(
     'rsrc/css/phui/phui-feed-story.css' => '3a59c2cf',
     'rsrc/css/phui/phui-form-view.css' => '3179980c',
     'rsrc/css/phui/phui-form.css' => 'b78ec020',
-    'rsrc/css/phui/phui-header-view.css' => '875d0260',
+    'rsrc/css/phui/phui-header-view.css' => '1a93f1d9',
     'rsrc/css/phui/phui-icon.css' => '29e83226',
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
     'rsrc/css/phui/phui-list.css' => '2edb76cf',
@@ -736,7 +736,7 @@ return array(
     'phui-feed-story-css' => '3a59c2cf',
     'phui-form-css' => 'b78ec020',
     'phui-form-view-css' => '3179980c',
-    'phui-header-view-css' => '875d0260',
+    'phui-header-view-css' => '1a93f1d9',
     'phui-icon-view-css' => '29e83226',
     'phui-info-panel-css' => '27ea50a1',
     'phui-list-view-css' => '2edb76cf',
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
index b7bacccdf7..7f166a3540 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelEmailAddresses.php
@@ -130,21 +130,25 @@ final class PhabricatorSettingsPanelEmailAddresses
         $editable,
       ));
 
-    $view = new AphrontPanelView();
+    $view = new PHUIObjectBoxView();
+    $header = new PHUIHeaderView();
+    $header->setHeader(pht('Email Addresses'));
+
     if ($editable) {
-      $view->addButton(
-        javelin_tag(
-          'a',
-          array(
-            'href'      => $uri->alter('new', 'true'),
-            'class'     => 'green button',
-            'sigil'     => 'workflow',
-          ),
-          pht('Add New Address')));
+      $icon = id(new PHUIIconView())
+        ->setSpriteSheet(PHUIIconView::SPRITE_ICONS)
+        ->setSpriteIcon('new');
+
+      $button = new PHUIButtonView();
+      $button->setText(pht('Add New Address'));
+      $button->setTag('a');
+      $button->setHref($uri->alter('new', 'true'));
+      $button->setIcon($icon);
+      $button->addSigil('workflow');
+      $header->addActionLink($button);
     }
-    $view->setHeader(pht('Email Addresses'));
+    $view->setHeader($header);
     $view->appendChild($table);
-    $view->setNoBackground();
 
     return $view;
   }
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
index 2995f72b5a..a80bdc88e6 100644
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -44,7 +44,8 @@ body .phui-header-shell.phui-bleed-header
   position: relative;
 }
 
-.phui-header-view a {
+.phui-header-view a,
+.phui-header-view a.simple {
   color: {$darkbluetext};
 }