diff --git a/src/applications/drydock/view/DrydockLeaseListView.php b/src/applications/drydock/view/DrydockLeaseListView.php
index 40fcfa49be..7d7d8e77ee 100644
--- a/src/applications/drydock/view/DrydockLeaseListView.php
+++ b/src/applications/drydock/view/DrydockLeaseListView.php
@@ -1,56 +1,56 @@
 <?php
 
 final class DrydockLeaseListView extends AphrontView {
 
   private $leases;
 
   public function setLeases(array $leases) {
     assert_instances_of($leases, 'DrydockLease');
     $this->leases = $leases;
     return $this;
   }
 
   public function render() {
     $leases = $this->leases;
     $viewer = $this->getUser();
 
     $view = new PHUIObjectItemListView();
 
     foreach ($leases as $lease) {
       $item = id(new PHUIObjectItemView())
         ->setUser($viewer)
         ->setHeader($lease->getLeaseName())
         ->setHref('/drydock/lease/'.$lease->getID().'/');
 
       if ($lease->hasAttachedResource()) {
         $resource = $lease->getResource();
 
         $resource_href = '/drydock/resource/'.$resource->getID().'/';
         $resource_name = $resource->getName();
 
         $item->addAttribute(
           phutil_tag(
             'a',
             array(
               'href' => $resource_href,
             ),
             $resource_name));
       }
 
       $status = DrydockLeaseStatus::getNameForStatus($lease->getStatus());
       $item->addAttribute($status);
       $item->setEpoch($lease->getDateCreated());
 
       if ($lease->isActive()) {
-        $item->setStatusIcon('fa-dot-circle green');
+        $item->setStatusIcon('fa-dot-circle-o green');
       } else {
-        $item->setStatusIcon('fa-dot-circle red');
+        $item->setStatusIcon('fa-dot-circle-o red');
       }
 
       $view->addItem($item);
     }
 
     return $view;
   }
 
 }
diff --git a/src/applications/drydock/view/DrydockResourceListView.php b/src/applications/drydock/view/DrydockResourceListView.php
index e8921b21c9..92ec762b81 100644
--- a/src/applications/drydock/view/DrydockResourceListView.php
+++ b/src/applications/drydock/view/DrydockResourceListView.php
@@ -1,49 +1,49 @@
 <?php
 
 final class DrydockResourceListView extends AphrontView {
 
   private $resources;
 
   public function setResources(array $resources) {
     assert_instances_of($resources, 'DrydockResource');
     $this->resources = $resources;
     return $this;
   }
 
   public function render() {
     $resources = $this->resources;
     $viewer = $this->getUser();
 
     $view = new PHUIObjectItemListView();
     foreach ($resources as $resource) {
       $name = pht('Resource %d', $resource->getID()).': '.$resource->getName();
 
       $item = id(new PHUIObjectItemView())
         ->setHref('/drydock/resource/'.$resource->getID().'/')
         ->setHeader($name);
 
       $status = DrydockResourceStatus::getNameForStatus($resource->getStatus());
       $item->addAttribute($status);
 
       switch ($resource->getStatus()) {
         case DrydockResourceStatus::STATUS_PENDING:
-          $item->setStatusIcon('fa-dot-circle yellow');
+          $item->setStatusIcon('fa-dot-circle-o yellow');
           break;
         case DrydockResourceStatus::STATUS_OPEN:
-          $item->setStatusIcon('fa-dot-circle green');
+          $item->setStatusIcon('fa-dot-circle-o green');
           break;
         case DrydockResourceStatus::STATUS_DESTROYED:
-          $item->setStatusIcon('fa-times-circle black');
+          $item->setStatusIcon('fa-times-circle-o black');
           break;
         default:
-          $item->setStatusIcon('fa-dot-circle red');
+          $item->setStatusIcon('fa-dot-circle-o red');
           break;
       }
 
       $view->addItem($item);
     }
 
     return $view;
   }
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
index ecb7605657..c3a5817994 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -1,254 +1,256 @@
 <?php
 
 final class HarbormasterBuildableViewController
   extends HarbormasterController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $id = $this->id;
 
     $buildable = id(new HarbormasterBuildableQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->needBuildableHandles(true)
       ->needContainerHandles(true)
       ->executeOne();
     if (!$buildable) {
       return new Aphront404Response();
     }
 
     // Pull builds and build targets.
     $builds = id(new HarbormasterBuildQuery())
       ->setViewer($viewer)
       ->withBuildablePHIDs(array($buildable->getPHID()))
       ->needBuildTargets(true)
       ->execute();
 
     $buildable->attachBuilds($builds);
 
     $build_list = $this->buildBuildList($buildable);
 
     $title = pht('Buildable %d', $id);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setUser($viewer)
       ->setPolicyObject($buildable);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header);
 
     $timeline = $this->buildTransactionTimeline(
       $buildable,
       new HarbormasterBuildableTransactionQuery());
     $timeline->setShouldTerminate(true);
 
     $actions = $this->buildActionList($buildable);
     $this->buildPropertyLists($box, $buildable, $actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb("B{$id}");
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
         $build_list,
         $timeline,
       ),
       array(
         'title' => $title,
       ));
   }
 
   private function buildActionList(HarbormasterBuildable $buildable) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $id = $buildable->getID();
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($buildable)
       ->setObjectURI($buildable->getMonogram());
 
     $can_edit = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $buildable,
       PhabricatorPolicyCapability::CAN_EDIT);
 
     $can_restart = false;
     $can_resume = false;
     $can_stop = false;
 
     foreach ($buildable->getBuilds() as $build) {
       if ($build->canRestartBuild()) {
         $can_restart = true;
       }
       if ($build->canResumeBuild()) {
         $can_resume = true;
       }
       if ($build->canStopBuild()) {
         $can_stop = true;
       }
     }
 
     $restart_uri = "buildable/{$id}/restart/";
     $stop_uri = "buildable/{$id}/stop/";
     $resume_uri = "buildable/{$id}/resume/";
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-repeat')
         ->setName(pht('Restart All Builds'))
         ->setHref($this->getApplicationURI($restart_uri))
         ->setWorkflow(true)
         ->setDisabled(!$can_restart || !$can_edit));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-pause')
         ->setName(pht('Pause All Builds'))
         ->setHref($this->getApplicationURI($stop_uri))
         ->setWorkflow(true)
         ->setDisabled(!$can_stop || !$can_edit));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setIcon('fa-play')
         ->setName(pht('Resume All Builds'))
         ->setHref($this->getApplicationURI($resume_uri))
         ->setWorkflow(true)
         ->setDisabled(!$can_resume || !$can_edit));
 
     return $list;
   }
 
   private function buildPropertyLists(
     PHUIObjectBoxView $box,
     HarbormasterBuildable $buildable,
     PhabricatorActionListView $actions) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($buildable)
       ->setActionList($actions);
     $box->addPropertyList($properties);
 
     $properties->addProperty(
       pht('Buildable'),
       $buildable->getBuildableHandle()->renderLink());
 
     if ($buildable->getContainerHandle() !== null) {
       $properties->addProperty(
         pht('Container'),
         $buildable->getContainerHandle()->renderLink());
     }
 
     $properties->addProperty(
       pht('Origin'),
       $buildable->getIsManualBuildable()
         ? pht('Manual Buildable')
         : pht('Automatic Buildable'));
 
   }
 
   private function buildBuildList(HarbormasterBuildable $buildable) {
     $viewer = $this->getRequest()->getUser();
 
     $build_list = id(new PHUIObjectItemListView())
       ->setUser($viewer);
     foreach ($buildable->getBuilds() as $build) {
       $view_uri = $this->getApplicationURI('/build/'.$build->getID().'/');
       $item = id(new PHUIObjectItemView())
         ->setObjectName(pht('Build %d', $build->getID()))
         ->setHeader($build->getName())
         ->setHref($view_uri);
 
       $status = $build->getBuildStatus();
-      $item->setBarColor(HarbormasterBuild::getBuildStatusColor($status));
+      $item->setStatusIcon(
+        'fa-dot-circle-o '.HarbormasterBuild::getBuildStatusColor($status),
+        HarbormasterBuild::getBuildStatusName($status));
 
       $item->addAttribute(HarbormasterBuild::getBuildStatusName($status));
 
       if ($build->isRestarting()) {
         $item->addIcon('fa-repeat', pht('Restarting'));
       } else if ($build->isStopping()) {
         $item->addIcon('fa-pause', pht('Pausing'));
       } else if ($build->isResuming()) {
         $item->addIcon('fa-play', pht('Resuming'));
       }
 
       $build_id = $build->getID();
 
       $restart_uri = "build/restart/{$build_id}/buildable/";
       $resume_uri = "build/resume/{$build_id}/buildable/";
       $stop_uri = "build/stop/{$build_id}/buildable/";
 
       $item->addAction(
         id(new PHUIListItemView())
           ->setIcon('fa-repeat')
           ->setName(pht('Restart'))
           ->setHref($this->getApplicationURI($restart_uri))
           ->setWorkflow(true)
           ->setDisabled(!$build->canRestartBuild()));
 
       if ($build->canResumeBuild()) {
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-play')
             ->setName(pht('Resume'))
             ->setHref($this->getApplicationURI($resume_uri))
             ->setWorkflow(true));
       } else {
         $item->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-pause')
             ->setName(pht('Pause'))
             ->setHref($this->getApplicationURI($stop_uri))
             ->setWorkflow(true)
             ->setDisabled(!$build->canStopBuild()));
       }
 
       $targets = $build->getBuildTargets();
 
       if ($targets) {
         $target_list = id(new PHUIStatusListView());
         foreach ($targets as $target) {
           $status = $target->getTargetStatus();
           $icon = HarbormasterBuildTarget::getBuildTargetStatusIcon($status);
           $color = HarbormasterBuildTarget::getBuildTargetStatusColor($status);
           $status_name =
             HarbormasterBuildTarget::getBuildTargetStatusName($status);
 
           $name = $target->getName();
 
           $target_list->addItem(
             id(new PHUIStatusItemView())
               ->setIcon($icon, $color, $status_name)
               ->setTarget(pht('Target %d', $target->getID()))
               ->setNote($name));
         }
 
         $target_box = id(new PHUIBoxView())
           ->addPadding(PHUI::PADDING_SMALL)
           ->appendChild($target_list);
 
         $item->appendChild($target_box);
       }
 
       $build_list->addItem($item);
     }
 
     return $build_list;
   }
 
 }
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
index 7447f2ed7b..e7f34ce551 100644
--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
@@ -1,475 +1,475 @@
 <?php
 
 final class HarbormasterPlanViewController extends HarbormasterPlanController {
 
   private $id;
 
   public function willProcessRequest(array $data) {
     $this->id = $data['id'];
   }
 
   public function processRequest() {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $id = $this->id;
 
     $plan = id(new HarbormasterBuildPlanQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->executeOne();
     if (!$plan) {
       return new Aphront404Response();
     }
 
     $timeline = $this->buildTransactionTimeline(
       $plan,
       new HarbormasterBuildPlanTransactionQuery());
     $timeline->setShouldTerminate(true);
 
     $title = pht('Plan %d', $id);
 
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
       ->setUser($viewer)
       ->setPolicyObject($plan);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header);
 
     $actions = $this->buildActionList($plan);
     $this->buildPropertyLists($box, $plan, $actions);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(pht('Plan %d', $id));
 
     list($step_list, $has_any_conflicts, $would_deadlock) =
       $this->buildStepList($plan);
 
     if ($would_deadlock) {
       $box->setFormErrors(
         array(
           pht(
             'This build plan will deadlock when executed, due to '.
             'circular dependencies present in the build plan. '.
             'Examine the step list and resolve the deadlock.'),
         ));
     } else if ($has_any_conflicts) {
       // A deadlocking build will also cause all the artifacts to be
       // invalid, so we just skip showing this message if that's the
       // case.
       $box->setFormErrors(
         array(
           pht(
             'This build plan has conflicts in one or more build steps. '.
             'Examine the step list and resolve the listed errors.'),
         ));
     }
 
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $box,
         $step_list,
         $timeline,
       ),
       array(
         'title' => $title,
       ));
   }
 
   private function buildStepList(HarbormasterBuildPlan $plan) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $run_order =
       HarbormasterBuildGraph::determineDependencyExecution($plan);
 
     $steps = id(new HarbormasterBuildStepQuery())
       ->setViewer($viewer)
       ->withBuildPlanPHIDs(array($plan->getPHID()))
       ->execute();
     $steps = mpull($steps, null, 'getPHID');
 
     $can_edit = $this->hasApplicationCapability(
       HarbormasterManagePlansCapability::CAPABILITY);
 
     $step_list = id(new PHUIObjectItemListView())
       ->setUser($viewer)
       ->setNoDataString(
         pht('This build plan does not have any build steps yet.'));
 
     $i = 1;
     $last_depth = 0;
     $has_any_conflicts = false;
     $is_deadlocking = false;
     foreach ($run_order as $run_ref) {
       $step = $steps[$run_ref['node']->getPHID()];
       $depth = $run_ref['depth'] + 1;
       if ($last_depth !== $depth) {
         $last_depth = $depth;
         $i = 1;
       } else {
         $i++;
       }
 
       $implementation = null;
       try {
         $implementation = $step->getStepImplementation();
       } catch (Exception $ex) {
         // We can't initialize the implementation. This might be because
         // it's been renamed or no longer exists.
         $item = id(new PHUIObjectItemView())
           ->setObjectName(pht('Step %d.%d', $depth, $i))
           ->setHeader(pht('Unknown Implementation'))
-          ->setBarColor('red')
+          ->setStatusIcon('fa-warning red')
           ->addAttribute(pht(
             'This step has an invalid implementation (%s).',
             $step->getClassName()))
           ->addAction(
             id(new PHUIListItemView())
               ->setIcon('fa-times')
               ->addSigil('harbormaster-build-step-delete')
               ->setWorkflow(true)
               ->setRenderNameAsTooltip(true)
               ->setName(pht('Delete'))
               ->setHref(
                 $this->getApplicationURI('step/delete/'.$step->getID().'/')));
         $step_list->addItem($item);
         continue;
       }
       $item = id(new PHUIObjectItemView())
         ->setObjectName(pht('Step %d.%d', $depth, $i))
         ->setHeader($step->getName());
 
       $item->addAttribute($implementation->getDescription());
 
       $step_id = $step->getID();
       $edit_uri = $this->getApplicationURI("step/edit/{$step_id}/");
       $delete_uri = $this->getApplicationURI("step/delete/{$step_id}/");
 
       if ($can_edit) {
         $item->setHref($edit_uri);
       }
 
       $item
         ->setHref($edit_uri)
         ->addAction(
           id(new PHUIListItemView())
             ->setIcon('fa-times')
             ->addSigil('harbormaster-build-step-delete')
             ->setWorkflow(true)
             ->setDisabled(!$can_edit)
             ->setHref(
               $this->getApplicationURI('step/delete/'.$step->getID().'/')));
 
       $depends = $step->getStepImplementation()->getDependencies($step);
       $inputs = $step->getStepImplementation()->getArtifactInputs();
       $outputs = $step->getStepImplementation()->getArtifactOutputs();
 
       $has_conflicts = false;
       if ($depends || $inputs || $outputs) {
         $available_artifacts =
           HarbormasterBuildStepImplementation::getAvailableArtifacts(
             $plan,
             $step,
             null);
         $available_artifacts = ipull($available_artifacts, 'type');
 
         list($depends_ui, $has_conflicts) = $this->buildDependsOnList(
             $depends,
             pht('Depends On'),
             $steps);
 
         list($inputs_ui, $has_conflicts) = $this->buildArtifactList(
             $inputs,
             'in',
             pht('Input Artifacts'),
             $available_artifacts);
 
         list($outputs_ui) = $this->buildArtifactList(
             $outputs,
             'out',
             pht('Output Artifacts'),
             array());
 
         $item->appendChild(
           phutil_tag(
             'div',
             array(
               'class' => 'harbormaster-artifact-io',
             ),
             array(
               $depends_ui,
               $inputs_ui,
               $outputs_ui,
             )));
       }
 
       if ($has_conflicts) {
         $has_any_conflicts = true;
-        $item->setBarColor('red');
+        $item->setStatusIcon('fa-warning red');
       }
 
       if ($run_ref['cycle']) {
         $is_deadlocking = true;
       }
 
       if ($is_deadlocking) {
-        $item->setBarColor('red');
+        $item->setStatusIcon('fa-warning red');
       }
 
       $step_list->addItem($item);
     }
 
     return array($step_list, $has_any_conflicts, $is_deadlocking);
   }
 
   private function buildActionList(HarbormasterBuildPlan $plan) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
     $id = $plan->getID();
 
     $list = id(new PhabricatorActionListView())
       ->setUser($viewer)
       ->setObject($plan)
       ->setObjectURI($this->getApplicationURI("plan/{$id}/"));
 
     $can_edit = $this->hasApplicationCapability(
       HarbormasterManagePlansCapability::CAPABILITY);
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Edit Plan'))
         ->setHref($this->getApplicationURI("plan/edit/{$id}/"))
         ->setWorkflow(!$can_edit)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-pencil'));
 
     if ($plan->isDisabled()) {
       $list->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Enable Plan'))
           ->setHref($this->getApplicationURI("plan/disable/{$id}/"))
           ->setWorkflow(true)
           ->setDisabled(!$can_edit)
           ->setIcon('fa-check'));
     } else {
       $list->addAction(
         id(new PhabricatorActionView())
           ->setName(pht('Disable Plan'))
           ->setHref($this->getApplicationURI("plan/disable/{$id}/"))
           ->setWorkflow(true)
           ->setDisabled(!$can_edit)
           ->setIcon('fa-ban'));
     }
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Add Build Step'))
         ->setHref($this->getApplicationURI("step/add/{$id}/"))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-plus'));
 
     $list->addAction(
       id(new PhabricatorActionView())
         ->setName(pht('Run Plan Manually'))
         ->setHref($this->getApplicationURI("plan/run/{$id}/"))
         ->setWorkflow(true)
         ->setDisabled(!$can_edit)
         ->setIcon('fa-play-circle'));
 
     return $list;
   }
 
   private function buildPropertyLists(
     PHUIObjectBoxView $box,
     HarbormasterBuildPlan $plan,
     PhabricatorActionListView $actions) {
     $request = $this->getRequest();
     $viewer = $request->getUser();
 
     $properties = id(new PHUIPropertyListView())
       ->setUser($viewer)
       ->setObject($plan)
       ->setActionList($actions);
     $box->addPropertyList($properties);
 
     $properties->addProperty(
       pht('Created'),
       phabricator_datetime($plan->getDateCreated(), $viewer));
 
   }
 
   private function buildArtifactList(
     array $artifacts,
     $kind,
     $name,
     array $available_artifacts) {
     $has_conflicts = false;
 
     if (!$artifacts) {
       return array(null, $has_conflicts);
     }
 
     $this->requireResource('harbormaster-css');
 
     $header = phutil_tag(
       'div',
       array(
         'class' => 'harbormaster-artifact-summary-header',
       ),
       $name);
 
     $is_input = ($kind == 'in');
 
     $list = new PHUIStatusListView();
     foreach ($artifacts as $artifact) {
       $error = null;
 
       $key = idx($artifact, 'key');
       if (!strlen($key)) {
         $bound = phutil_tag('em', array(), pht('(null)'));
         if ($is_input) {
           // This is an unbound input. For now, all inputs are always required.
           $icon = PHUIStatusItemView::ICON_WARNING;
           $color = 'red';
           $icon_label = pht('Required Input');
           $has_conflicts = true;
           $error = pht('This input is required, but not configured.');
         } else {
           // This is an unnamed output. Outputs do not necessarily need to be
           // named.
           $icon = PHUIStatusItemView::ICON_OPEN;
           $color = 'bluegrey';
           $icon_label = pht('Unused Output');
         }
       } else {
         $bound = phutil_tag('strong', array(), $key);
         if ($is_input) {
           if (isset($available_artifacts[$key])) {
             if ($available_artifacts[$key] == idx($artifact, 'type')) {
               $icon = PHUIStatusItemView::ICON_ACCEPT;
               $color = 'green';
               $icon_label = pht('Valid Input');
             } else {
               $icon = PHUIStatusItemView::ICON_WARNING;
               $color = 'red';
               $icon_label = pht('Bad Input Type');
               $has_conflicts = true;
               $error = pht(
                 'This input is bound to the wrong artifact type. It is bound '.
                 'to a "%s" artifact, but should be bound to a "%s" artifact.',
                 $available_artifacts[$key],
                 idx($artifact, 'type'));
             }
           } else {
             $icon = PHUIStatusItemView::ICON_QUESTION;
             $color = 'red';
             $icon_label = pht('Unknown Input');
             $has_conflicts = true;
             $error = pht(
               'This input is bound to an artifact ("%s") which does not exist '.
               'at this stage in the build process.',
               $key);
           }
         } else {
           $icon = PHUIStatusItemView::ICON_DOWN;
           $color = 'green';
           $icon_label = pht('Valid Output');
         }
       }
 
       if ($error) {
         $note = array(
           phutil_tag('strong', array(), pht('ERROR:')),
           ' ',
           $error,
         );
       } else {
         $note = $bound;
       }
 
       $list->addItem(
         id(new PHUIStatusItemView())
           ->setIcon($icon, $color, $icon_label)
           ->setTarget($artifact['name'])
           ->setNote($note));
     }
 
     $ui = array(
       $header,
       $list,
     );
 
     return array($ui, $has_conflicts);
   }
 
   private function buildDependsOnList(
     array $step_phids,
     $name,
     array $steps) {
     $has_conflicts = false;
 
     if (count($step_phids) === 0) {
       return null;
     }
 
     $this->requireResource('harbormaster-css');
 
     $steps = mpull($steps, null, 'getPHID');
 
     $header = phutil_tag(
       'div',
       array(
         'class' => 'harbormaster-artifact-summary-header',
       ),
       $name);
 
     $list = new PHUIStatusListView();
     foreach ($step_phids as $step_phid) {
       $error = null;
 
       if (idx($steps, $step_phid) === null) {
         $icon = PHUIStatusItemView::ICON_WARNING;
         $color = 'red';
         $icon_label = pht('Missing Dependency');
         $has_conflicts = true;
         $error = pht(
           "This dependency specifies a build step which doesn't exist.");
       } else {
         $bound = phutil_tag(
           'strong',
           array(),
           idx($steps, $step_phid)->getName());
         $icon = PHUIStatusItemView::ICON_ACCEPT;
         $color = 'green';
         $icon_label = pht('Valid Input');
       }
 
       if ($error) {
         $note = array(
           phutil_tag('strong', array(), pht('ERROR:')),
           ' ',
           $error,
         );
       } else {
         $note = $bound;
       }
 
       $list->addItem(
         id(new PHUIStatusItemView())
           ->setIcon($icon, $color, $icon_label)
           ->setTarget(pht('Build Step'))
           ->setNote($note));
     }
 
     $ui = array(
       $header,
       $list,
     );
 
     return array($ui, $has_conflicts);
   }
 }
diff --git a/src/applications/people/controller/PhabricatorPeopleLdapController.php b/src/applications/people/controller/PhabricatorPeopleLdapController.php
index 6f5fa09f3f..2e030ad580 100644
--- a/src/applications/people/controller/PhabricatorPeopleLdapController.php
+++ b/src/applications/people/controller/PhabricatorPeopleLdapController.php
@@ -1,216 +1,216 @@
 <?php
 
 final class PhabricatorPeopleLdapController
   extends PhabricatorPeopleController {
 
   public function handleRequest(AphrontRequest $request) {
     $this->requireApplicationCapability(
       PeopleCreateUsersCapability::CAPABILITY);
     $admin = $request->getUser();
 
     $content = array();
 
     $form = id(new AphrontFormView())
       ->setAction($request->getRequestURI()
         ->alter('search', 'true')->alter('import', null))
       ->setUser($admin)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('LDAP username'))
           ->setName('username'))
       ->appendChild(
         id(new AphrontFormPasswordControl())
           ->setDisableAutocomplete(true)
           ->setLabel(pht('Password'))
           ->setName('password'))
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('LDAP query'))
           ->setCaption(pht('A filter such as %s.', '(objectClass=*)'))
           ->setName('query'))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->setValue(pht('Search')));
 
     $panel = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Import LDAP Users'))
       ->setForm($form);
 
     $crumbs = $this->buildApplicationCrumbs();
     $crumbs->addTextCrumb(
       pht('Import Ldap Users'),
       $this->getApplicationURI('/ldap/'));
 
     $nav = $this->buildSideNavView();
     $nav->setCrumbs($crumbs);
     $nav->selectFilter('ldap');
     $nav->appendChild($content);
 
     if ($request->getStr('import')) {
       $nav->appendChild($this->processImportRequest($request));
     }
 
     $nav->appendChild($panel);
 
     if ($request->getStr('search')) {
       $nav->appendChild($this->processSearchRequest($request));
     }
 
     return $this->buildApplicationPage(
       $nav,
       array(
         'title'  => pht('Import Ldap Users'),
       ));
   }
 
   private function processImportRequest($request) {
     $admin = $request->getUser();
     $usernames = $request->getArr('usernames');
     $emails = $request->getArr('email');
     $names = $request->getArr('name');
 
     $notice_view = new PHUIInfoView();
     $notice_view->setSeverity(PHUIInfoView::SEVERITY_NOTICE);
     $notice_view->setTitle(pht('Import Successful'));
     $notice_view->setErrors(array(
       pht('Successfully imported users from LDAP'),
     ));
 
     $list = new PHUIObjectItemListView();
     $list->setNoDataString(pht('No users imported?'));
 
     foreach ($usernames as $username) {
       $user = new PhabricatorUser();
       $user->setUsername($username);
       $user->setRealname($names[$username]);
 
       $email_obj = id(new PhabricatorUserEmail())
         ->setAddress($emails[$username])
         ->setIsVerified(1);
       try {
         id(new PhabricatorUserEditor())
           ->setActor($admin)
           ->createNewUser($user, $email_obj);
 
         id(new PhabricatorExternalAccount())
           ->setUserPHID($user->getPHID())
           ->setAccountType('ldap')
           ->setAccountDomain('self')
           ->setAccountID($username)
           ->save();
 
         $header = pht('Successfully added %s', $username);
         $attribute = null;
-        $color = 'green';
+        $color = 'fa-check green';
       } catch (Exception $ex) {
         $header = pht('Failed to add %s', $username);
         $attribute = $ex->getMessage();
-        $color = 'red';
+        $color = 'fa-times red';
       }
 
       $item = id(new PHUIObjectItemView())
         ->setHeader($header)
         ->addAttribute($attribute)
-        ->setBarColor($color);
+        ->setStatusIcon($color);
 
       $list->addItem($item);
     }
 
     return array(
       $notice_view,
       $list,
     );
 
   }
 
   private function processSearchRequest($request) {
     $panel = new PHUIBoxView();
     $admin = $request->getUser();
 
     $search = $request->getStr('query');
 
     $ldap_provider = PhabricatorLDAPAuthProvider::getLDAPProvider();
     if (!$ldap_provider) {
       throw new Exception(pht('No LDAP provider enabled!'));
     }
 
     $ldap_adapter = $ldap_provider->getAdapter();
     $ldap_adapter->setLoginUsername($request->getStr('username'));
     $ldap_adapter->setLoginPassword(
       new PhutilOpaqueEnvelope($request->getStr('password')));
 
     // This causes us to connect and bind.
     // TODO: Clean up this discard mode stuff.
     DarkConsoleErrorLogPluginAPI::enableDiscardMode();
       $ldap_adapter->getAccountID();
     DarkConsoleErrorLogPluginAPI::disableDiscardMode();
 
     $results = $ldap_adapter->searchLDAP('%Q', $search);
 
     foreach ($results as $key => $record) {
       $account_id = $ldap_adapter->readLDAPRecordAccountID($record);
       if (!$account_id) {
         unset($results[$key]);
         continue;
       }
 
       $info = array(
         $account_id,
         $ldap_adapter->readLDAPRecordEmail($record),
         $ldap_adapter->readLDAPRecordRealName($record),
       );
       $results[$key] = $info;
       $results[$key][] = $this->renderUserInputs($info);
     }
 
     $form = id(new AphrontFormView())
       ->setUser($admin);
 
     $table = new AphrontTableView($results);
     $table->setHeaders(
       array(
         pht('Username'),
         pht('Email'),
         pht('Real Name'),
         pht('Import?'),
       ));
     $form->appendChild($table);
     $form->setAction($request->getRequestURI()
       ->alter('import', 'true')->alter('search', null))
       ->appendChild(
         id(new AphrontFormSubmitControl())
         ->setValue(pht('Import')));
 
     $panel->appendChild($form);
 
     return $panel;
   }
 
   private function renderUserInputs($user) {
     $username = $user[0];
     return hsprintf(
       '%s%s%s',
       phutil_tag(
         'input',
         array(
           'type' => 'checkbox',
           'name' => 'usernames[]',
           'value' => $username,
         )),
       phutil_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => "email[$username]",
           'value' => $user[1],
         )),
       phutil_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => "name[$username]",
           'value' => $user[2],
         )));
   }
 
 }