diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 2b812d0ddf..d294ca82a1 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'c0f196d2',
+    'core.pkg.css' => '3d58b25a',
     'core.pkg.js' => '7d8faf57',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '2de124c9',
@@ -135,7 +135,7 @@ return array(
     'rsrc/css/phui/phui-form-view.css' => '4a1a0f5e',
     'rsrc/css/phui/phui-form.css' => 'aac1d51d',
     'rsrc/css/phui/phui-head-thing.css' => '11731da0',
-    'rsrc/css/phui/phui-header-view.css' => '32e71367',
+    'rsrc/css/phui/phui-header-view.css' => '26cffd3d',
     'rsrc/css/phui/phui-hovercard.css' => 'de1a2119',
     'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
     'rsrc/css/phui/phui-icon.css' => '3f33ab57',
@@ -820,7 +820,7 @@ return array(
     'phui-form-css' => 'aac1d51d',
     'phui-form-view-css' => '4a1a0f5e',
     'phui-head-thing-view-css' => '11731da0',
-    'phui-header-view-css' => '32e71367',
+    'phui-header-view-css' => '26cffd3d',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'de1a2119',
     'phui-icon-set-selector-css' => '1ab67aad',
diff --git a/src/applications/passphrase/controller/PassphraseCredentialViewController.php b/src/applications/passphrase/controller/PassphraseCredentialViewController.php
index 5ec2fe7c07..fa52681d82 100644
--- a/src/applications/passphrase/controller/PassphraseCredentialViewController.php
+++ b/src/applications/passphrase/controller/PassphraseCredentialViewController.php
@@ -59,7 +59,8 @@ final class PassphraseCredentialViewController extends PassphraseController {
     $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setHeader($credential->getName())
-      ->setPolicyObject($credential);
+      ->setPolicyObject($credential)
+      ->setHeaderIcon('fa-user-secret');
 
     if ($credential->getIsDestroyed()) {
       $header->setStatus('fa-ban', 'red', pht('Destroyed'));
diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
index f259cdc6af..18d3ad1fb6 100644
--- a/src/applications/paste/controller/PhabricatorPasteViewController.php
+++ b/src/applications/paste/controller/PhabricatorPasteViewController.php
@@ -110,7 +110,8 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController {
       ->setHeader($title)
       ->setUser($this->getRequest()->getUser())
       ->setStatus($header_icon, $header_color, $header_name)
-      ->setPolicyObject($paste);
+      ->setPolicyObject($paste)
+      ->setHeaderIcon('fa-clipboard');
 
     return $header;
   }
diff --git a/src/view/phui/PHUIHovercardView.php b/src/view/phui/PHUIHovercardView.php
index e5c89bb8fd..115964f191 100644
--- a/src/view/phui/PHUIHovercardView.php
+++ b/src/view/phui/PHUIHovercardView.php
@@ -106,7 +106,7 @@ final class PHUIHovercardView extends AphrontTagView {
     $header->setHeader($title);
     if ($this->tags) {
       foreach ($this->tags as $tag) {
-        $header->addTag($tag);
+        $header->addActionItem($tag);
       }
     }
 
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
index b75715a7ee..a61a73fc88 100644
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -175,6 +175,10 @@ body .phui-header-shell.phui-bleed-header
   margin-top: 8px;
 }
 
+.phui-header-subheader .phui-icon-view {
+  margin-right: 4px;
+}
+
 .phui-header-subheader .phui-tag-view .phui-icon-view,
 .phui-header-subheader .policy-header-callout .phui-icon-view {
   display: inline-block;