diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 09a0a8b63c..6c47792f4b 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -144,7 +144,7 @@ return array(
     'rsrc/css/phui/phui-status.css' => '2f562399',
     'rsrc/css/phui/phui-tag-view.css' => '295d81c4',
     'rsrc/css/phui/phui-text.css' => '23e9b4b7',
-    'rsrc/css/phui/phui-timeline-view.css' => '18035042',
+    'rsrc/css/phui/phui-timeline-view.css' => '66803fc3',
     'rsrc/css/phui/phui-workboard-view.css' => '84f2c272',
     'rsrc/css/phui/phui-workpanel-view.css' => '97b69459',
     'rsrc/css/sprite-actions.css' => '969ad0e5',
@@ -764,7 +764,7 @@ return array(
     'phui-status-list-view-css' => '2f562399',
     'phui-tag-view-css' => '295d81c4',
     'phui-text-css' => '23e9b4b7',
-    'phui-timeline-view-css' => '18035042',
+    'phui-timeline-view-css' => '66803fc3',
     'phui-workboard-view-css' => '84f2c272',
     'phui-workpanel-view-css' => '97b69459',
     'policy-css' => '957ea14c',
diff --git a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
index bb5b35b986..bb02531e1c 100644
--- a/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
+++ b/src/applications/auth/storage/PhabricatorAuthProviderConfigTransaction.php
@@ -41,9 +41,9 @@ final class PhabricatorAuthProviderConfigTransaction
     switch ($this->getTransactionType()) {
       case self::TYPE_ENABLE:
         if ($new) {
-          return 'new';
+          return 'fa-play';
         } else {
-          return 'delete';
+          return 'fa-pause';
         }
     }
 
diff --git a/src/applications/config/storage/PhabricatorConfigTransaction.php b/src/applications/config/storage/PhabricatorConfigTransaction.php
index 579b8b3b65..ccabf44d88 100644
--- a/src/applications/config/storage/PhabricatorConfigTransaction.php
+++ b/src/applications/config/storage/PhabricatorConfigTransaction.php
@@ -59,7 +59,7 @@ final class PhabricatorConfigTransaction
   public function getIcon() {
     switch ($this->getTransactionType()) {
       case self::TYPE_EDIT:
-        return 'edit';
+        return 'fa-pencil';
     }
 
     return parent::getIcon();
diff --git a/src/applications/differential/storage/DifferentialTransaction.php b/src/applications/differential/storage/DifferentialTransaction.php
index 0f06e054d3..3ab0752308 100644
--- a/src/applications/differential/storage/DifferentialTransaction.php
+++ b/src/applications/differential/storage/DifferentialTransaction.php
@@ -335,39 +335,40 @@ final class DifferentialTransaction extends PhabricatorApplicationTransaction {
   public function getIcon() {
     switch ($this->getTransactionType()) {
       case self::TYPE_INLINE:
-        return 'comment';
+        return 'fa-comment';
       case self::TYPE_UPDATE:
-        return 'refresh';
+        return 'fa-refresh';
       case self::TYPE_STATUS:
         switch ($this->getNewValue()) {
           case ArcanistDifferentialRevisionStatus::ACCEPTED:
-            return 'enable';
+            return 'fa-check';
           case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
-            return 'delete';
+            return 'fa-times';
           case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
-            return 'refresh';
+            return 'fa-undo';
         }
         break;
       case self::TYPE_ACTION:
         switch ($this->getNewValue()) {
           case DifferentialAction::ACTION_CLOSE:
-            return 'ok';
+            return 'fa-check-square-o';
           case DifferentialAction::ACTION_ACCEPT:
-            return 'enable';
+            return 'fa-check';
           case DifferentialAction::ACTION_REJECT:
+            return 'fa-times';
           case DifferentialAction::ACTION_ABANDON:
-            return 'delete';
+            return 'fa-plane';
           case DifferentialAction::ACTION_RETHINK:
-            return 'disable';
+            return 'fa-headphones';
           case DifferentialAction::ACTION_REQUEST:
-            return 'refresh';
+            return 'fa-refresh';
           case DifferentialAction::ACTION_RECLAIM:
           case DifferentialAction::ACTION_REOPEN:
-            return 'new';
+            return 'fa-bullhorn';
           case DifferentialAction::ACTION_RESIGN:
-            return 'undo';
+            return 'fa-flag';
           case DifferentialAction::ACTION_CLAIM:
-            return 'user';
+            return 'fa-flag';
         }
     }
 
diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
index bf03518d5f..96e6f5d7d0 100644
--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildPlanTransaction.php
@@ -25,7 +25,7 @@ final class HarbormasterBuildPlanTransaction
     switch ($this->getTransactionType()) {
       case self::TYPE_NAME:
         if ($old === null) {
-          return 'create';
+          return 'fa-plus';
         }
         break;
     }
diff --git a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
index f30bb6767f..ca04a9818b 100644
--- a/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
+++ b/src/applications/harbormaster/storage/configuration/HarbormasterBuildStepTransaction.php
@@ -37,7 +37,7 @@ final class HarbormasterBuildStepTransaction
 
     switch ($this->getTransactionType()) {
       case self::TYPE_CREATE:
-        return 'create';
+        return 'fa-plus';
     }
 
     return parent::getIcon();
diff --git a/src/applications/herald/storage/HeraldRuleTransaction.php b/src/applications/herald/storage/HeraldRuleTransaction.php
index d63c477253..11eb4012b1 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 'disable';
+          return 'fa-pause';
         } else {
-          return 'enable';
+          return 'fa-play';
         }
     }
 
diff --git a/src/applications/macro/storage/PhabricatorMacroTransaction.php b/src/applications/macro/storage/PhabricatorMacroTransaction.php
index c29cb92265..c2bd279502 100644
--- a/src/applications/macro/storage/PhabricatorMacroTransaction.php
+++ b/src/applications/macro/storage/PhabricatorMacroTransaction.php
@@ -255,21 +255,21 @@ final class PhabricatorMacroTransaction
 
     switch ($this->getTransactionType()) {
       case PhabricatorMacroTransactionType::TYPE_NAME:
-        return 'edit';
+        return 'fa-pencil';
       case PhabricatorMacroTransactionType::TYPE_FILE:
         if ($old === null) {
-          return 'create';
+          return 'fa-plus';
         } else {
-          return 'edit';
+          return 'fa-pencil';
         }
       case PhabricatorMacroTransactionType::TYPE_DISABLED:
         if ($new) {
-          return 'delete';
+          return 'fa-times';
         } else {
-          return 'undo';
+          return 'fa-undo';
         }
       case PhabricatorMacroTransactionType::TYPE_AUDIO:
-        return 'herald';
+        return 'fa-headphones';
     }
 
     return parent::getIcon();
diff --git a/src/applications/maniphest/storage/ManiphestTransaction.php b/src/applications/maniphest/storage/ManiphestTransaction.php
index e05e0de0ed..721fa1f293 100644
--- a/src/applications/maniphest/storage/ManiphestTransaction.php
+++ b/src/applications/maniphest/storage/ManiphestTransaction.php
@@ -244,17 +244,17 @@ final class ManiphestTransaction
 
     switch ($this->getTransactionType()) {
       case self::TYPE_OWNER:
-        return 'user';
+        return 'fa-user';
 
       case self::TYPE_CCS:
-        return 'meta-mta';
+        return 'fa-envelope';
 
       case self::TYPE_TITLE:
         if ($old === null) {
-          return 'create';
+          return 'fa-pencil';
         }
 
-        return 'edit';
+        return 'fa-pencil';
 
       case self::TYPE_STATUS:
         $action = ManiphestTaskStatus::getStatusIcon($new);
@@ -263,33 +263,33 @@ final class ManiphestTransaction
         }
 
         if (ManiphestTaskStatus::isClosedStatus($new)) {
-          return 'check';
+          return 'fa-check-square-o';
         } else {
-          return 'edit';
+          return 'fa-pencil';
         }
 
       case self::TYPE_DESCRIPTION:
-        return 'edit';
+        return 'fa-pencil';
 
       case self::TYPE_PROJECTS:
-        return 'project';
+        return 'fa-briefcase';
 
       case self::TYPE_PROJECT_COLUMN:
-        return 'workboard';
+        return 'fa-columns';
 
       case self::TYPE_PRIORITY:
         if ($old == ManiphestTaskPriority::getDefaultPriority()) {
-          return 'normal-priority';
+          return 'fa-arrow-right';
           return pht('Triaged');
         } else if ($old > $new) {
-          return 'lower-priority';
+          return 'fa-arrow-down';
         } else {
-          return 'raise-priority';
+          return 'fa-arrow-up';
         }
 
       case self::TYPE_EDGE:
       case self::TYPE_ATTACH:
-        return 'attach';
+        return 'fa-thumb-tack';
 
     }
 
diff --git a/src/applications/paste/storage/PhabricatorPasteTransaction.php b/src/applications/paste/storage/PhabricatorPasteTransaction.php
index 453c13802c..a62f6be5f2 100644
--- a/src/applications/paste/storage/PhabricatorPasteTransaction.php
+++ b/src/applications/paste/storage/PhabricatorPasteTransaction.php
@@ -44,11 +44,11 @@ final class PhabricatorPasteTransaction
   public function getIcon() {
     switch ($this->getTransactionType()) {
       case self::TYPE_CREATE:
-        return 'create';
+        return 'fa-plus';
         break;
       case self::TYPE_TITLE:
       case self::TYPE_LANGUAGE:
-        return 'edit';
+        return 'fa-pencil';
         break;
     }
     return parent::getIcon();
diff --git a/src/applications/pholio/storage/PholioTransaction.php b/src/applications/pholio/storage/PholioTransaction.php
index d65414f098..c2e6c415fa 100644
--- a/src/applications/pholio/storage/PholioTransaction.php
+++ b/src/applications/pholio/storage/PholioTransaction.php
@@ -63,16 +63,16 @@ final class PholioTransaction extends PhabricatorApplicationTransaction {
   public function getIcon() {
     switch ($this->getTransactionType()) {
       case PholioTransactionType::TYPE_INLINE:
-        return 'comment';
+        return 'fa-comment';
       case PholioTransactionType::TYPE_NAME:
       case PholioTransactionType::TYPE_DESCRIPTION:
       case PholioTransactionType::TYPE_IMAGE_NAME:
       case PholioTransactionType::TYPE_IMAGE_DESCRIPTION:
       case PholioTransactionType::TYPE_IMAGE_SEQUENCE:
-        return 'edit';
+        return 'fa-pencil';
       case PholioTransactionType::TYPE_IMAGE_FILE:
       case PholioTransactionType::TYPE_IMAGE_REPLACE:
-        return 'attach';
+        return 'fa-picture-o';
     }
 
     return parent::getIcon();
diff --git a/src/applications/ponder/storage/PonderQuestionTransaction.php b/src/applications/ponder/storage/PonderQuestionTransaction.php
index a1ed5d47cc..67d89201a9 100644
--- a/src/applications/ponder/storage/PonderQuestionTransaction.php
+++ b/src/applications/ponder/storage/PonderQuestionTransaction.php
@@ -91,16 +91,16 @@ final class PonderQuestionTransaction
     switch ($this->getTransactionType()) {
       case self::TYPE_TITLE:
       case self::TYPE_CONTENT:
-        return 'edit';
+        return 'fa-pencil';
       case self::TYPE_STATUS:
         switch ($new) {
           case PonderQuestionStatus::STATUS_OPEN:
-            return 'enable';
+            return 'fa-check-circle';
           case PonderQuestionStatus::STATUS_CLOSED:
-            return 'disable';
+            return 'fa-minus-circle';
         }
       case self::TYPE_ANSWERS:
-        return 'new';
+        return 'fa-plus';
     }
 
     return parent::getIcon();
diff --git a/src/applications/releeph/storage/ReleephProductTransaction.php b/src/applications/releeph/storage/ReleephProductTransaction.php
index 3a389499bc..629d73c769 100644
--- a/src/applications/releeph/storage/ReleephProductTransaction.php
+++ b/src/applications/releeph/storage/ReleephProductTransaction.php
@@ -37,9 +37,9 @@ final class ReleephProductTransaction
     switch ($this->getTransactionType()) {
       case self::TYPE_ACTIVE:
         if ($new) {
-          return 'edit';
+          return 'fa-pencil';
         } else {
-          return 'delete';
+          return 'fa-times';
         }
         break;
     }
diff --git a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
index 1cec405290..7190dc0572 100644
--- a/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
+++ b/src/applications/repository/storage/PhabricatorRepositoryTransaction.php
@@ -89,7 +89,7 @@ final class PhabricatorRepositoryTransaction
   public function getIcon() {
     switch ($this->getTransactionType()) {
       case self::TYPE_VCS:
-        return 'create';
+        return 'fa-plus';
     }
     return parent::getIcon();
   }
diff --git a/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php b/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
index 9769767bbb..47b8091b98 100644
--- a/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
+++ b/src/applications/slowvote/storage/PhabricatorSlowvoteTransaction.php
@@ -85,10 +85,16 @@ final class PhabricatorSlowvoteTransaction
 
     switch ($this->getTransactionType()) {
       case PhabricatorSlowvoteTransaction::TYPE_QUESTION:
+        if ($old === null) {
+          return 'fa-plus';
+        } else {
+          return 'fa-pencil';
+        }
       case PhabricatorSlowvoteTransaction::TYPE_DESCRIPTION:
       case PhabricatorSlowvoteTransaction::TYPE_RESPONSES:
+        return 'fa-pencil';
       case PhabricatorSlowvoteTransaction::TYPE_SHUFFLE:
-        return 'edit';
+        return 'fa-refresh';
     }
 
     return parent::getIcon();
diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
index 78836bf859..4654df287a 100644
--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
@@ -326,26 +326,26 @@ abstract class PhabricatorApplicationTransaction
   public function getIcon() {
     switch ($this->getTransactionType()) {
       case PhabricatorTransactions::TYPE_COMMENT:
-        return 'comment';
+        return 'fa-comment';
       case PhabricatorTransactions::TYPE_SUBSCRIBERS:
-        return 'message';
+        return 'fa-envelope';
       case PhabricatorTransactions::TYPE_VIEW_POLICY:
       case PhabricatorTransactions::TYPE_EDIT_POLICY:
       case PhabricatorTransactions::TYPE_JOIN_POLICY:
-        return 'lock';
+        return 'fa-lock';
       case PhabricatorTransactions::TYPE_EDGE:
-        return 'link';
+        return 'fa-link';
       case PhabricatorTransactions::TYPE_BUILDABLE:
-        return 'wrench';
+        return 'fa-wrench';
       case PhabricatorTransactions::TYPE_TOKEN:
         if ($this->getNewValue()) {
-          return 'like';
+          return 'fa-thumbs-o-up';
         } else {
-          return 'dislike';
+          return 'fa-thumbs-o-down';
         }
     }
 
-    return 'edit';
+    return 'fa-pencil';
   }
 
   public function getToken() {
diff --git a/src/applications/uiexample/examples/PHUIIconExample.php b/src/applications/uiexample/examples/PHUIIconExample.php
index 1a5fa1c90d..af7e3f27b8 100644
--- a/src/applications/uiexample/examples/PHUIIconExample.php
+++ b/src/applications/uiexample/examples/PHUIIconExample.php
@@ -423,15 +423,14 @@ final class PHUIIconExample extends PhabricatorUIExample {
     foreach ($colors as $color) {
       $cicons[] = id(new PHUIIconView())
         ->addClass('phui-example-icon-transform')
-        ->setFontAwesome('fa-tag '.$color)
+        ->setIconFont('fa-tag '.$color)
         ->setText(pht('fa-tag %s', $color));
     }
     $ficons = array();
     foreach ($fas as $fa) {
-
       $ficons[] = id(new PHUIIconView())
         ->addClass('phui-example-icon-name')
-        ->setFontAwesome($fa)
+        ->setIconFont($fa)
         ->setText($fa);
     }
 
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
index 6972da66cb..a9f35c7c2d 100644
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -23,7 +23,7 @@ final class PHUIIconView extends AphrontTagView {
 
   private $spriteIcon;
   private $spriteSheet;
-  private $fontAwesome;
+  private $iconFont;
 
   public function setHref($href) {
     $this->href = $href;
@@ -55,8 +55,8 @@ final class PHUIIconView extends AphrontTagView {
     return $this;
   }
 
-  public function setFontAwesome($fa) {
-    $this->fontAwesome = $fa;
+  public function setIconFont($icon) {
+    $this->iconFont = $icon;
     return $this;
   }
 
@@ -80,11 +80,11 @@ final class PHUIIconView extends AphrontTagView {
       $classes[] = 'sprite-'.$this->spriteSheet;
       $classes[] = $this->spriteSheet.'-'.$this->spriteIcon;
 
-    } elseif ($this->fontAwesome) {
+    } elseif ($this->iconFont) {
       require_celerity_resource('phui-font-icon-base-css');
       require_celerity_resource('font-fontawesome');
       $classes[] = 'phui-font-fa';
-      $classes[] = $this->fontAwesome;
+      $classes[] = $this->iconFont;
 
     } else {
       if ($this->headSize) {
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index b637f928db..a1a622c7cc 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -175,18 +175,16 @@ final class PHUITimelineEventView extends AphrontView {
           $fill_classes[] = 'phui-timeline-icon-fill-'.$this->color;
         }
 
+        $icon = id(new PHUIIconView())
+          ->setIconFont($this->icon.' white')
+          ->addClass('phui-timeline-icon');
+
         $icon = phutil_tag(
           'span',
           array(
             'class' => implode(' ', $fill_classes),
           ),
-          phutil_tag(
-            'span',
-            array(
-              'class' => 'phui-timeline-icon sprite-icons '.
-                         'icons-'.$this->icon.'-white',
-            ),
-            ''));
+          $icon);
       }
 
       $token = null;
diff --git a/webroot/rsrc/css/phui/phui-timeline-view.css b/webroot/rsrc/css/phui/phui-timeline-view.css
index 437774a9b6..fac31ce139 100644
--- a/webroot/rsrc/css/phui/phui-timeline-view.css
+++ b/webroot/rsrc/css/phui/phui-timeline-view.css
@@ -194,10 +194,8 @@
 
 .phui-timeline-icon {
   position: absolute;
-  left: 8px;
-  top: 8px;
-  height: 14px;
-  width: 14px;
+  left: 9px;
+  top: -5px;
 }
 
 .phui-timeline-minor-event .phui-timeline-icon-fill {
@@ -207,8 +205,8 @@
 }
 
 .phui-timeline-minor-event .phui-timeline-icon {
-  top: 6px;
-  left: 6px;
+  top: -5px;
+  left: 7px;
 }
 
 .phui-timeline-extra,