diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '61e69662',
+    'core.pkg.css' => '0ea26c65',
     'core.pkg.js' => 'a590b451',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => 'fe951924',
@@ -134,7 +134,7 @@
     'rsrc/css/phui/phui-fontkit.css' => '6790f776',
     'rsrc/css/phui/phui-form-view.css' => 'a0e8f168',
     'rsrc/css/phui/phui-form.css' => '17ce37a9',
-    'rsrc/css/phui/phui-header-view.css' => '3d78fd16',
+    'rsrc/css/phui/phui-header-view.css' => '541c6cc7',
     'rsrc/css/phui/phui-icon.css' => '88ba9081',
     'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
@@ -777,7 +777,7 @@
     'phui-fontkit-css' => '6790f776',
     'phui-form-css' => '17ce37a9',
     'phui-form-view-css' => 'a0e8f168',
-    'phui-header-view-css' => '3d78fd16',
+    'phui-header-view-css' => '541c6cc7',
     'phui-icon-view-css' => '88ba9081',
     'phui-image-mask-css' => '5a8b09c8',
     'phui-info-panel-css' => '27ea50a1',
diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -68,7 +68,7 @@
     $tag = phutil_tag(
       'span',
       array(
-        'class' => 'phui-header-'.$color.' plr',
+        'class' => 'phui-header-status phui-header-'.$color,
       ),
       array(
         $img,
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -110,7 +110,7 @@
     $tag = phutil_tag(
       'span',
       array(
-        'class' => "{$header_class} plr",
+        'class' => "phui-header-status {$header_class}",
       ),
       array(
         $img,
diff --git a/webroot/rsrc/css/phui/phui-header-view.css b/webroot/rsrc/css/phui/phui-header-view.css
--- a/webroot/rsrc/css/phui/phui-header-view.css
+++ b/webroot/rsrc/css/phui/phui-header-view.css
@@ -144,47 +144,45 @@
   color: {$darkbluetext};
 }
 
-.policy-header-callout.policy-adjusted {
-  padding: 0 4px;
+.policy-header-callout,
+.phui-header-subheader .phui-header-status {
+  padding: 3px 9px;
   border-radius: 3px;
+  background: {$lightbluebackground};
+  margin-right: 8px;
 }
 
 .policy-header-callout.policy-adjusted-weaker {
-  background: {$lightgreen};
-  border: 1px solid {$green};
+  background: {$sh-greenbackground};
 }
 
 .policy-header-callout.policy-adjusted-weaker .policy-link,
 .policy-header-callout.policy-adjusted-weaker .phui-icon-view {
-  color: {$green};
+  color: {$sh-greentext};
 }
 
 .policy-header-callout.policy-adjusted-stronger {
-  background: {$lightred};
-  border: 1px solid {$red};
+  background: {$sh-redbackground};
 }
 
 .policy-header-callout.policy-adjusted-stronger .policy-link,
 .policy-header-callout.policy-adjusted-stronger .phui-icon-view {
-  color: {$red};
+  color: {$sh-redtext};
 }
 
 .policy-header-callout.policy-adjusted-different {
-  background: {$lightorange};
-  border: 1px solid {$orange};
+  background: {$sh-orangebackground};
 }
 
 .policy-header-callout.policy-adjusted-different .policy-link,
 .policy-header-callout.policy-adjusted-different .phui-icon-view {
-  color: {$orange};
+  color: {$sh-orangetext};
 }
 
 .phui-header-subheader .phui-header-status-dark {
   color: {$sh-indigotext};
   background: {$sh-indigobackground};
   margin-right: 8px;
-  padding: 4px 8px;
-  border-radius: 3px;
 }
 
 .phui-header-subheader .phui-header-status-dark .phui-icon-view {
@@ -194,19 +192,11 @@
 .phui-header-subheader .phui-header-status-red {
   color: {$sh-redtext};
   background: {$sh-redbackground};
-  margin-right: 8px;
-  padding: 4px 8px;
-  border-radius: 3px;
-  margin-right: 8px;
 }
 
 .phui-header-subheader .phui-header-status-green {
   color: {$sh-greentext};
   background: {$sh-greenbackground};
-  margin-right: 8px;
-  padding: 4px 8px;
-  border-radius: 3px;
-  margin-right: 8px;
 }
 
 .phui-header-action-links .phui-mobile-menu {