diff --git a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
index 9d33d0a638..91e664a9ae 100644
--- a/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
+++ b/src/applications/dashboard/controller/PhabricatorDashboardPanelViewController.php
@@ -72,10 +72,17 @@ final class PhabricatorDashboardPanelViewController
   private function buildHeaderView(PhabricatorDashboardPanel $panel) {
     $viewer = $this->getRequest()->getUser();
 
-    return id(new PHUIHeaderView())
+    $header = id(new PHUIHeaderView())
       ->setUser($viewer)
       ->setHeader($panel->getName())
       ->setPolicyObject($panel);
+
+    if (!$panel->getIsArchived()) {
+      $header->setStatus('fa-check', 'bluegrey', pht('Active'));
+    } else {
+      $header->setStatus('fa-ban', 'red', pht('Archived'));
+    }
+    return $header;
   }
 
   private function buildActionView(PhabricatorDashboardPanel $panel) {
@@ -101,10 +108,10 @@ final class PhabricatorDashboardPanelViewController
 
     if (!$panel->getIsArchived()) {
       $archive_text = pht('Archive Panel');
-      $archive_icon = 'fa-times';
+      $archive_icon = 'fa-ban';
     } else {
       $archive_text = pht('Activate Panel');
-      $archive_icon = 'fa-plus';
+      $archive_icon = 'fa-check';
     }
 
     $actions->addAction(
diff --git a/src/applications/herald/controller/HeraldDisableController.php b/src/applications/herald/controller/HeraldDisableController.php
index 9412997e94..edf15f80f6 100644
--- a/src/applications/herald/controller/HeraldDisableController.php
+++ b/src/applications/herald/controller/HeraldDisableController.php
@@ -52,13 +52,13 @@ final class HeraldDisableController extends HeraldController {
     }
 
     if ($is_disable) {
-      $title = pht('Really disable this rule?');
+      $title = pht('Really archive this rule?');
       $body = pht('This rule will no longer activate.');
-      $button = pht('Disable Rule');
+      $button = pht('Archive Rule');
     } else {
-      $title = pht('Really enable this rule?');
+      $title = pht('Really activate this rule?');
       $body = pht('This rule will become active again.');
-      $button = pht('Enable Rule');
+      $button = pht('Activate Rule');
     }
 
     $dialog = id(new AphrontDialogView())
diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php
index d8d6b87a45..c4dda13309 100644
--- a/src/applications/herald/controller/HeraldRuleViewController.php
+++ b/src/applications/herald/controller/HeraldRuleViewController.php
@@ -29,8 +29,8 @@ final class HeraldRuleViewController extends HeraldController {
     if ($rule->getIsDisabled()) {
       $header->setStatus(
         'fa-ban',
-        'dark',
-        pht('Disabled'));
+        'red',
+        pht('Archived'));
     } else {
       $header->setStatus(
         'fa-check',
@@ -90,12 +90,12 @@ final class HeraldRuleViewController extends HeraldController {
 
     if ($rule->getIsDisabled()) {
       $disable_uri = "disable/{$id}/enable/";
-      $disable_icon = 'fa-check-circle-o';
-      $disable_name = pht('Enable Rule');
+      $disable_icon = 'fa-check';
+      $disable_name = pht('Activate Rule');
     } else {
       $disable_uri = "disable/{$id}/disable/";
       $disable_icon = 'fa-ban';
-      $disable_name = pht('Disable Rule');
+      $disable_name = pht('Archive Rule');
     }
 
     $view->addAction(
diff --git a/src/applications/herald/storage/HeraldRuleTransaction.php b/src/applications/herald/storage/HeraldRuleTransaction.php
index 8046eb1c3f..8d4201faf6 100644
--- a/src/applications/herald/storage/HeraldRuleTransaction.php
+++ b/src/applications/herald/storage/HeraldRuleTransaction.php
@@ -57,9 +57,9 @@ final class HeraldRuleTransaction
     switch ($this->getTransactionType()) {
       case self::TYPE_DISABLE:
         if ($new) {
-          return 'fa-pause';
+          return 'fa-ban';
         } else {
-          return 'fa-play';
+          return 'fa-check';
         }
     }
 
diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
index 3726c627a7..90b493e9d7 100644
--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
@@ -60,12 +60,10 @@ final class PhabricatorMacroViewController
       ->setPolicyObject($macro)
       ->setHeader($title_long);
 
-    if ($macro->getIsDisabled()) {
-      $header->addTag(
-        id(new PHUITagView())
-          ->setType(PHUITagView::TYPE_STATE)
-          ->setName(pht('Macro Disabled'))
-          ->setBackgroundColor(PHUITagView::COLOR_BLACK));
+    if (!$macro->getIsDisabled()) {
+      $header->setStatus('fa-check', 'bluegrey', pht('Active'));
+    } else {
+      $header->setStatus('fa-ban', 'red', pht('Archived'));
     }
 
     $is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');
@@ -132,15 +130,15 @@ final class PhabricatorMacroViewController
     if ($macro->getIsDisabled()) {
       $view->addAction(
         id(new PhabricatorActionView())
-          ->setName(pht('Restore Macro'))
+          ->setName(pht('Activate Macro'))
           ->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
           ->setWorkflow(true)
           ->setDisabled(!$can_manage)
-          ->setIcon('fa-check-circle-o'));
+          ->setIcon('fa-check'));
     } else {
       $view->addAction(
         id(new PhabricatorActionView())
-          ->setName(pht('Disable Macro'))
+          ->setName(pht('Archive Macro'))
           ->setHref($this->getApplicationURI('/disable/'.$macro->getID().'/'))
           ->setWorkflow(true)
           ->setDisabled(!$can_manage)
diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php
index e606bb2b93..b8ad937c23 100644
--- a/src/applications/ponder/controller/PonderQuestionViewController.php
+++ b/src/applications/ponder/controller/PonderQuestionViewController.php
@@ -47,6 +47,12 @@ final class PonderQuestionViewController extends PonderController {
     $header = id(new PHUIHeaderView())
       ->setHeader($question->getTitle());
 
+    if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) {
+      $header->setStatus('fa-square-o', 'bluegrey', pht('Open'));
+    } else {
+      $header->setStatus('fa-check-square-o', 'dark', pht('Closed'));
+    }
+
     $actions = $this->buildActionListView($question);
     $properties = $this->buildPropertyListView($question, $actions);
 
@@ -100,11 +106,11 @@ final class PonderQuestionViewController extends PonderController {
 
     if ($question->getStatus() == PonderQuestionStatus::STATUS_OPEN) {
       $name = pht('Close Question');
-      $icon = 'fa-times';
+      $icon = 'fa-check-square-o';
       $href = 'close';
     } else {
       $name = pht('Reopen Question');
-      $icon = 'fa-check-circle-o';
+      $icon = 'fa-square-o';
       $href = 'open';
     }
 
diff --git a/src/applications/project/controller/PhabricatorProjectArchiveController.php b/src/applications/project/controller/PhabricatorProjectArchiveController.php
index 1138581fdc..f158783262 100644
--- a/src/applications/project/controller/PhabricatorProjectArchiveController.php
+++ b/src/applications/project/controller/PhabricatorProjectArchiveController.php
@@ -52,9 +52,9 @@ final class PhabricatorProjectArchiveController
     }
 
     if ($project->isArchived()) {
-      $title = pht('Really unarchive project?');
+      $title = pht('Really activate project?');
       $body = pht('This project will become active again.');
-      $button = pht('Unarchive Project');
+      $button = pht('Activate Project');
     } else {
       $title = pht('Really archive project?');
       $body = pht('This project will be moved to the archive.');
diff --git a/src/applications/project/controller/PhabricatorProjectEditMainController.php b/src/applications/project/controller/PhabricatorProjectEditMainController.php
index ec874c789f..2067fd7d05 100644
--- a/src/applications/project/controller/PhabricatorProjectEditMainController.php
+++ b/src/applications/project/controller/PhabricatorProjectEditMainController.php
@@ -37,7 +37,7 @@ final class PhabricatorProjectEditMainController
     if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) {
       $header->setStatus('fa-check', 'bluegrey', pht('Active'));
     } else {
-      $header->setStatus('fa-ban', 'dark', pht('Archived'));
+      $header->setStatus('fa-ban', 'red', pht('Archived'));
     }
 
     $actions = $this->buildActionListView($project);
@@ -104,7 +104,7 @@ final class PhabricatorProjectEditMainController
     if ($project->isArchived()) {
       $view->addAction(
         id(new PhabricatorActionView())
-          ->setName(pht('Unarchive Project'))
+          ->setName(pht('Activate Project'))
           ->setIcon('fa-check')
           ->setHref($this->getApplicationURI("archive/{$id}/"))
           ->setDisabled(!$can_edit)
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
index 56dfae0d76..c1d19209e1 100644
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -80,7 +80,7 @@ final class PhabricatorProjectProfileController
     if ($project->getStatus() == PhabricatorProjectStatus::STATUS_ACTIVE) {
       $header->setStatus('fa-check', 'bluegrey', pht('Active'));
     } else {
-      $header->setStatus('fa-ban', 'dark', pht('Archived'));
+      $header->setStatus('fa-ban', 'red', pht('Archived'));
     }
 
     $actions = $this->buildActionListView($project);