diff --git a/src/applications/differential/phid/DifferentialRevisionPHIDType.php b/src/applications/differential/phid/DifferentialRevisionPHIDType.php
--- a/src/applications/differential/phid/DifferentialRevisionPHIDType.php
+++ b/src/applications/differential/phid/DifferentialRevisionPHIDType.php
@@ -44,15 +44,6 @@
       if ($revision->isClosed()) {
         $handle->setStatus(PhabricatorObjectHandle::STATUS_CLOSED);
       }
-
-      $icon = $revision->getStatusIcon();
-      $color = $revision->getStatusIconColor();
-      $name = $revision->getStatusDisplayName();
-
-      $handle
-        ->setStateIcon($icon)
-        ->setStateColor($color)
-        ->setStateName($name);
     }
   }
 
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -413,8 +413,7 @@
 
       foreach ($commit_phids as $phid) {
         $revisions_commits[$phid] = $handles->renderHandle($phid)
-          ->setShowHovercard(true)
-          ->setShowStateIcon(true);
+          ->setShowHovercard(true);
         $revision_phid = key($drev_edges[$phid][$commit_drev]);
         $revision_handle = $handles->getHandleIfExists($revision_phid);
         if ($revision_handle) {
@@ -435,8 +434,7 @@
 
       $edge_handles = $viewer->loadHandles(array_keys($edges[$edge_type]));
 
-      $edge_list = $edge_handles->renderList()
-        ->setShowStateIcons(true);
+      $edge_list = $edge_handles->renderList();
 
       $view->addProperty($edge_name, $edge_list);
     }
diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php
--- a/src/applications/phid/PhabricatorObjectHandle.php
+++ b/src/applications/phid/PhabricatorObjectHandle.php
@@ -33,10 +33,6 @@
   private $commandLineObjectName;
   private $mailStampName;
 
-  private $stateIcon;
-  private $stateColor;
-  private $stateName;
-
   public function setIcon($icon) {
     $this->icon = $icon;
     return $this;
@@ -299,55 +295,6 @@
     return $this->complete;
   }
 
-  public function setStateIcon($state_icon) {
-    $this->stateIcon = $state_icon;
-    return $this;
-  }
-
-  public function getStateIcon() {
-    return $this->stateIcon;
-  }
-
-  public function setStateColor($state_color) {
-    $this->stateColor = $state_color;
-    return $this;
-  }
-
-  public function getStateColor() {
-    return $this->stateColor;
-  }
-
-  public function setStateName($state_name) {
-    $this->stateName = $state_name;
-    return $this;
-  }
-
-  public function getStateName() {
-    return $this->stateName;
-  }
-
-  public function renderStateIcon() {
-    $icon = $this->getStateIcon();
-    if ($icon === null) {
-      $icon = 'fa-question-circle-o';
-    }
-
-    $color = $this->getStateColor();
-
-    $name = $this->getStateName();
-    if ($name === null) {
-      $name = pht('Unknown');
-    }
-
-    return id(new PHUIIconView())
-      ->setIcon($icon, $color)
-      ->addSigil('has-tooltip')
-      ->setMetadata(
-        array(
-          'tip' => $name,
-        ));
-  }
-
   public function renderLink($name = null) {
     return $this->renderLinkWithAttributes($name, array());
   }
diff --git a/src/applications/phid/view/PHUIHandleListView.php b/src/applications/phid/view/PHUIHandleListView.php
--- a/src/applications/phid/view/PHUIHandleListView.php
+++ b/src/applications/phid/view/PHUIHandleListView.php
@@ -13,7 +13,6 @@
   private $handleList;
   private $asInline;
   private $asText;
-  private $showStateIcons;
   private $glyphLimit;
 
   public function setHandleList(PhabricatorHandleList $list) {
@@ -39,15 +38,6 @@
     return $this->asText;
   }
 
-  public function setShowStateIcons($show_state_icons) {
-    $this->showStateIcons = $show_state_icons;
-    return $this;
-  }
-
-  public function getShowStateIcons() {
-    return $this->showStateIcons;
-  }
-
   public function setGlyphLimit($glyph_limit) {
     $this->glyphLimit = $glyph_limit;
     return $this;
@@ -70,7 +60,6 @@
   protected function getTagContent() {
     $list = $this->handleList;
 
-    $show_state_icons = $this->getShowStateIcons();
     $glyph_limit = $this->getGlyphLimit();
 
     $items = array();
@@ -79,10 +68,6 @@
         ->setShowHovercard(true)
         ->setAsText($this->getAsText());
 
-      if ($show_state_icons) {
-        $view->setShowStateIcon(true);
-      }
-
       if ($glyph_limit) {
         $view->setGlyphLimit($glyph_limit);
       }
diff --git a/src/applications/phid/view/PHUIHandleView.php b/src/applications/phid/view/PHUIHandleView.php
--- a/src/applications/phid/view/PHUIHandleView.php
+++ b/src/applications/phid/view/PHUIHandleView.php
@@ -17,7 +17,6 @@
   private $asText;
   private $useShortName;
   private $showHovercard;
-  private $showStateIcon;
   private $glyphLimit;
 
   public function setHandleList(PhabricatorHandleList $list) {
@@ -50,15 +49,6 @@
     return $this;
   }
 
-  public function setShowStateIcon($show_state_icon) {
-    $this->showStateIcon = $show_state_icon;
-    return $this;
-  }
-
-  public function getShowStateIcon() {
-    return $this->showStateIcon;
-  }
-
   public function setGlyphLimit($glyph_limit) {
     $this->glyphLimit = $glyph_limit;
     return $this;
@@ -104,11 +94,6 @@
       $link = $handle->renderLink($name);
     }
 
-    if ($this->showStateIcon) {
-      $icon = $handle->renderStateIcon();
-      $link = array($icon, ' ', $link);
-    }
-
     return $link;
   }
 
diff --git a/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php b/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
--- a/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
+++ b/src/applications/repository/phid/PhabricatorRepositoryCommitPHIDType.php
@@ -81,16 +81,6 @@
       $handle->setFullName($full_name);
       $handle->setURI($commit->getURI());
       $handle->setTimestamp($commit->getEpoch());
-
-      $status = $commit->getAuditStatusObject();
-      $icon = $status->getIcon();
-      $color = $status->getColor();
-      $name = $status->getName();
-
-      $handle
-        ->setStateIcon($icon)
-        ->setStateColor($color)
-        ->setStateName($name);
     }
   }