diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 927c5d1eff..2b812d0ddf 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'db1cd0bd',
+    'core.pkg.css' => 'c0f196d2',
     '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' => 'bfb9fed3',
+    'rsrc/css/phui/phui-header-view.css' => '32e71367',
     'rsrc/css/phui/phui-hovercard.css' => 'de1a2119',
     'rsrc/css/phui/phui-icon-set-selector.css' => '1ab67aad',
     'rsrc/css/phui/phui-icon.css' => '3f33ab57',
@@ -155,7 +155,7 @@ return array(
     'rsrc/css/phui/phui-status.css' => '37309046',
     'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2',
     'rsrc/css/phui/phui-timeline-view.css' => '2efceff8',
-    'rsrc/css/phui/phui-two-column-view.css' => '097630a3',
+    'rsrc/css/phui/phui-two-column-view.css' => 'ecd7ec62',
     'rsrc/css/phui/workboards/phui-workboard-color.css' => 'ac6fe6a7',
     'rsrc/css/phui/workboards/phui-workboard.css' => 'e6d89647',
     'rsrc/css/phui/workboards/phui-workcard.css' => '3646fb96',
@@ -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' => 'bfb9fed3',
+    'phui-header-view-css' => '32e71367',
     'phui-hovercard' => '1bd28176',
     'phui-hovercard-view-css' => 'de1a2119',
     'phui-icon-set-selector-css' => '1ab67aad',
@@ -843,7 +843,7 @@ return array(
     'phui-tag-view-css' => '6bbd83e2',
     'phui-theme-css' => '027ba77e',
     'phui-timeline-view-css' => '2efceff8',
-    'phui-two-column-view-css' => '097630a3',
+    'phui-two-column-view-css' => 'ecd7ec62',
     'phui-workboard-color-css' => 'ac6fe6a7',
     'phui-workboard-view-css' => 'e6d89647',
     'phui-workcard-view-css' => '3646fb96',
diff --git a/src/applications/conpherence/controller/ConpherenceWidgetController.php b/src/applications/conpherence/controller/ConpherenceWidgetController.php
index e6707577e9..af9d799519 100644
--- a/src/applications/conpherence/controller/ConpherenceWidgetController.php
+++ b/src/applications/conpherence/controller/ConpherenceWidgetController.php
@@ -76,7 +76,7 @@ final class ConpherenceWidgetController extends ConpherenceController {
       ),
       id(new PHUIHeaderView())
       ->setHeader($header)
-      ->addActionIcon($new_icon));
+      ->addActionItem($new_icon));
     $user = $this->getRequest()->getUser();
     // now the widget bodies
     $widgets[] = javelin_tag(
diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
index 57877783bb..22ab5b20bf 100644
--- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
@@ -253,7 +253,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
       ->setIcon('fa-pencil')
       ->setWorkflow(true)
       ->setHref((string)$edit_uri);
-    $header->addActionIcon($action_edit);
+    $header->addActionItem($action_edit);
 
     if ($dashboard_id) {
       $uri = id(new PhutilURI(
@@ -263,7 +263,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
         ->setIcon('fa-trash-o')
         ->setHref((string)$uri)
         ->setWorkflow(true);
-      $header->addActionIcon($action_remove);
+      $header->addActionItem($action_remove);
     }
     return $header;
   }
diff --git a/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php b/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
index 92195aa8f5..76e6e8432b 100644
--- a/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
+++ b/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
@@ -119,7 +119,7 @@ final class PhabricatorDashboardQueryPanelType
     $icon = id(new PHUIIconView())
         ->setIcon('fa-search')
         ->setHref($href);
-    $header->addActionIcon($icon);
+    $header->addActionItem($icon);
 
     return $header;
   }
diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
index 1b8557fc7f..e53c4fac8d 100644
--- a/src/applications/home/controller/PhabricatorHomeMainController.php
+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
@@ -322,7 +322,7 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController {
       ->setHref($href);
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
-      ->addActionIcon($icon);
+      ->addActionItem($icon);
     return $header;
   }
 
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
index 0e76aafcd7..8111944c4d 100644
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -20,7 +20,7 @@ final class PHUIHeaderView extends AphrontTagView {
   private $buttonBar = null;
   private $policyObject;
   private $epoch;
-  private $actionIcons = array();
+  private $actionItems = array();
   private $badges = array();
   private $href;
   private $actionList;
@@ -105,8 +105,8 @@ final class PHUIHeaderView extends AphrontTagView {
     return $this;
   }
 
-  public function addActionIcon(PHUIIconView $action) {
-    $this->actionIcons[] = $action;
+  public function addActionItem($action) {
+    $this->actionItems[] = $action;
     return $this;
   }
 
@@ -277,16 +277,16 @@ final class PHUIHeaderView extends AphrontTagView {
         $this->buttonBar);
     }
 
-    if ($this->actionIcons) {
+    if ($this->actionItems) {
       $action_list = array();
-      if ($this->actionIcons) {
-        foreach ($this->actionIcons as $icon) {
+      if ($this->actionItems) {
+        foreach ($this->actionItems as $item) {
           $action_list[] = phutil_tag(
             'li',
             array(
-              'class' => 'phui-header-action-icon',
+              'class' => 'phui-header-action-item',
             ),
-            $icon);
+            $item);
         }
       }
       $right[] = phutil_tag(
@@ -346,7 +346,7 @@ final class PHUIHeaderView extends AphrontTagView {
         ));
     }
 
-    if ($this->properties || $this->policyObject) {
+    if ($this->properties || $this->policyObject || $this->tags) {
       $property_list = array();
       foreach ($this->properties as $type => $property) {
         switch ($type) {
diff --git a/src/view/phui/PHUIWorkpanelView.php b/src/view/phui/PHUIWorkpanelView.php
index b94b423ced..911d38c2e3 100644
--- a/src/view/phui/PHUIWorkpanelView.php
+++ b/src/view/phui/PHUIWorkpanelView.php
@@ -83,16 +83,16 @@ final class PHUIWorkpanelView extends AphrontTagView {
       ->setHeader($this->header)
       ->setSubheader($this->subheader);
 
-    if ($this->headerIcon) {
-      $header->setHeaderIcon($this->headerIcon);
+    foreach ($this->headerActions as $action) {
+      $header->addActionItem($action);
     }
 
     if ($this->headerTag) {
-      $header->addTag($this->headerTag);
+      $header->addActionItem($this->headerTag);
     }
 
-    foreach ($this->headerActions as $action) {
-      $header->addActionIcon($action);
+    if ($this->headerIcon) {
+      $header->setHeaderIcon($this->headerIcon);
     }
 
     $href = $this->getHref();
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
index ddfda01173..b75715a7ee 100644
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -197,8 +197,11 @@ body .phui-header-shell.phui-bleed-header
   border-color: transparent;
 }
 
+
+.phui-header-subheader .phui-tag-view,
 .phui-header-subheader .phui-tag-type-shade .phui-tag-core {
   border: none;
+  font-weight: normal;
   -webkit-font-smoothing: auto;
 }
 
@@ -246,12 +249,9 @@ body .phui-header-shell.phui-bleed-header
   float: right;
 }
 
-.phui-header-action-list li.phui-header-action-icon {
+.phui-header-action-list .phui-header-action-item .phui-icon-view {
   height: 18px;
   width: 16px;
-}
-
-.phui-header-action-list .phui-header-action-icon .phui-icon-view {
   font-size: 16px;
   line-height: 20px;
   display: block;
diff --git a/webroot/rsrc/css/phui/phui-two-column-view.css b/webroot/rsrc/css/phui/phui-two-column-view.css
index bf1f9a76e4..769eaf84e4 100644
--- a/webroot/rsrc/css/phui/phui-two-column-view.css
+++ b/webroot/rsrc/css/phui/phui-two-column-view.css
@@ -103,7 +103,7 @@
   margin: 0;
 }
 
-.phui-main-column > .phui-timeline-view {
+.phui-main-column > .phui-timeline-view:first-child {
   border-top: 1px solid {$thinblueborder};
 }