diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php
index 8efae11d6a..e1a7c2a69e 100644
--- a/src/applications/almanac/controller/AlmanacController.php
+++ b/src/applications/almanac/controller/AlmanacController.php
@@ -33,7 +33,7 @@ abstract class AlmanacController
     Javelin::initBehavior('phabricator-tooltips', array());
 
     $icon_builtin = id(new PHUIIconView())
-      ->setIconFont('fa-circle')
+      ->setIcon('fa-circle')
       ->addSigil('has-tooltip')
       ->setMetadata(
         array(
@@ -42,7 +42,7 @@ abstract class AlmanacController
         ));
 
     $icon_custom = id(new PHUIIconView())
-      ->setIconFont('fa-circle-o grey')
+      ->setIcon('fa-circle-o grey')
       ->addSigil('has-tooltip')
       ->setMetadata(
         array(
@@ -166,9 +166,7 @@ abstract class AlmanacController
       ->setWorkflow(true)
       ->setDisabled(!$can_edit)
       ->setText(pht('Add Property'))
-      ->setIcon(
-        id(new PHUIIconView())
-          ->setIconFont('fa-plus'));
+      ->setIcon('fa-plus');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Properties'))
diff --git a/src/applications/almanac/controller/AlmanacDeviceViewController.php b/src/applications/almanac/controller/AlmanacDeviceViewController.php
index e611cceb7a..c7756c5b25 100644
--- a/src/applications/almanac/controller/AlmanacDeviceViewController.php
+++ b/src/applications/almanac/controller/AlmanacDeviceViewController.php
@@ -132,9 +132,7 @@ final class AlmanacDeviceViewController
           ->setWorkflow(!$can_edit)
           ->setDisabled(!$can_edit)
           ->setText(pht('Add Interface'))
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-plus')));
+          ->setIcon('fa-plus'));
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
@@ -185,7 +183,7 @@ final class AlmanacDeviceViewController
           ->setText(pht('Generate Keypair'))
           ->setIcon(
             id(new PHUIIconView())
-              ->setIconFont('fa-lock')))
+              ->setIcon('fa-lock')))
       ->addActionLink(
         id(new PHUIButtonView())
           ->setTag('a')
@@ -195,7 +193,7 @@ final class AlmanacDeviceViewController
           ->setText(pht('Upload Public Key'))
           ->setIcon(
             id(new PHUIIconView())
-              ->setIconFont('fa-upload')));
+              ->setIcon('fa-upload')));
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
@@ -221,7 +219,7 @@ final class AlmanacDeviceViewController
     $handles = $viewer->loadHandles(mpull($services, 'getPHID'));
 
     $icon_lock = id(new PHUIIconView())
-      ->setIconFont('fa-lock');
+      ->setIcon('fa-lock');
 
     $rows = array();
     foreach ($services as $service) {
diff --git a/src/applications/almanac/controller/AlmanacServiceViewController.php b/src/applications/almanac/controller/AlmanacServiceViewController.php
index bfeed96e2f..113722bf06 100644
--- a/src/applications/almanac/controller/AlmanacServiceViewController.php
+++ b/src/applications/almanac/controller/AlmanacServiceViewController.php
@@ -134,9 +134,7 @@ final class AlmanacServiceViewController
           ->setWorkflow(!$can_edit)
           ->setDisabled(!$can_edit)
           ->setText(pht('Add Binding'))
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-plus')));
+          ->setIcon('fa-plus'));
 
     return id(new PHUIObjectBoxView())
       ->setHeader($header)
diff --git a/src/applications/auth/controller/config/PhabricatorAuthListController.php b/src/applications/auth/controller/config/PhabricatorAuthListController.php
index 71aac9e185..6df32f50a5 100644
--- a/src/applications/auth/controller/config/PhabricatorAuthListController.php
+++ b/src/applications/auth/controller/config/PhabricatorAuthListController.php
@@ -147,13 +147,11 @@ final class PhabricatorAuthListController
       ->setSeverity($severity)
       ->setErrors($issues);
 
-    $image = id(new PHUIIconView())
-          ->setIconFont('fa-plus');
     $button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setHref($this->getApplicationURI('config/new/'))
-        ->setIcon($image)
+        ->setIcon('fa-plus')
         ->setDisabled(!$can_manage)
         ->setText(pht('Add Provider'));
 
diff --git a/src/applications/auth/data/PhabricatorAuthInviteAction.php b/src/applications/auth/data/PhabricatorAuthInviteAction.php
index 10b625642a..8b6b61aa30 100644
--- a/src/applications/auth/data/PhabricatorAuthInviteAction.php
+++ b/src/applications/auth/data/PhabricatorAuthInviteAction.php
@@ -88,7 +88,7 @@ final class PhabricatorAuthInviteAction extends Phobject {
     }
 
     return id(new PHUIIconView())
-      ->setIconFont("{$icon} {$color}");
+      ->setIcon("{$icon} {$color}");
   }
 
   public static function newActionListFromAddresses(
diff --git a/src/applications/auth/view/PhabricatorAuthSSHKeyTableView.php b/src/applications/auth/view/PhabricatorAuthSSHKeyTableView.php
index ee7f5756ae..e19a35fce6 100644
--- a/src/applications/auth/view/PhabricatorAuthSSHKeyTableView.php
+++ b/src/applications/auth/view/PhabricatorAuthSSHKeyTableView.php
@@ -45,9 +45,9 @@ final class PhabricatorAuthSSHKeyTableView extends AphrontView {
     }
 
     $trusted_icon = id(new PHUIIconView())
-      ->setIconFont('fa-star blue');
+      ->setIcon('fa-star blue');
     $untrusted_icon = id(new PHUIIconView())
-      ->setIconFont('fa-times grey');
+      ->setIcon('fa-times grey');
 
     $rows = array();
     foreach ($keys as $key) {
diff --git a/src/applications/base/controller/PhabricatorController.php b/src/applications/base/controller/PhabricatorController.php
index a1720bb5d5..1fe68abab3 100644
--- a/src/applications/base/controller/PhabricatorController.php
+++ b/src/applications/base/controller/PhabricatorController.php
@@ -400,7 +400,7 @@ abstract class PhabricatorController extends AphrontController {
     }
 
     $icon = id(new PHUIIconView())
-      ->setIconFont($icon_name);
+      ->setIcon($icon_name);
 
     require_celerity_resource('policy-css');
 
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
index 43386fe0d6..f423860a3b 100644
--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
@@ -125,16 +125,14 @@ final class PhabricatorCalendarEventViewController
     if ($is_invite_pending) {
       $decline_button = id(new PHUIButtonView())
         ->setTag('a')
-        ->setIcon(id(new PHUIIconView())
-          ->setIconFont('fa-times grey'))
+        ->setIcon('fa-times grey')
         ->setHref($this->getApplicationURI("/event/decline/{$id}/"))
         ->setWorkflow(true)
         ->setText(pht('Decline'));
 
       $accept_button = id(new PHUIButtonView())
         ->setTag('a')
-        ->setIcon(id(new PHUIIconView())
-          ->setIconFont('fa-check green'))
+        ->setIcon('fa-check green')
         ->setHref($this->getApplicationURI("/event/accept/{$id}/"))
         ->setWorkflow(true)
         ->setText(pht('Accept'));
diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
index 8084356ced..fe505ecf60 100644
--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
@@ -213,7 +213,7 @@ final class PhabricatorChatLogChannelLogController
       ->setTag('a')
       ->setHref('#latest')
       ->setText(pht('Jump to Bottom'))
-      ->setIconFont('fa-arrow-circle-down');
+      ->setIcon('fa-arrow-circle-down');
 
     $jump_target = phutil_tag(
       'div',
diff --git a/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php b/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php
index 7f1adf1c1a..f5d203c772 100644
--- a/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php
+++ b/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php
@@ -140,7 +140,7 @@ final class PhabricatorConduitLogSearchEngine
           break;
         case ConduitAPIMethod::METHOD_STATUS_UNSTABLE:
           $status = id(new PHUIIconView())
-            ->setIconFont('fa-exclamation-triangle yellow')
+            ->setIcon('fa-exclamation-triangle yellow')
             ->addSigil('has-tooltip')
             ->setMetadata(
               array(
@@ -149,7 +149,7 @@ final class PhabricatorConduitLogSearchEngine
           break;
         case ConduitAPIMethod::METHOD_STATUS_DEPRECATED:
           $status = id(new PHUIIconView())
-            ->setIconFont('fa-exclamation-triangle red')
+            ->setIcon('fa-exclamation-triangle red')
             ->addSigil('has-tooltip')
             ->setMetadata(
               array(
@@ -158,7 +158,7 @@ final class PhabricatorConduitLogSearchEngine
           break;
         default:
           $status = id(new PHUIIconView())
-            ->setIconFont('fa-question-circle')
+            ->setIcon('fa-question-circle')
             ->addSigil('has-tooltip')
             ->setMetadata(
               array(
diff --git a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
index b41e689d37..6f315783cc 100644
--- a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
+++ b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
@@ -87,23 +87,19 @@ final class PhabricatorConduitTokensSettingsPanel
         'action',
       ));
 
-    $generate_icon = id(new PHUIIconView())
-      ->setIconFont('fa-plus');
     $generate_button = id(new PHUIButtonView())
       ->setText(pht('Generate API Token'))
       ->setHref('/conduit/token/edit/?objectPHID='.$user->getPHID())
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($generate_icon);
+      ->setIcon('fa-plus');
 
-    $terminate_icon = id(new PHUIIconView())
-      ->setIconFont('fa-exclamation-triangle');
     $terminate_button = id(new PHUIButtonView())
       ->setText(pht('Terminate All Tokens'))
       ->setHref('/conduit/token/terminate/?objectPHID='.$user->getPHID())
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($terminate_icon);
+      ->setIcon('fa-exclamation-triangle');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Active API Tokens'))
diff --git a/src/applications/config/controller/PhabricatorConfigCacheController.php b/src/applications/config/controller/PhabricatorConfigCacheController.php
index 90c1b3a2fd..67fbf6e120 100644
--- a/src/applications/config/controller/PhabricatorConfigCacheController.php
+++ b/src/applications/config/controller/PhabricatorConfigCacheController.php
@@ -39,15 +39,12 @@ final class PhabricatorConfigCacheController
 
     $this->renderCommonProperties($properties, $cache);
 
-    $purge_icon = id(new PHUIIconView())
-      ->setIconFont('fa-exclamation-triangle');
-
     $purge_button = id(new PHUIButtonView())
       ->setText(pht('Purge Caches'))
       ->setHref('/config/cache/purge/')
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($purge_icon);
+      ->setIcon('fa-exclamation-triangle');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Opcode Cache'))
@@ -161,7 +158,7 @@ final class PhabricatorConfigCacheController
 
   private function renderYes($info) {
     return array(
-      id(new PHUIIconView())->setIconFont('fa-check', 'green'),
+      id(new PHUIIconView())->setIcon('fa-check', 'green'),
       ' ',
       $info,
     );
@@ -169,7 +166,7 @@ final class PhabricatorConfigCacheController
 
   private function renderNo($info) {
     return array(
-      id(new PHUIIconView())->setIconFont('fa-times-circle', 'red'),
+      id(new PHUIIconView())->setIcon('fa-times-circle', 'red'),
       ' ',
       $info,
     );
@@ -177,7 +174,7 @@ final class PhabricatorConfigCacheController
 
   private function renderInfo($info) {
     return array(
-      id(new PHUIIconView())->setIconFont('fa-info-circle', 'grey'),
+      id(new PHUIIconView())->setIcon('fa-info-circle', 'grey'),
       ' ',
       $info,
     );
diff --git a/src/applications/config/controller/PhabricatorConfigDatabaseController.php b/src/applications/config/controller/PhabricatorConfigDatabaseController.php
index ccd18367b2..225312a52f 100644
--- a/src/applications/config/controller/PhabricatorConfigDatabaseController.php
+++ b/src/applications/config/controller/PhabricatorConfigDatabaseController.php
@@ -36,7 +36,7 @@ abstract class PhabricatorConfigDatabaseController
     }
 
     return id(new PHUIIconView())
-      ->setIconFont($icon);
+      ->setIcon($icon);
   }
 
   protected function renderAttr($attr, $issue) {
@@ -71,9 +71,7 @@ abstract class PhabricatorConfigDatabaseController
       ->addActionLink(
         id(new PHUIButtonView())
           ->setTag('a')
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-book'))
+          ->setIcon('fa-book')
           ->setHref($doc_link)
           ->setText(pht('Learn More')));
   }
diff --git a/src/applications/config/controller/PhabricatorConfigWelcomeController.php b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
index 11e07b96c0..e2d868082a 100644
--- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php
+++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
@@ -374,7 +374,7 @@ final class PhabricatorConfigWelcomeController
     $viewer = $request->getUser();
 
     $icon = id(new PHUIIconView())
-      ->setIconFont($icon.' fa-2x');
+      ->setIcon($icon.' fa-2x');
 
     $content = PhabricatorMarkupEngine::renderOneObject(
       id(new PhabricatorMarkupOneOff())->setContent($content),
diff --git a/src/applications/config/module/PhabricatorConfigPHIDModule.php b/src/applications/config/module/PhabricatorConfigPHIDModule.php
index 4c5c09f9c3..0a1eaf7b3f 100644
--- a/src/applications/config/module/PhabricatorConfigPHIDModule.php
+++ b/src/applications/config/module/PhabricatorConfigPHIDModule.php
@@ -25,7 +25,7 @@ final class PhabricatorConfigPHIDModule extends PhabricatorConfigModule {
 
         $icon = $app->getFontIcon();
         if ($icon) {
-          $app_icon = id(new PHUIIconView())->setIconFont($icon);
+          $app_icon = id(new PHUIIconView())->setIcon($icon);
         } else {
           $app_icon = null;
         }
@@ -36,7 +36,7 @@ final class PhabricatorConfigPHIDModule extends PhabricatorConfigModule {
 
       $icon = $type->getTypeIcon();
       if ($icon) {
-        $type_icon = id(new PHUIIconView())->setIconFont($icon);
+        $type_icon = id(new PHUIIconView())->setIcon($icon);
       } else {
         $type_icon = null;
       }
diff --git a/src/applications/conpherence/controller/ConpherenceWidgetController.php b/src/applications/conpherence/controller/ConpherenceWidgetController.php
index 0408896a16..e6707577e9 100644
--- a/src/applications/conpherence/controller/ConpherenceWidgetController.php
+++ b/src/applications/conpherence/controller/ConpherenceWidgetController.php
@@ -57,7 +57,7 @@ final class ConpherenceWidgetController extends ConpherenceController {
 
     $widgets = array();
     $new_icon = id(new PHUIIconView())
-      ->setIconFont('fa-plus')
+      ->setIcon('fa-plus')
       ->setHref($this->getWidgetURI())
       ->setMetadata(array('widget' => null))
       ->addSigil('conpherence-widget-adder');
diff --git a/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php b/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php
index 95c5bd592a..92e5da59b1 100644
--- a/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php
+++ b/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php
@@ -149,7 +149,7 @@ final class ConpherenceThreadSearchEngine
 
       $icon_name = $conpherence->getPolicyIconName($policy_objects);
       $icon = id(new PHUIIconView())
-        ->setIconFont($icon_name);
+        ->setIcon($icon_name);
       $item = id(new PHUIObjectItemView())
         ->setObjectName($conpherence->getMonogram())
         ->setHeader($title)
diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
index b371e86c5b..d892eaf62b 100644
--- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php
+++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
@@ -214,7 +214,7 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
     $icon = $conpherence->getPolicyIconName($policy_objects);
     $icon = id(new PHUIIconView())
       ->addClass('mmr')
-      ->setIconFont($icon);
+      ->setIcon($icon);
     return $icon;
   }
 
@@ -277,9 +277,7 @@ final class ConpherenceDurableColumnView extends AphrontTagView {
         ->setTag('a')
         ->setHref('/conpherence/search/')
         ->setColor(PHUIButtonView::GREY)
-        ->setIcon(
-          id(new PHUIIconView())
-          ->setIconFont('fa-search'))));
+        ->setIcon('fa-search')));
   }
 
   private function buildHeader() {
diff --git a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
index a10a9756c7..8bcff0dad6 100644
--- a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
+++ b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
@@ -23,7 +23,7 @@ final class ConpherencePeopleWidgetView extends ConpherenceWidgetView {
       $remove_html = '';
       if ($user_phid == $user->getPHID()) {
         $icon = id(new PHUIIconView())
-          ->setIconFont('fa-times lightbluetext');
+          ->setIcon('fa-times lightbluetext');
         $remove_html = javelin_tag(
           'a',
           array(
diff --git a/src/applications/conpherence/view/ConpherenceThreadListView.php b/src/applications/conpherence/view/ConpherenceThreadListView.php
index 668e6f9558..40262c765b 100644
--- a/src/applications/conpherence/view/ConpherenceThreadListView.php
+++ b/src/applications/conpherence/view/ConpherenceThreadListView.php
@@ -59,7 +59,7 @@ final class ConpherenceThreadListView extends AphrontView {
     $data = $thread->getDisplayData($user);
     $icon = id(new PHUIIconView())
       ->addClass('msr')
-      ->setIconFont($thread->getPolicyIconName($policy_objects));
+      ->setIcon($thread->getPolicyIconName($policy_objects));
     $title = phutil_tag(
       'span',
       array(),
@@ -109,7 +109,7 @@ final class ConpherenceThreadListView extends AphrontView {
       'conpherence-room-list-header');
     $header->appendChild(
       id(new PHUIIconView())
-      ->setIconFont('fa-search')
+      ->setIcon('fa-search')
       ->setHref('/conpherence/search/')
       ->setText(pht('Search')));
     $menu->addMenuItem($header);
diff --git a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
index c660583203..57877783bb 100644
--- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
+++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
@@ -165,7 +165,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
         break;
     }
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-warning red msr');
+      ->setIcon('fa-warning red msr');
     $content = id(new PHUIBoxView())
       ->addClass('dashboard-box')
       ->appendChild($icon)
@@ -250,7 +250,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
       $edit_uri->setQueryParam('dashboardID', $dashboard_id);
     }
     $action_edit = id(new PHUIIconView())
-      ->setIconFont('fa-pencil')
+      ->setIcon('fa-pencil')
       ->setWorkflow(true)
       ->setHref((string)$edit_uri);
     $header->addActionIcon($action_edit);
@@ -260,7 +260,7 @@ final class PhabricatorDashboardPanelRenderingEngine extends Phobject {
         '/dashboard/removepanel/'.$dashboard_id.'/'))
         ->setQueryParam('panelPHID', $panel->getPHID());
       $action_remove = id(new PHUIIconView())
-        ->setIconFont('fa-trash-o')
+        ->setIcon('fa-trash-o')
         ->setHref((string)$uri)
         ->setWorkflow(true);
       $header->addActionIcon($action_remove);
diff --git a/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php b/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
index 181d2c8bca..92195aa8f5 100644
--- a/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
+++ b/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
@@ -117,7 +117,7 @@ final class PhabricatorDashboardQueryPanelType
     $key = $panel->getProperty('key');
     $href = $search_engine->getQueryResultsPageURI($key);
     $icon = id(new PHUIIconView())
-        ->setIconFont('fa-search')
+        ->setIcon('fa-search')
         ->setHref($href);
     $header->addActionIcon($icon);
 
diff --git a/src/applications/differential/constants/DifferentialRevisionStatus.php b/src/applications/differential/constants/DifferentialRevisionStatus.php
index 087e577a78..50bc903c40 100644
--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
@@ -63,7 +63,7 @@ final class DifferentialRevisionStatus extends Phobject {
       ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status);
 
     $img = id(new PHUIIconView())
-      ->setIconFont(self::getRevisionStatusIcon($status));
+      ->setIcon(self::getRevisionStatusIcon($status));
 
     $tag = phutil_tag(
       'span',
diff --git a/src/applications/differential/view/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php
index 918a49e6a7..6fb35a23d5 100644
--- a/src/applications/differential/view/DifferentialChangesetDetailView.php
+++ b/src/applications/differential/view/DifferentialChangesetDetailView.php
@@ -206,7 +206,7 @@ final class DifferentialChangesetDetailView extends AphrontView {
     $display_filename = $changeset->getDisplayFilename();
     $display_icon = $this->getFileIcon($display_filename);
     $icon = id(new PHUIIconView())
-      ->setIconFont($display_icon);
+      ->setIcon($display_icon);
 
     $renderer = DifferentialChangesetHTMLRenderer::getHTMLRendererByKey(
       $this->getRenderer());
diff --git a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
index c8cb8c2370..14050e942c 100644
--- a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
+++ b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
@@ -91,12 +91,12 @@ final class DifferentialChangesetFileTreeSideNavBuilder extends Phobject {
         $href = '#'.$data->getAnchorName();
         $title = $name;
         $icon = id(new PHUIIconView())
-          ->setIconFont('fa-file-text-o bluetext');
+          ->setIcon('fa-file-text-o bluetext');
       } else {
         $name .= '/';
         $title = $path->getFullPath().'/';
         $icon = id(new PHUIIconView())
-          ->setIconFont('fa-folder-open blue');
+          ->setIcon('fa-folder-open blue');
       }
 
       $name_element = phutil_tag(
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
index b722633c0d..2c14bbc4a5 100644
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -131,7 +131,7 @@ final class DifferentialRevisionListView extends AphrontView {
 
       if (isset($icons['draft'])) {
         $draft = id(new PHUIIconView())
-          ->setIconFont('fa-comment yellow')
+          ->setIcon('fa-comment yellow')
           ->addSigil('has-tooltip')
           ->setMetadata(
             array(
diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
index 7f55f94d71..4058dcca26 100644
--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
@@ -832,13 +832,11 @@ final class DiffusionBrowseController extends DiffusionController {
     $editor_link = $user->loadEditorLink($path, $line, $repository);
     $template = $user->loadEditorLink($path, '%l', $repository);
 
-    $icon_edit = id(new PHUIIconView())
-      ->setIconFont('fa-pencil');
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setText(pht('Open in Editor'))
       ->setHref($editor_link)
-      ->setIcon($icon_edit)
+      ->setIcon('fa-pencil')
       ->setID('editor_link')
       ->setMetadata(array('link_template' => $template))
       ->setDisabled(!$editor_link);
@@ -860,13 +858,11 @@ final class DiffusionBrowseController extends DiffusionController {
       $icon = 'fa-file-text';
     }
 
-    $iconview = id(new PHUIIconView())
-      ->setIconFont($icon);
     $button = id(new PHUIButtonView())
       ->setTag('a')
       ->setText($text)
       ->setHref($href)
-      ->setIcon($iconview);
+      ->setIcon($icon);
 
     return $button;
   }
diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
index 218a8e3d44..efa3104a92 100644
--- a/src/applications/diffusion/controller/DiffusionCommitController.php
+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
@@ -221,14 +221,12 @@ final class DiffusionCommitController extends DiffusionController {
       $change_panel->setID('toc');
 
       if ($count > self::CHANGES_LIMIT && !$show_all_details) {
-        $icon = id(new PHUIIconView())
-          ->setIconFont('fa-files-o');
 
         $button = id(new PHUIButtonView())
           ->setText(pht('Show All Changes'))
           ->setHref('?show_all=true')
           ->setTag('a')
-          ->setIcon($icon);
+          ->setIcon('fa-files-o');
 
         $warning_view = id(new PHUIInfoView())
           ->setSeverity(PHUIInfoView::SEVERITY_WARNING)
diff --git a/src/applications/diffusion/controller/DiffusionRepositoryController.php b/src/applications/diffusion/controller/DiffusionRepositoryController.php
index 9fc948d19a..18989818b6 100644
--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
@@ -390,13 +390,10 @@ final class DiffusionRepositoryController extends DiffusionController {
       $header->setSubHeader(pht('Showing %d branches.', $limit));
     }
 
-    $icon = id(new PHUIIconView())
-      ->setIconFont('fa-code-fork');
-
     $button = new PHUIButtonView();
     $button->setText(pht('Show All Branches'));
     $button->setTag('a');
-    $button->setIcon($icon);
+    $button->setIcon('fa-code-fork');
     $button->setHref($drequest->generateURI(
       array(
         'action' => 'branches',
@@ -462,13 +459,10 @@ final class DiffusionRepositoryController extends DiffusionController {
         pht('Showing the %d most recent tags.', $tag_limit));
     }
 
-    $icon = id(new PHUIIconView())
-      ->setIconFont('fa-tag');
-
     $button = new PHUIButtonView();
     $button->setText(pht('Show All Tags'));
     $button->setTag('a');
-    $button->setIcon($icon);
+    $button->setIcon('fa-tag');
     $button->setHref($drequest->generateURI(
       array(
         'action' => 'tags',
@@ -557,7 +551,7 @@ final class DiffusionRepositoryController extends DiffusionController {
     $history_table->setIsHead(true);
 
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-list-alt');
+      ->setIcon('fa-list-alt');
 
     $button = id(new PHUIButtonView())
       ->setText(pht('View Full History'))
@@ -620,7 +614,7 @@ final class DiffusionRepositoryController extends DiffusionController {
       ->setHeader(pht('Repository'));
 
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-folder-open');
+      ->setIcon('fa-folder-open');
 
     $button = new PHUIButtonView();
     $button->setText(pht('Browse Repository'));
diff --git a/src/applications/diffusion/view/DiffusionBranchTableView.php b/src/applications/diffusion/view/DiffusionBranchTableView.php
index 0f4594e576..462f296bcb 100644
--- a/src/applications/diffusion/view/DiffusionBranchTableView.php
+++ b/src/applications/diffusion/view/DiffusionBranchTableView.php
@@ -81,7 +81,7 @@ final class DiffusionBranchTableView extends DiffusionView {
       }
 
       $status_icon = id(new PHUIIconView())
-        ->setIconFont($icon)
+        ->setIcon($icon)
         ->addSigil('has-tooltip')
         ->setHref($doc_href)
         ->setMetadata(
diff --git a/src/applications/diffusion/view/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php
index 74de704dc3..331c172866 100644
--- a/src/applications/diffusion/view/DiffusionView.php
+++ b/src/applications/diffusion/view/DiffusionView.php
@@ -55,7 +55,7 @@ abstract class DiffusionView extends AphrontView {
           'align' => 'E',
         ),
       ),
-      id(new PHUIIconView())->setIconFont('fa-history bluegrey'));
+      id(new PHUIIconView())->setIcon('fa-history bluegrey'));
   }
 
   final public function linkBrowse($path, array $details = array()) {
@@ -95,7 +95,7 @@ abstract class DiffusionView extends AphrontView {
     }
 
     $icon = DifferentialChangeType::getIconForFileType($file_type);
-    $icon_view = id(new PHUIIconView())->setIconFont("{$icon} blue");
+    $icon_view = id(new PHUIIconView())->setIcon($icon);
 
     // If we're rendering a file or directory name, don't show the tooltip.
     if ($display_name !== null) {
@@ -183,7 +183,7 @@ abstract class DiffusionView extends AphrontView {
     $name = HarbormasterBuildable::getBuildableStatusName($status);
 
     $icon_view = id(new PHUIIconView())
-      ->setIconFont($icon.' '.$color);
+      ->setIcon($icon.' '.$color);
 
     $tooltip_view = javelin_tag(
       'span',
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
index ebaf559775..0c84955b2f 100644
--- a/src/applications/diviner/controller/DivinerBookController.php
+++ b/src/applications/diviner/controller/DivinerBookController.php
@@ -33,7 +33,7 @@ final class DivinerBookController extends DivinerController {
       ->setTag('a')
       ->setText(pht('Actions'))
       ->setHref('#')
-      ->setIconFont('fa-bars')
+      ->setIcon('fa-bars')
       ->addClass('phui-mobile-menu')
       ->setDropdownMenu($actions);
 
diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php
index 3050199c8a..97149778c1 100644
--- a/src/applications/diviner/controller/DivinerMainController.php
+++ b/src/applications/diviner/controller/DivinerMainController.php
@@ -17,14 +17,11 @@ final class DivinerMainController extends DivinerController {
     $crumbs->setBorder(true);
     $crumbs->addTextCrumb(pht('Books'));
 
-    $search_icon = id(new PHUIIconView())
-      ->setIconFont('fa-search');
-
     $query_button = id(new PHUIButtonView())
       ->setTag('a')
       ->setHref($this->getApplicationURI('query/'))
       ->setText(pht('Advanced Search'))
-      ->setIcon($search_icon);
+      ->setIcon('fa-search');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Documentation Books'))
diff --git a/src/applications/drydock/controller/DrydockBlueprintViewController.php b/src/applications/drydock/controller/DrydockBlueprintViewController.php
index 2566c69840..b23b869fd4 100644
--- a/src/applications/drydock/controller/DrydockBlueprintViewController.php
+++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php
@@ -168,7 +168,7 @@ final class DrydockBlueprintViewController extends DrydockBlueprintController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($resources_uri)
-          ->setIconFont('fa-search')
+          ->setIcon('fa-search')
           ->setText(pht('View All')));
 
     return id(new PHUIObjectBoxView())
@@ -233,7 +233,7 @@ final class DrydockBlueprintViewController extends DrydockBlueprintController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($authorizations_uri)
-          ->setIconFont('fa-search')
+          ->setIcon('fa-search')
           ->setText(pht('View All')));
 
     return id(new PHUIObjectBoxView())
diff --git a/src/applications/drydock/controller/DrydockController.php b/src/applications/drydock/controller/DrydockController.php
index ddb6788fb6..17b8d34916 100644
--- a/src/applications/drydock/controller/DrydockController.php
+++ b/src/applications/drydock/controller/DrydockController.php
@@ -39,9 +39,9 @@ abstract class DrydockController extends PhabricatorController {
       ->execute();
 
     $consumed_yes = id(new PHUIIconView())
-      ->setIconFont('fa-check green');
+      ->setIcon('fa-check green');
     $consumed_no = id(new PHUIIconView())
-      ->setIconFont('fa-clock-o grey');
+      ->setIcon('fa-clock-o grey');
 
     $rows = array();
     foreach ($commands as $command) {
@@ -98,7 +98,7 @@ abstract class DrydockController extends PhabricatorController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($all_uri)
-          ->setIconFont('fa-search')
+          ->setIcon('fa-search')
           ->setText(pht('View All')));
 
     return id(new PHUIObjectBoxView())
diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php
index d392796f57..61319fbdbc 100644
--- a/src/applications/drydock/controller/DrydockResourceViewController.php
+++ b/src/applications/drydock/controller/DrydockResourceViewController.php
@@ -168,7 +168,7 @@ final class DrydockResourceViewController extends DrydockResourceController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($leases_uri)
-          ->setIconFont('fa-search')
+          ->setIcon('fa-search')
           ->setText(pht('View All')));
 
     $lease_list = id(new DrydockLeaseListView())
diff --git a/src/applications/drydock/view/DrydockLogListView.php b/src/applications/drydock/view/DrydockLogListView.php
index 4e1fe664cd..845457f9bc 100644
--- a/src/applications/drydock/view/DrydockLogListView.php
+++ b/src/applications/drydock/view/DrydockLogListView.php
@@ -71,7 +71,7 @@ final class DrydockLogListView extends AphrontView {
         $blueprint,
         $resource,
         $lease,
-        id(new PHUIIconView())->setIconFont($icon),
+        id(new PHUIIconView())->setIcon($icon),
         $type,
         $data,
         phabricator_datetime($log->getEpoch(), $viewer),
diff --git a/src/applications/files/controller/PhabricatorFileComposeController.php b/src/applications/files/controller/PhabricatorFileComposeController.php
index f589617696..1eaafdbad0 100644
--- a/src/applications/files/controller/PhabricatorFileComposeController.php
+++ b/src/applications/files/controller/PhabricatorFileComposeController.php
@@ -110,7 +110,7 @@ final class PhabricatorFileComposeController
           ),
         ),
         id(new PHUIIconView())
-          ->setIconFont($icon)
+          ->setIcon($icon)
           ->addClass('compose-icon-bg'));
     }
 
@@ -122,7 +122,7 @@ final class PhabricatorFileComposeController
     $preview = id(new PHUIIconView())
       ->setID($preview_id)
       ->addClass('compose-background-'.$value_color)
-      ->setIconFont($value_icon)
+      ->setIcon($value_icon)
       ->addClass('compose-icon-bg');
 
     $color_input = javelin_tag(
diff --git a/src/applications/files/controller/PhabricatorFileIconSetSelectController.php b/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
index ed7d18a5ee..1bd14d29d0 100644
--- a/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
+++ b/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
@@ -35,7 +35,7 @@ final class PhabricatorFileIconSetSelectController
       $label = $icon->getLabel();
 
       $view = id(new PHUIIconView())
-        ->setIconFont($icon->getIcon());
+        ->setIcon($icon->getIcon());
 
       $classes = array();
       $classes[] = 'icon-button';
diff --git a/src/applications/files/iconset/PhabricatorIconSet.php b/src/applications/files/iconset/PhabricatorIconSet.php
index ad8ac4b381..baf5422375 100644
--- a/src/applications/files/iconset/PhabricatorIconSet.php
+++ b/src/applications/files/iconset/PhabricatorIconSet.php
@@ -49,7 +49,7 @@ abstract class PhabricatorIconSet
       'span',
       array(),
       array(
-        id(new PHUIIconView())->setIconFont($icon->getIcon()),
+        id(new PHUIIconView())->setIcon($icon->getIcon()),
         ' ',
         $icon->getLabel(),
       ));
diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
index 300cb79f23..f9a0807ab1 100644
--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
@@ -311,7 +311,7 @@ final class HarbormasterBuildableViewController
           id(new PHUIButtonView())
             ->setTag('a')
             ->setHref($lint_href)
-            ->setIconFont('fa-list-ul')
+            ->setIcon('fa-list-ul')
             ->setText('View All'));
 
       $lint = id(new PHUIObjectBoxView())
@@ -335,7 +335,7 @@ final class HarbormasterBuildableViewController
           id(new PHUIButtonView())
             ->setTag('a')
             ->setHref($unit_href)
-            ->setIconFont('fa-list-ul')
+            ->setIcon('fa-list-ul')
             ->setText('View All'));
 
       $unit = id(new PHUIObjectBoxView())
diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
index e306eaef7c..ed1381006b 100644
--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
@@ -202,9 +202,7 @@ final class HarbormasterPlanViewController extends HarbormasterPlanController {
           ->setText(pht('Add Build Step'))
           ->setHref($this->getApplicationURI("step/add/{$plan_id}/"))
           ->setTag('a')
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-plus'))
+          ->setIcon('fa-plus')
           ->setDisabled(!$can_edit)
           ->setWorkflow(!$can_edit));
 
diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
index c7239438c6..bd6d4953da 100644
--- a/src/applications/herald/adapter/HeraldAdapter.php
+++ b/src/applications/herald/adapter/HeraldAdapter.php
@@ -830,7 +830,7 @@ abstract class HeraldAdapter extends Phobject {
     require_celerity_resource('herald-css');
 
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-chevron-circle-right lightgreytext')
+      ->setIcon('fa-chevron-circle-right lightgreytext')
       ->addClass('herald-list-icon');
 
     if ($rule->getMustMatchAll()) {
diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
index 9d604cf0d6..1b8557fc7f 100644
--- a/src/applications/home/controller/PhabricatorHomeMainController.php
+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
@@ -318,7 +318,7 @@ final class PhabricatorHomeMainController extends PhabricatorHomeController {
       ),
       $title);
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-search')
+      ->setIcon('fa-search')
       ->setHref($href);
     $header = id(new PHUIHeaderView())
       ->setHeader($title)
diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
index ac24efbb5a..2221ae4499 100644
--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
@@ -250,9 +250,7 @@ final class LegalpadDocumentSignController extends LegalpadController {
       ->addActionLink(
         id(new PHUIButtonView())
           ->setTag('a')
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-pencil'))
+          ->setIcon('fa-pencil')
           ->setText(pht('Manage'))
           ->setHref($manage_uri)
           ->setDisabled(!$can_edit)
diff --git a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
index 2d94b23193..5e562a06c7 100644
--- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
+++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
@@ -186,7 +186,7 @@ final class LegalpadDocumentSearchEngine
         if ($signature) {
           $item->addAttribute(
             array(
-              id(new PHUIIconView())->setIconFont('fa-check-square-o', 'green'),
+              id(new PHUIIconView())->setIcon('fa-check-square-o', 'green'),
               ' ',
               pht(
                 'Signed on %s',
@@ -195,7 +195,7 @@ final class LegalpadDocumentSearchEngine
         } else {
           $item->addAttribute(
             array(
-              id(new PHUIIconView())->setIconFont('fa-square-o', 'grey'),
+              id(new PHUIIconView())->setIcon('fa-square-o', 'grey'),
               ' ',
               pht('Not Signed'),
             ));
diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
index 6967a21a98..9df8d2478d 100644
--- a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
+++ b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
@@ -183,7 +183,7 @@ final class LegalpadDocumentSignatureSearchEngine
       pht('Exemption'));
 
     id(new PHUIIconView())
-      ->setIconFont('fa-envelope', 'red')
+      ->setIcon('fa-envelope', 'red')
       ->addSigil('has-tooltip')
       ->setMetadata(array('tip' => pht('Unverified Email')));
 
@@ -276,7 +276,7 @@ final class LegalpadDocumentSignatureSearchEngine
           ->setTag('a')
           ->setHref($this->getApplicationURI('addsignature/'.$document_id.'/'))
           ->setWorkflow(true)
-          ->setIcon(id(new PHUIIconView())->setIconFont('fa-pencil'));
+          ->setIcon('fa-pencil');
     }
 
     if (!$this->document) {
@@ -300,7 +300,7 @@ final class LegalpadDocumentSignatureSearchEngine
 
     return array(
       id(new PHUIIconView())
-        ->setIconFont($icon, $color)
+        ->setIcon($icon, $color)
         ->addSigil('has-tooltip')
         ->setMetadata(array('tip' => $title)),
       javelin_tag(
diff --git a/src/applications/macro/markup/PhabricatorIconRemarkupRule.php b/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
index acd87d4136..fe0c4f60b2 100644
--- a/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
+++ b/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
@@ -80,7 +80,7 @@ final class PhabricatorIconRemarkupRule extends PhutilRemarkupRule {
     }
 
     $icon_view = id(new PHUIIconView())
-      ->setIconFont('fa-'.$icon, implode(' ', $classes));
+      ->setIcon('fa-'.$icon, implode(' ', $classes));
 
     return $this->getEngine()->storeText($icon_view);
   }
diff --git a/src/applications/maniphest/constants/ManiphestTaskStatus.php b/src/applications/maniphest/constants/ManiphestTaskStatus.php
index 5efc2ea56c..ab99f212e5 100644
--- a/src/applications/maniphest/constants/ManiphestTaskStatus.php
+++ b/src/applications/maniphest/constants/ManiphestTaskStatus.php
@@ -94,7 +94,7 @@ final class ManiphestTaskStatus extends ManiphestConstants {
     $icon = self::getStatusIcon($status);
 
     $img = id(new PHUIIconView())
-      ->setIconFont($icon.' '.$icon_color);
+      ->setIcon($icon.' '.$icon_color);
 
     $tag = phutil_tag(
       'span',
diff --git a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
index ba03603071..1899ac1be1 100644
--- a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
+++ b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
@@ -29,9 +29,7 @@ final class PhabricatorMetaMTAApplicationEmailPanel
         id(new PHUIButtonView())
           ->setTag('a')
           ->setText(pht('Edit Application Emails'))
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-pencil'))
+          ->setIcon('fa-pencil')
           ->setHref($this->getPanelURI())
           ->setDisabled(!$can_edit)
           ->setWorkflow(!$can_edit));
@@ -89,7 +87,7 @@ final class PhabricatorMetaMTAApplicationEmailPanel
       ->setSubheader($application->getAppEmailBlurb());
 
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-plus');
+      ->setIcon('fa-plus');
     $button = new PHUIButtonView();
     $button->setText(pht('Add New Address'));
     $button->setTag('a');
diff --git a/src/applications/notification/controller/PhabricatorNotificationStatusController.php b/src/applications/notification/controller/PhabricatorNotificationStatusController.php
index e889c7af5e..eb79a3a8c5 100644
--- a/src/applications/notification/controller/PhabricatorNotificationStatusController.php
+++ b/src/applications/notification/controller/PhabricatorNotificationStatusController.php
@@ -63,7 +63,7 @@ final class PhabricatorNotificationStatusController
       ));
 
     $test_icon = id(new PHUIIconView())
-      ->setIconFont('fa-exclamation-triangle');
+      ->setIcon('fa-exclamation-triangle');
 
     $test_button = id(new PHUIButtonView())
         ->setTag('a')
diff --git a/src/applications/notification/query/PhabricatorNotificationSearchEngine.php b/src/applications/notification/query/PhabricatorNotificationSearchEngine.php
index 8d62372dc3..11b935eb50 100644
--- a/src/applications/notification/query/PhabricatorNotificationSearchEngine.php
+++ b/src/applications/notification/query/PhabricatorNotificationSearchEngine.php
@@ -85,7 +85,7 @@ final class PhabricatorNotificationSearchEngine
     $viewer = $this->requireViewer();
 
     $image = id(new PHUIIconView())
-      ->setIconFont('fa-eye-slash');
+      ->setIcon('fa-eye-slash');
 
     $button = id(new PHUIButtonView())
       ->setTag('a')
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
index aca259abb0..0a2e4fd612 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
@@ -28,7 +28,7 @@ final class PhabricatorPeopleProfileManageController
 
     $profile_icon = PhabricatorPeopleIconSet::getIconIcon($profile->getIcon());
     $profile_icon = id(new PHUIIconView())
-      ->setIconFont($profile_icon);
+      ->setIcon($profile_icon);
     $profile_title = $profile->getDisplayTitle();
 
     $header = id(new PHUIHeaderView())
diff --git a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
index 90ad86bfef..1453ab7d71 100644
--- a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
+++ b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
@@ -29,7 +29,7 @@ final class PhabricatorPeopleProfileViewController
 
     $profile_icon = PhabricatorPeopleIconSet::getIconIcon($profile->getIcon());
     $profile_icon = id(new PHUIIconView())
-      ->setIconFont($profile_icon);
+      ->setIcon($profile_icon);
     $profile_title = $profile->getDisplayTitle();
 
     $header = id(new PHUIHeaderView())
diff --git a/src/applications/phame/controller/PhameHomeController.php b/src/applications/phame/controller/PhameHomeController.php
index 4028f98e50..b9c7fc76d8 100644
--- a/src/applications/phame/controller/PhameHomeController.php
+++ b/src/applications/phame/controller/PhameHomeController.php
@@ -60,7 +60,7 @@ final class PhameHomeController extends PhamePostController {
       ->setTag('a')
       ->setText(pht('Actions'))
       ->setHref('#')
-      ->setIconFont('fa-bars')
+      ->setIcon('fa-bars')
       ->addClass('phui-mobile-menu')
       ->setDropdownMenu($actions);
 
diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php
index c387152019..60972c57b8 100644
--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
@@ -48,7 +48,7 @@ final class PhameBlogViewController extends PhameLiveController {
         ->setTag('a')
         ->setText(pht('Actions'))
         ->setHref('#')
-        ->setIconFont('fa-bars')
+        ->setIcon('fa-bars')
         ->addClass('phui-mobile-menu')
         ->setDropdownMenu($actions);
 
diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php
index 6a0ceace4f..68c9f22082 100644
--- a/src/applications/phame/controller/post/PhamePostViewController.php
+++ b/src/applications/phame/controller/post/PhamePostViewController.php
@@ -29,7 +29,7 @@ final class PhamePostViewController
         ->setTag('a')
         ->setText(pht('Actions'))
         ->setHref('#')
-        ->setIconFont('fa-bars')
+        ->setIcon('fa-bars')
         ->addClass('phui-mobile-menu')
         ->setDropdownMenu($actions);
 
diff --git a/src/applications/phame/view/PhameBlogListView.php b/src/applications/phame/view/PhameBlogListView.php
index ae936442b0..f2149b8cfb 100644
--- a/src/applications/phame/view/PhameBlogListView.php
+++ b/src/applications/phame/view/PhameBlogListView.php
@@ -45,7 +45,7 @@ final class PhameBlogListView extends AphrontTagView {
         $blog->getName());
 
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-plus-square')
+        ->setIcon('fa-plus-square')
         ->addClass('phame-blog-list-icon');
 
       $add_new = phutil_tag(
diff --git a/src/applications/phame/view/PhameDraftListView.php b/src/applications/phame/view/PhameDraftListView.php
index 68bb56cabf..87c5a6d7b5 100644
--- a/src/applications/phame/view/PhameDraftListView.php
+++ b/src/applications/phame/view/PhameDraftListView.php
@@ -53,7 +53,7 @@ final class PhameDraftListView extends AphrontTagView {
         $post->getTitle());
 
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-pencil-square-o')
+        ->setIcon('fa-pencil-square-o')
         ->addClass('phame-blog-list-icon');
 
       $edit = phutil_tag(
diff --git a/src/applications/phame/view/PhameNextPostView.php b/src/applications/phame/view/PhameNextPostView.php
index 87f4f7aa1a..beabcd6d72 100644
--- a/src/applications/phame/view/PhameNextPostView.php
+++ b/src/applications/phame/view/PhameNextPostView.php
@@ -30,7 +30,7 @@ final class PhameNextPostView extends AphrontTagView {
     require_celerity_resource('phame-css');
 
     $p_icon = id(new PHUIIconView())
-      ->setIconFont('fa-angle-left');
+      ->setIcon('fa-angle-left');
 
     $previous_icon = phutil_tag(
       'div',
@@ -69,7 +69,7 @@ final class PhameNextPostView extends AphrontTagView {
     }
 
     $n_icon = id(new PHUIIconView())
-      ->setIconFont('fa-angle-right');
+      ->setIcon('fa-angle-right');
 
     $next_icon = phutil_tag(
       'div',
diff --git a/src/applications/phid/PhabricatorObjectHandle.php b/src/applications/phid/PhabricatorObjectHandle.php
index e7245e3d02..e49094e311 100644
--- a/src/applications/phid/PhabricatorObjectHandle.php
+++ b/src/applications/phid/PhabricatorObjectHandle.php
@@ -299,7 +299,7 @@ final class PhabricatorObjectHandle
     $icon = null;
     if ($this->getPolicyFiltered()) {
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-lock lightgreytext');
+        ->setIcon('fa-lock lightgreytext');
     }
 
     $attributes = $attributes + array(
diff --git a/src/applications/pholio/view/PholioMockImagesView.php b/src/applications/pholio/view/PholioMockImagesView.php
index 8430ada3d4..d50dfb3b3a 100644
--- a/src/applications/pholio/view/PholioMockImagesView.php
+++ b/src/applications/pholio/view/PholioMockImagesView.php
@@ -126,12 +126,12 @@ final class PholioMockImagesView extends AphrontView {
 
     $full_icon = array(
       javelin_tag('span', array('aural' => true), pht('View Raw File')),
-      id(new PHUIIconView())->setIconFont('fa-file-image-o'),
+      id(new PHUIIconView())->setIcon('fa-file-image-o'),
     );
 
     $download_icon = array(
       javelin_tag('span', array('aural' => true), pht('Download File')),
-      id(new PHUIIconView())->setIconFont('fa-download'),
+      id(new PHUIIconView())->setIcon('fa-download'),
     );
 
     $login_uri = id(new PhutilURI('/login/'))
diff --git a/src/applications/pholio/view/PholioTransactionView.php b/src/applications/pholio/view/PholioTransactionView.php
index 7fad6bff9a..92624feec6 100644
--- a/src/applications/pholio/view/PholioTransactionView.php
+++ b/src/applications/pholio/view/PholioTransactionView.php
@@ -73,7 +73,7 @@ final class PholioTransactionView
 
     if ($inlines) {
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-comment bluegrey msr');
+        ->setIcon('fa-comment bluegrey msr');
       $header = phutil_tag(
         'div',
         array(
diff --git a/src/applications/phortune/controller/PhortuneAccountListController.php b/src/applications/phortune/controller/PhortuneAccountListController.php
index 0de082fa01..9b095186cc 100644
--- a/src/applications/phortune/controller/PhortuneAccountListController.php
+++ b/src/applications/phortune/controller/PhortuneAccountListController.php
@@ -48,9 +48,7 @@ final class PhortuneAccountListController extends PhortuneController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($this->getApplicationURI('account/edit/'))
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-plus'))
+          ->setIcon('fa-plus')
           ->setText(pht('Create Account')));
 
     $payment_box = id(new PHUIObjectBoxView())
@@ -80,9 +78,7 @@ final class PhortuneAccountListController extends PhortuneController {
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref($this->getApplicationURI('merchant/'))
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-list'))
+          ->setIcon('fa-list')
           ->setText(pht('View All Merchants')));
 
     $merchant_box = id(new PHUIObjectBoxView())
diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php
index b5387b935e..001db3bebc 100644
--- a/src/applications/phortune/controller/PhortuneAccountViewController.php
+++ b/src/applications/phortune/controller/PhortuneAccountViewController.php
@@ -254,9 +254,7 @@ final class PhortuneAccountViewController extends PhortuneController {
       ->addActionLink(
         id(new PHUIButtonView())
           ->setTag('a')
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-list'))
+          ->setIcon('fa-list')
           ->setHref($orders_uri)
           ->setText(pht('View All Orders')));
 
@@ -298,9 +296,7 @@ final class PhortuneAccountViewController extends PhortuneController {
       ->addActionLink(
         id(new PHUIButtonView())
           ->setTag('a')
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-list'))
+          ->setIcon('fa-list')
           ->setHref($charges_uri)
           ->setText(pht('View All Charges')));
 
@@ -336,7 +332,7 @@ final class PhortuneAccountViewController extends PhortuneController {
           ->setTag('a')
           ->setIcon(
             id(new PHUIIconView())
-              ->setIconFont('fa-list'))
+              ->setIcon('fa-list'))
           ->setHref($subscriptions_uri)
           ->setText(pht('View All Subscriptions')));
 
diff --git a/src/applications/phortune/controller/PhortuneCartViewController.php b/src/applications/phortune/controller/PhortuneCartViewController.php
index 67f7c3df01..3beaa657c6 100644
--- a/src/applications/phortune/controller/PhortuneCartViewController.php
+++ b/src/applications/phortune/controller/PhortuneCartViewController.php
@@ -132,8 +132,7 @@ final class PhortuneCartViewController
           id(new PHUIButtonView())
             ->setTag('a')
             ->setHref($done_uri)
-            ->setIcon(id(new PHUIIconView())
-              ->setIconFont('fa-check-square green'))
+            ->setIcon('fa-check-square green')
             ->setText($cart->getDoneActionName()));
       }
     }
diff --git a/src/applications/phortune/controller/PhortuneMerchantViewController.php b/src/applications/phortune/controller/PhortuneMerchantViewController.php
index 4bedbd9e9c..55bb136dab 100644
--- a/src/applications/phortune/controller/PhortuneMerchantViewController.php
+++ b/src/applications/phortune/controller/PhortuneMerchantViewController.php
@@ -279,7 +279,7 @@ final class PhortuneMerchantViewController
       ->setText(pht('Add Payment Provider'))
       ->setDisabled(!$can_edit)
       ->setWorkflow(!$can_edit)
-      ->setIcon(id(new PHUIIconView())->setIconFont('fa-plus'));
+      ->setIcon('fa-plus');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Payment Providers'))
diff --git a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
index 8804499056..8ecc97c301 100644
--- a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
+++ b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
@@ -193,9 +193,7 @@ final class PhortuneSubscriptionViewController extends PhortuneController {
       ->addActionLink(
         id(new PHUIButtonView())
           ->setTag('a')
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-list'))
+          ->setIcon('fa-list')
           ->setHref($invoices_uri)
           ->setText(pht('View All Invoices')));
 
diff --git a/src/applications/phortune/view/PhortuneCreditCardForm.php b/src/applications/phortune/view/PhortuneCreditCardForm.php
index 6e4e2af38b..afd64075ea 100644
--- a/src/applications/phortune/view/PhortuneCreditCardForm.php
+++ b/src/applications/phortune/view/PhortuneCreditCardForm.php
@@ -107,7 +107,7 @@ final class PhortuneCreditCardForm extends Phobject {
         ),
         array(
           id(new PHUIIconView())
-            ->setIconFont('fa-lock grey'),
+            ->setIcon('fa-lock grey'),
           ' ',
           $assurance,
         ));
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
index d7db7f6548..7d98e9ed3b 100644
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -207,7 +207,7 @@ final class PhrictionDocumentController
       ->setTag('a')
       ->setText(pht('Actions'))
       ->setHref('#')
-      ->setIconFont('fa-bars')
+      ->setIcon('fa-bars')
       ->addClass('phui-mobile-menu')
       ->setDropdownMenu($actions);
 
diff --git a/src/applications/policy/storage/PhabricatorPolicy.php b/src/applications/policy/storage/PhabricatorPolicy.php
index 93afb35dc9..f2bfb8ce48 100644
--- a/src/applications/policy/storage/PhabricatorPolicy.php
+++ b/src/applications/policy/storage/PhabricatorPolicy.php
@@ -274,7 +274,7 @@ final class PhabricatorPolicy
     $img = null;
     if ($icon) {
       $img = id(new PHUIIconView())
-        ->setIconFont($this->getIcon());
+        ->setIcon($this->getIcon());
     }
 
     if ($this->getHref()) {
diff --git a/src/applications/ponder/view/PonderAnswerView.php b/src/applications/ponder/view/PonderAnswerView.php
index 3951aa84a7..c0e90f7eca 100644
--- a/src/applications/ponder/view/PonderAnswerView.php
+++ b/src/applications/ponder/view/PonderAnswerView.php
@@ -74,7 +74,7 @@ final class PonderAnswerView extends AphrontTagView {
       ->setTag('a')
       ->setText(pht('Actions'))
       ->setHref('#')
-      ->setIconFont('fa-bars')
+      ->setIcon('fa-bars')
       ->setDropdownMenu($actions);
 
     $header_name = phutil_tag(
@@ -116,7 +116,7 @@ final class PonderAnswerView extends AphrontTagView {
       $vote_class = 'ponder-footer-action-helpful';
     }
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-thumbs-up msr');
+      ->setIcon('fa-thumbs-up msr');
     $helpful = phutil_tag(
       'span',
       array(
diff --git a/src/applications/ponder/view/PonderFooterView.php b/src/applications/ponder/view/PonderFooterView.php
index 26e35ec45a..be33863a9a 100644
--- a/src/applications/ponder/view/PonderFooterView.php
+++ b/src/applications/ponder/view/PonderFooterView.php
@@ -37,11 +37,11 @@ final class PonderFooterView extends AphrontTagView {
 
     if ($this->count == 0) {
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-comments msr');
+        ->setIcon('fa-comments msr');
       $text = pht('Add a Comment');
     } else {
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-comments msr');
+        ->setIcon('fa-comments msr');
       $text = pht('Show %d Comment(s)', new PhutilNumber($this->count));
     }
 
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index 2957ba47ed..4d83ca6fa3 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -405,7 +405,7 @@ final class PhabricatorProjectBoardViewController
     $sort_key) {
 
     $sort_icon = id(new PHUIIconView())
-      ->setIconFont('fa-sort-amount-asc bluegrey');
+      ->setIcon('fa-sort-amount-asc bluegrey');
 
     $named = array(
       PhabricatorProjectColumn::ORDER_NATURAL => pht('Natural'),
@@ -675,7 +675,7 @@ final class PhabricatorProjectBoardViewController
     }
 
     $column_button = id(new PHUIIconView())
-      ->setIconFont('fa-caret-down')
+      ->setIcon('fa-caret-down')
       ->setHref('#')
       ->addSigil('boards-dropdown-menu')
       ->setMetadata(
diff --git a/src/applications/project/controller/PhabricatorProjectMilestonesController.php b/src/applications/project/controller/PhabricatorProjectMilestonesController.php
index 595035bdb7..ebbe5bc2e3 100644
--- a/src/applications/project/controller/PhabricatorProjectMilestonesController.php
+++ b/src/applications/project/controller/PhabricatorProjectMilestonesController.php
@@ -50,7 +50,7 @@ final class PhabricatorProjectMilestonesController
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref("/project/edit/?milestone={$id}")
-          ->setIconFont('fa-plus')
+          ->setIcon('fa-plus')
           ->setDisabled(!$can_create)
           ->setWorkflow(!$can_create)
           ->setText($button_text));
diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php
index 1ee02debac..c03b82b05d 100644
--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
@@ -166,7 +166,7 @@ final class PhabricatorProjectProfileController
     }
 
     $watch_icon = id(new PHUIIconView())
-      ->setIconFont($watch_icon);
+      ->setIcon($watch_icon);
 
     return id(new PHUIButtonView())
       ->setTag('a')
diff --git a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
index e512d12a6e..a88bf7d07c 100644
--- a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
+++ b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
@@ -50,7 +50,7 @@ final class PhabricatorProjectSubprojectsController
         id(new PHUIButtonView())
           ->setTag('a')
           ->setHref("/project/edit/?parent={$id}")
-          ->setIconFont('fa-plus')
+          ->setIcon('fa-plus')
           ->setDisabled(!$can_create)
           ->setWorkflow(!$can_create)
           ->setText($button_text));
diff --git a/src/applications/project/query/PhabricatorProjectSearchEngine.php b/src/applications/project/query/PhabricatorProjectSearchEngine.php
index 7d533c8a11..4a29034ba6 100644
--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
@@ -137,7 +137,7 @@ final class PhabricatorProjectSearchEngine
 
       $options[$icon->getKey()] = array(
         id(new PHUIIconView())
-          ->setIconFont($icon->getIcon()),
+          ->setIcon($icon->getIcon()),
         ' ',
         $icon->getLabel(),
       );
diff --git a/src/applications/project/view/PhabricatorProjectListView.php b/src/applications/project/view/PhabricatorProjectListView.php
index 87874e3594..3d6044f2b1 100644
--- a/src/applications/project/view/PhabricatorProjectListView.php
+++ b/src/applications/project/view/PhabricatorProjectListView.php
@@ -29,7 +29,7 @@ final class PhabricatorProjectListView extends AphrontView {
       $color = $project->getColor();
 
       $icon_icon = id(new PHUIIconView())
-        ->setIconFont("{$icon} {$color}");
+        ->setIcon("{$icon} {$color}");
 
       $icon_name = $project->getDisplayIconName();
 
diff --git a/src/applications/project/view/PhabricatorProjectUserListView.php b/src/applications/project/view/PhabricatorProjectUserListView.php
index 58c9a4ae0e..715e28f944 100644
--- a/src/applications/project/view/PhabricatorProjectUserListView.php
+++ b/src/applications/project/view/PhabricatorProjectUserListView.php
@@ -86,7 +86,7 @@ abstract class PhabricatorProjectUserListView extends AphrontView {
         ->setImageURI($handle->getImageURI());
 
       $icon = id(new PHUIIconView())
-        ->setIconFont($handle->getIcon().' lightbluetext');
+        ->setIcon($handle->getIcon().' lightbluetext');
 
       $subtitle = $handle->getSubtitle();
 
@@ -126,7 +126,7 @@ abstract class PhabricatorProjectUserListView extends AphrontView {
           ->setTag('a')
           ->setIcon(
             id(new PHUIIconView())
-              ->setIconFont('fa-list-ul'))
+              ->setIcon('fa-list-ul'))
           ->setText(pht('View All'))
           ->setHref("/project/members/{$id}/"));
     }
diff --git a/src/applications/search/engine/PhabricatorProfilePanelEngine.php b/src/applications/search/engine/PhabricatorProfilePanelEngine.php
index 0910c8f74b..09307cd340 100644
--- a/src/applications/search/engine/PhabricatorProfilePanelEngine.php
+++ b/src/applications/search/engine/PhabricatorProfilePanelEngine.php
@@ -401,7 +401,7 @@ abstract class PhabricatorProfilePanelEngine extends Phobject {
     $collapse_icon = id(new PHUIIconCircleView())
       ->addClass('phui-list-item-icon')
       ->addClass('phui-profile-menu-visible-when-expanded')
-      ->setIconFont('fa-chevron-left');
+      ->setIcon('fa-chevron-left');
 
     $expand_icon = id(new PHUIIconCircleView())
       ->addClass('phui-list-item-icon')
@@ -412,7 +412,7 @@ abstract class PhabricatorProfilePanelEngine extends Phobject {
           'tip' => pht('Expand'),
           'align' => 'E',
         ))
-      ->setIconFont('fa-chevron-right');
+      ->setIcon('fa-chevron-right');
 
     $items[] = id(new PHUIListItemView())
       ->setName('Collapse')
@@ -658,7 +658,7 @@ abstract class PhabricatorProfilePanelEngine extends Phobject {
       ->setTag('a')
       ->setText(pht('Configure Menu'))
       ->setHref('#')
-      ->setIconFont('fa-gear')
+      ->setIcon('fa-gear')
       ->setDropdownMenu($action_view);
 
     $header = id(new PHUIHeaderView())
diff --git a/src/applications/search/profilepanel/PhabricatorMotivatorProfilePanel.php b/src/applications/search/profilepanel/PhabricatorMotivatorProfilePanel.php
index 73668fdd41..3537520903 100644
--- a/src/applications/search/profilepanel/PhabricatorMotivatorProfilePanel.php
+++ b/src/applications/search/profilepanel/PhabricatorMotivatorProfilePanel.php
@@ -68,7 +68,7 @@ final class PhabricatorMotivatorProfilePanel
       case 'catfacts':
       default:
         $fact = array(
-          id(new PHUIIconView())->setIconFont('fa-paw'),
+          id(new PHUIIconView())->setIcon('fa-paw'),
           ' ',
           $fact,
         );
diff --git a/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php b/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
index ff1e39577a..bc7538f6bd 100644
--- a/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
@@ -126,14 +126,12 @@ final class PhabricatorDesktopNotificationsSettingsPanel
         id(new AphrontFormSubmitControl())
         ->setValue(pht('Save Preference')));
 
-    $test_icon = id(new PHUIIconView())
-      ->setIconFont('fa-exclamation-triangle');
     $test_button = id(new PHUIButtonView())
       ->setTag('a')
       ->setWorkflow(true)
       ->setText(pht('Send Test Notification'))
       ->setHref('/notification/test/')
-      ->setIcon($test_icon);
+      ->setIcon('fa-exclamation-triangle');
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeader(
diff --git a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
index fa2694848d..464214dc73 100644
--- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
@@ -143,14 +143,11 @@ final class PhabricatorEmailAddressesSettingsPanel
     $header->setHeader(pht('Email Addresses'));
 
     if ($editable) {
-      $icon = id(new PHUIIconView())
-        ->setIconFont('fa-plus');
-
       $button = new PHUIButtonView();
       $button->setText(pht('Add New Address'));
       $button->setTag('a');
       $button->setHref($uri->alter('new', 'true'));
-      $button->setIcon($icon);
+      $button->setIcon('fa-plus');
       $button->addSigil('workflow');
       $header->addActionLink($button);
     }
diff --git a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php
index c18c4c58d1..eabbc3ff32 100644
--- a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php
@@ -182,9 +182,7 @@ final class PhabricatorHomePreferencesSettingsPanel
           ->setText(pht('Pin Application'))
           ->setHref($this->getPanelURI().'?add=true')
           ->setWorkflow(true)
-          ->setIcon(
-            id(new PHUIIconView())
-              ->setIconFont('fa-thumb-tack')));
+          ->setIcon('fa-thumb-tack'));
 
     $box = id(new PHUIObjectBoxView())
       ->setHeader($header)
diff --git a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
index 42d5ac4330..9bcfbba3be 100644
--- a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
@@ -107,22 +107,18 @@ final class PhabricatorMultiFactorSettingsPanel
     $help_uri = PhabricatorEnv::getDoclink(
       'User Guide: Multi-Factor Authentication');
 
-    $help_icon = id(new PHUIIconView())
-      ->setIconFont('fa-info-circle');
     $help_button = id(new PHUIButtonView())
       ->setText(pht('Help'))
       ->setHref($help_uri)
       ->setTag('a')
-      ->setIcon($help_icon);
+      ->setIcon('fa-info-circle');
 
-    $create_icon = id(new PHUIIconView())
-      ->setIconFont('fa-plus');
     $create_button = id(new PHUIButtonView())
       ->setText(pht('Add Authentication Factor'))
       ->setHref($this->getPanelURI('?new=true'))
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($create_icon);
+      ->setIcon('fa-plus');
 
     $header->setHeader(pht('Authentication Factors'));
     $header->addActionLink($help_button);
diff --git a/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php b/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php
index 2fa05914ec..0faf620041 100644
--- a/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php
@@ -44,14 +44,12 @@ final class PhabricatorSSHKeysSettingsPanel extends PhabricatorSettingsPanel {
     $panel = new PHUIObjectBoxView();
     $header = new PHUIHeaderView();
 
-    $upload_icon = id(new PHUIIconView())
-      ->setIconFont('fa-upload');
     $upload_button = id(new PHUIButtonView())
       ->setText(pht('Upload Public Key'))
       ->setHref('/auth/sshkey/upload/?objectPHID='.$user->getPHID())
       ->setWorkflow(true)
       ->setTag('a')
-      ->setIcon($upload_icon);
+      ->setIcon('fa-upload');
 
     try {
       PhabricatorSSHKeyGenerator::assertCanGenerateKeypair();
@@ -60,15 +58,13 @@ final class PhabricatorSSHKeysSettingsPanel extends PhabricatorSettingsPanel {
       $can_generate = false;
     }
 
-    $generate_icon = id(new PHUIIconView())
-      ->setIconFont('fa-lock');
     $generate_button = id(new PHUIButtonView())
       ->setText(pht('Generate Keypair'))
       ->setHref('/auth/sshkey/generate/?objectPHID='.$user->getPHID())
       ->setTag('a')
       ->setWorkflow(true)
       ->setDisabled(!$can_generate)
-      ->setIcon($generate_icon);
+      ->setIcon('fa-lock');
 
     $header->setHeader(pht('SSH Public Keys'));
     $header->addActionLink($generate_button);
diff --git a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
index 8bb6653471..2d38e76225 100644
--- a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
@@ -112,15 +112,12 @@ final class PhabricatorSessionsSettingsPanel extends PhabricatorSettingsPanel {
         'action',
       ));
 
-
-    $terminate_icon = id(new PHUIIconView())
-      ->setIconFont('fa-exclamation-triangle');
     $terminate_button = id(new PHUIButtonView())
       ->setText(pht('Terminate All Sessions'))
       ->setHref('/auth/session/terminate/all/')
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($terminate_icon);
+      ->setIcon('fa-exclamation-triangle');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Active Login Sessions'))
@@ -128,14 +125,12 @@ final class PhabricatorSessionsSettingsPanel extends PhabricatorSettingsPanel {
 
     $hisec = ($viewer->getSession()->getHighSecurityUntil() - time());
     if ($hisec > 0) {
-      $hisec_icon = id(new PHUIIconView())
-        ->setIconFont('fa-lock');
       $hisec_button = id(new PHUIButtonView())
         ->setText(pht('Leave High Security'))
         ->setHref('/auth/session/downgrade/')
         ->setTag('a')
         ->setWorkflow(true)
-        ->setIcon($hisec_icon);
+        ->setIcon('fa-lock');
       $header->addActionLink($hisec_button);
     }
 
diff --git a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
index 9c20e1235f..a92026333a 100644
--- a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
@@ -75,15 +75,12 @@ final class PhabricatorTokensSettingsPanel extends PhabricatorSettingsPanel {
         'action',
       ));
 
-
-    $terminate_icon = id(new PHUIIconView())
-      ->setIconFont('fa-exclamation-triangle');
     $terminate_button = id(new PHUIButtonView())
       ->setText(pht('Revoke All'))
       ->setHref('/auth/token/revoke/all/')
       ->setTag('a')
       ->setWorkflow(true)
-      ->setIcon($terminate_icon);
+      ->setIcon('fa-exclamation-triangle');
 
     $header = id(new PHUIHeaderView())
       ->setHeader(pht('Temporary Tokens'))
diff --git a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
index 6808ed2af5..553bfa3e10 100644
--- a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
+++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
@@ -105,7 +105,7 @@ final class PhabricatorApplicationTransactionValueController
         $icon = 'fa-minus-circle red';
       }
       $icon = id(new PHUIIconView())
-        ->setIconFont($icon)
+        ->setIcon($icon)
         ->setText(
           ucfirst($rule['action']).' '.$rule_object->getRuleDescription());
 
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
index 0fb96e7e19..9efc3c4100 100644
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -1090,7 +1090,7 @@ abstract class PhabricatorEditEngine
       ->setTag('a')
       ->setText(pht('Configure Form'))
       ->setHref('#')
-      ->setIconFont('fa-gear')
+      ->setIcon('fa-gear')
       ->setDropdownMenu($action_view);
 
     return $action_button;
diff --git a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php
index 767e392248..b0abe516de 100644
--- a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php
+++ b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php
@@ -210,8 +210,8 @@ EOTEXT
       $uri,
       $uri);
 
-    $yes = id(new PHUIIconView())->setIconFont('fa-check-circle green');
-    $no = id(new PHUIIconView())->setIconFont('fa-times grey');
+    $yes = id(new PHUIIconView())->setIcon('fa-check-circle green');
+    $no = id(new PHUIIconView())->setIcon('fa-times grey');
 
     $rows = array();
     foreach ($fields as $field) {
diff --git a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
index 9ac5b4bdb2..c20999601e 100644
--- a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
@@ -237,7 +237,7 @@ final class PhabricatorTypeaheadModularDatasourceController
 
           $function_help = array(
             id(new PHUIIconView())
-              ->setIconFont('fa-book'),
+              ->setIcon('fa-book'),
             ' ',
             $reference_link,
           );
diff --git a/src/applications/uiexample/examples/PHUIBoxExample.php b/src/applications/uiexample/examples/PHUIBoxExample.php
index 0467a71e3b..9634520e89 100644
--- a/src/applications/uiexample/examples/PHUIBoxExample.php
+++ b/src/applications/uiexample/examples/PHUIBoxExample.php
@@ -61,12 +61,10 @@ final class PHUIBoxExample extends PhabricatorUIExample {
           ->addMargin(PHUI::MARGIN_LARGE_BOTTOM),
       );
 
-    $image = id(new PHUIIconView())
-          ->setIconFont('fa-heart');
     $button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
-        ->setIcon($image)
+        ->setIcon('fa-heart')
         ->setText(pht('Such Wow'))
         ->addClass(PHUI::MARGIN_SMALL_RIGHT);
 
diff --git a/src/applications/uiexample/examples/PHUIButtonBarExample.php b/src/applications/uiexample/examples/PHUIButtonBarExample.php
index e41234e5bd..1501770dcf 100644
--- a/src/applications/uiexample/examples/PHUIButtonBarExample.php
+++ b/src/applications/uiexample/examples/PHUIButtonBarExample.php
@@ -23,21 +23,17 @@ final class PHUIButtonBarExample extends PhabricatorUIExample {
     );
     $button_bar1 = new PHUIButtonBarView();
     foreach ($icons as $text => $icon) {
-      $image = id(new PHUIIconView())
-          ->setIconFont($icon);
       $button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
         ->setTitle($text)
-        ->setIcon($image);
+        ->setIcon($icon);
 
       $button_bar1->addButton($button);
     }
 
     $button_bar2 = new PHUIButtonBarView();
     foreach ($icons as $text => $icon) {
-      $image = id(new PHUIIconView())
-          ->setIconFont($icon);
       $button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
@@ -49,14 +45,12 @@ final class PHUIButtonBarExample extends PhabricatorUIExample {
 
     $button_bar3 = new PHUIButtonBarView();
     foreach ($icons as $text => $icon) {
-      $image = id(new PHUIIconView())
-          ->setIconFont($icon);
       $button = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::SIMPLE)
         ->setTitle($text)
         ->setTooltip($text)
-        ->setIcon($image);
+        ->setIcon($icon);
 
       $button_bar3->addButton($button);
     }
@@ -64,13 +58,11 @@ final class PHUIButtonBarExample extends PhabricatorUIExample {
     $button_bar4 = new PHUIButtonBarView();
     $button_bar4->setBorderless(true);
     foreach ($icons as $text => $icon) {
-      $image = id(new PHUIIconView())
-          ->setIconFont($icon);
       $button = id(new PHUIButtonView())
         ->setTag('a')
         ->setTitle($text)
         ->setTooltip($text)
-        ->setIcon($image);
+        ->setIcon($icon);
 
       $button_bar4->addButton($button);
     }
diff --git a/src/applications/uiexample/examples/PHUIButtonExample.php b/src/applications/uiexample/examples/PHUIButtonExample.php
index 06cf369ba2..ae699eb7a3 100644
--- a/src/applications/uiexample/examples/PHUIButtonExample.php
+++ b/src/applications/uiexample/examples/PHUIButtonExample.php
@@ -112,12 +112,10 @@ final class PHUIButtonExample extends PhabricatorUIExample {
       'Implode Earth' => 'fa-exclamation-triangle red',
     );
     foreach ($icons as $text => $icon) {
-      $image = id(new PHUIIconView())
-        ->setIconFont($icon);
       $column[] = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
-        ->setIcon($image)
+        ->setIcon($icon)
         ->setText($text)
         ->addClass(PHUI::MARGIN_SMALL_RIGHT);
     }
@@ -140,12 +138,10 @@ final class PHUIButtonExample extends PhabricatorUIExample {
     $column = array();
     foreach ($colors as $color) {
       foreach ($icons as $text => $icon) {
-        $image = id(new PHUIIconView())
-            ->setIconFont($icon);
         $column[] = id(new PHUIButtonView())
           ->setTag('a')
           ->setColor($color)
-          ->setIcon($image)
+          ->setIcon($icon)
           ->setText($text)
           ->addClass(PHUI::MARGIN_SMALL_RIGHT);
       }
diff --git a/src/applications/uiexample/examples/PHUIFeedStoryExample.php b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
index 6731f1ce1f..375c6e42fd 100644
--- a/src/applications/uiexample/examples/PHUIFeedStoryExample.php
+++ b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
@@ -70,7 +70,7 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       '<strong><a>harding (Tom Harding)</a></strong> awarded '.
       '<a>M10: Workboards</a> a token.');
     $action1 = id(new PHUIIconView())
-      ->setIconFont('fa-trophy bluegrey')
+      ->setIcon('fa-trophy bluegrey')
       ->setHref('#');
     $token =
         id(new PHUIIconView())
@@ -91,10 +91,10 @@ final class PHUIFeedStoryExample extends PhabricatorUIExample {
       '<strong><a>wgharding (Warren Harding)</a></strong> '.
       'asked a new question.');
     $action1 = id(new PHUIIconView())
-      ->setIconFont('fa-chevron-up bluegrey')
+      ->setIcon('fa-chevron-up bluegrey')
       ->setHref('#');
     $action2 = id(new PHUIIconView())
-      ->setIconFont('fa-chevron-down bluegrey')
+      ->setIcon('fa-chevron-down bluegrey')
       ->setHref('#');
     $story4 = id(new PHUIFeedStoryView())
       ->setTitle($text)
diff --git a/src/applications/uiexample/examples/PHUIIconExample.php b/src/applications/uiexample/examples/PHUIIconExample.php
index 28d957b460..ad31caba8d 100644
--- a/src/applications/uiexample/examples/PHUIIconExample.php
+++ b/src/applications/uiexample/examples/PHUIIconExample.php
@@ -33,7 +33,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
     foreach ($colors as $color) {
       $cicons[] = id(new PHUIIconView())
         ->addClass('phui-example-icon-transform')
-        ->setIconFont('fa-tag '.$color)
+        ->setIcon('fa-tag '.$color)
         ->setText(pht('fa-tag %s', $color));
     }
     $ficons = array();
@@ -41,7 +41,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
     foreach ($fas as $fa) {
       $ficons[] = id(new PHUIIconView())
         ->addClass('phui-example-icon-name')
-        ->setIconFont($fa)
+        ->setIcon($fa)
         ->setText($fa);
     }
 
@@ -115,7 +115,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
     foreach ($circles as $circle) {
       $circleview[] =
         id(new PHUIIconCircleView())
-          ->setIconFont($circle)
+          ->setIcon($circle)
           ->setHref('#')
           ->addClass('mmr');
     }
@@ -124,7 +124,7 @@ final class PHUIIconExample extends PhabricatorUIExample {
     foreach ($circles as $circle) {
       $circleview[] =
         id(new PHUIIconCircleView())
-          ->setIconFont($circle)
+          ->setIcon($circle)
           ->setSize(PHUIIconCircleView::MEDIUM)
           ->setHref('#')
           ->addClass('mmr');
diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
index 2c47c744ac..b58b1764a8 100644
--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
@@ -154,7 +154,7 @@ final class PHUIDiffInlineCommentDetailView
       }
 
       $ghost_icon = id(new PHUIIconView())
-        ->setIconFont($ghosticon)
+        ->setIcon($ghosticon)
         ->addSigil('has-tooltip')
         ->setMetadata(
           array(
@@ -200,14 +200,14 @@ final class PHUIDiffInlineCommentDetailView
       $up = id(new PHUIButtonView())
         ->setTag('a')
         ->setTooltip(pht('Previous'))
-        ->setIconFont('fa-chevron-up')
+        ->setIcon('fa-chevron-up')
         ->addSigil('differential-inline-prev')
         ->setMustCapture(true);
 
       $down = id(new PHUIButtonView())
         ->setTag('a')
         ->setTooltip(pht('Next'))
-        ->setIconFont('fa-chevron-down')
+        ->setIcon('fa-chevron-down')
         ->addSigil('differential-inline-next')
         ->setMustCapture(true);
 
@@ -215,7 +215,7 @@ final class PHUIDiffInlineCommentDetailView
         $hide = id(new PHUIButtonView())
           ->setTag('a')
           ->setTooltip(pht('Hide Comment'))
-          ->setIconFont('fa-times')
+          ->setIcon('fa-times')
           ->addSigil('hide-inline')
           ->setMustCapture(true);
 
@@ -235,7 +235,7 @@ final class PHUIDiffInlineCommentDetailView
 
           $action_buttons[] = id(new PHUIButtonView())
             ->setTag('a')
-            ->setIconFont('fa-reply')
+            ->setIcon('fa-reply')
             ->setTooltip(pht('Reply'))
             ->addSigil('differential-inline-reply')
             ->setMustCapture(true);
@@ -248,14 +248,14 @@ final class PHUIDiffInlineCommentDetailView
     if ($this->editable && !$this->preview) {
       $action_buttons[] = id(new PHUIButtonView())
         ->setTag('a')
-        ->setIconFont('fa-pencil')
+        ->setIcon('fa-pencil')
         ->setTooltip(pht('Edit'))
         ->addSigil('differential-inline-edit')
         ->setMustCapture(true);
 
       $action_buttons[] = id(new PHUIButtonView())
         ->setTag('a')
-        ->setIconFont('fa-trash-o')
+        ->setIcon('fa-trash-o')
         ->setTooltip(pht('Delete'))
         ->addSigil('differential-inline-delete')
         ->setMustCapture(true);
@@ -275,7 +275,7 @@ final class PHUIDiffInlineCommentDetailView
       $action_buttons[] = id(new PHUIButtonView())
         ->setTag('a')
         ->setTooltip(pht('Delete'))
-        ->setIconFont('fa-trash-o')
+        ->setIcon('fa-trash-o')
         ->addSigil('differential-inline-delete')
         ->setMustCapture(true);
     }
@@ -338,7 +338,7 @@ final class PHUIDiffInlineCommentDetailView
           ));
       } else {
         if ($is_done) {
-          $icon = id(new PHUIIconView())->setIconFont('fa-check sky msr');
+          $icon = id(new PHUIIconView())->setIcon('fa-check sky msr');
           $label = pht('Done');
           $class = 'button-done';
         } else {
diff --git a/src/infrastructure/diff/view/PHUIDiffRevealIconView.php b/src/infrastructure/diff/view/PHUIDiffRevealIconView.php
index b2c879a8b5..284b72b2be 100644
--- a/src/infrastructure/diff/view/PHUIDiffRevealIconView.php
+++ b/src/infrastructure/diff/view/PHUIDiffRevealIconView.php
@@ -4,7 +4,7 @@ final class PHUIDiffRevealIconView extends AphrontView {
 
   public function render() {
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-comment')
+      ->setIcon('fa-comment')
       ->addSigil('has-tooltip')
       ->setMetadata(
         array(
diff --git a/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php b/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
index 41071a69dd..86b924804f 100644
--- a/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
+++ b/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
@@ -31,7 +31,7 @@ final class PhabricatorInlineSummaryView extends AphrontView {
       }
 
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-file-code-o darkbluetext mmr');
+        ->setIcon('fa-file-code-o darkbluetext mmr');
       $header = phutil_tag(
         'th',
         array(
@@ -65,7 +65,7 @@ final class PhabricatorInlineSummaryView extends AphrontView {
 
         if ($href) {
           $icon = id(new PHUIIconView())
-            ->setIconFont('fa-share darkbluetext mmr');
+            ->setIcon('fa-share darkbluetext mmr');
 
           $lines = phutil_tag(
             'a',
diff --git a/src/view/control/AphrontCursorPagerView.php b/src/view/control/AphrontCursorPagerView.php
index 74e8ce0e13..3574c07fa9 100644
--- a/src/view/control/AphrontCursorPagerView.php
+++ b/src/view/control/AphrontCursorPagerView.php
@@ -142,7 +142,7 @@ final class AphrontCursorPagerView extends AphrontView {
     $first_uri = $this->getFirstPageURI();
     if ($first_uri) {
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-fast-backward');
+        ->setIcon('fa-fast-backward');
       $links[] = id(new PHUIButtonView())
         ->setTag('a')
         ->setHref($first_uri)
@@ -155,7 +155,7 @@ final class AphrontCursorPagerView extends AphrontView {
     $prev_uri = $this->getPrevPageURI();
     if ($prev_uri) {
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-backward');
+        ->setIcon('fa-backward');
       $links[] = id(new PHUIButtonView())
         ->setTag('a')
         ->setHref($prev_uri)
@@ -168,7 +168,7 @@ final class AphrontCursorPagerView extends AphrontView {
     $next_uri = $this->getNextPageURI();
     if ($next_uri) {
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-forward');
+        ->setIcon('fa-forward');
       $links[] = id(new PHUIButtonView())
         ->setTag('a')
         ->setHref($next_uri)
diff --git a/src/view/control/AphrontTokenizerTemplateView.php b/src/view/control/AphrontTokenizerTemplateView.php
index 74456e84b8..facab93497 100644
--- a/src/view/control/AphrontTokenizerTemplateView.php
+++ b/src/view/control/AphrontTokenizerTemplateView.php
@@ -79,7 +79,7 @@ final class AphrontTokenizerTemplateView extends AphrontView {
       $content);
 
     $icon = id(new PHUIIconView())
-      ->setIconFont('fa-search');
+      ->setIcon('fa-search');
 
     $browse = id(new PHUIButtonView())
       ->setTag('a')
diff --git a/src/view/form/control/AphrontFormDateControl.php b/src/view/form/control/AphrontFormDateControl.php
index e08be84dc3..75398d688a 100644
--- a/src/view/form/control/AphrontFormDateControl.php
+++ b/src/view/form/control/AphrontFormDateControl.php
@@ -217,7 +217,7 @@ final class AphrontFormDateControl extends AphrontFormControl {
       $date_sel);
 
     $cicon = id(new PHUIIconView())
-      ->setIconFont('fa-calendar');
+      ->setIcon('fa-calendar');
 
     $cal_icon = javelin_tag(
       'a',
diff --git a/src/view/form/control/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php
index 348dc8171f..71087bfe07 100644
--- a/src/view/form/control/AphrontFormPolicyControl.php
+++ b/src/view/form/control/AphrontFormPolicyControl.php
@@ -242,7 +242,7 @@ final class AphrontFormPolicyControl extends AphrontFormControl {
     $icons = array();
     foreach (igroup($flat_options, 'icon') as $icon => $ignored) {
       $icons[$icon] = id(new PHUIIconView())
-        ->setIconFont($icon);
+        ->setIcon($icon);
     }
 
 
diff --git a/src/view/layout/PhabricatorActionView.php b/src/view/layout/PhabricatorActionView.php
index 15ff0a0023..b89c00daf5 100644
--- a/src/view/layout/PhabricatorActionView.php
+++ b/src/view/layout/PhabricatorActionView.php
@@ -105,7 +105,7 @@ final class PhabricatorActionView extends AphrontView {
       }
       $icon = id(new PHUIIconView())
         ->addClass('phabricator-action-view-icon')
-        ->setIconFont($this->icon.$color);
+        ->setIcon($this->icon.$color);
     }
 
     if ($this->href) {
diff --git a/src/view/page/menu/PhabricatorMainMenuSearchView.php b/src/view/page/menu/PhabricatorMainMenuSearchView.php
index 76e03b4072..1af42511a8 100644
--- a/src/view/page/menu/PhabricatorMainMenuSearchView.php
+++ b/src/view/page/menu/PhabricatorMainMenuSearchView.php
@@ -203,7 +203,7 @@ final class PhabricatorMainMenuSearchView extends AphrontView {
       ->setIcon(
         id(new PHUIIconView())
           ->addSigil('global-search-dropdown-icon')
-          ->setIconFont($current_icon))
+          ->setIcon($current_icon))
       ->setDropdown(true);
 
     $input = javelin_tag(
diff --git a/src/view/phui/PHUIActionPanelView.php b/src/view/phui/PHUIActionPanelView.php
index bfe44ba13e..a81b2e5dcf 100644
--- a/src/view/phui/PHUIActionPanelView.php
+++ b/src/view/phui/PHUIActionPanelView.php
@@ -80,7 +80,7 @@ final class PHUIActionPanelView extends AphrontTagView {
     $icon = null;
     if ($this->fontIcon) {
       $fonticon = id(new PHUIIconView())
-        ->setIconFont($this->fontIcon);
+        ->setIcon($this->fontIcon);
       $icon = phutil_tag(
         'span',
         array(
diff --git a/src/view/phui/PHUIBadgeMiniView.php b/src/view/phui/PHUIBadgeMiniView.php
index 92d6fd8b8b..21f455b4d6 100644
--- a/src/view/phui/PHUIBadgeMiniView.php
+++ b/src/view/phui/PHUIBadgeMiniView.php
@@ -65,7 +65,7 @@ final class PHUIBadgeMiniView extends AphrontTagView {
 
   protected function getTagContent() {
     return id(new PHUIIconView())
-      ->setIconFont($this->icon);
+      ->setIcon($this->icon);
   }
 
 }
diff --git a/src/view/phui/PHUIBadgeView.php b/src/view/phui/PHUIBadgeView.php
index fb50ff80ec..7e9f310843 100644
--- a/src/view/phui/PHUIBadgeView.php
+++ b/src/view/phui/PHUIBadgeView.php
@@ -104,7 +104,7 @@ final class PHUIBadgeView extends AphrontTagView {
   protected function getTagContent() {
 
     $icon = id(new PHUIIconView())
-      ->setIconFont($this->icon);
+      ->setIcon($this->icon);
 
     $illustration = phutil_tag_div('phui-badge-illustration', $icon);
 
diff --git a/src/view/phui/PHUIBigInfoView.php b/src/view/phui/PHUIBigInfoView.php
index 03e1aea196..0f5bcecfbd 100644
--- a/src/view/phui/PHUIBigInfoView.php
+++ b/src/view/phui/PHUIBigInfoView.php
@@ -44,7 +44,7 @@ final class PHUIBigInfoView extends AphrontTagView {
     require_celerity_resource('phui-big-info-view-css');
 
     $icon = id(new PHUIIconView())
-      ->setIconFont($this->icon)
+      ->setIcon($this->icon)
       ->addClass('phui-big-info-icon');
 
     $icon = phutil_tag(
diff --git a/src/view/phui/PHUIButtonView.php b/src/view/phui/PHUIButtonView.php
index 26a26a5ac4..9b9d4f0293 100644
--- a/src/view/phui/PHUIButtonView.php
+++ b/src/view/phui/PHUIButtonView.php
@@ -21,7 +21,6 @@ final class PHUIButtonView extends AphrontTagView {
   private $tag = 'button';
   private $dropdown;
   private $icon;
-  private $iconFont;
   private $iconFirst;
   private $href = null;
   private $title = null;
@@ -88,19 +87,16 @@ final class PHUIButtonView extends AphrontTagView {
     return $this;
   }
 
-  public function setIcon(PHUIIconView $icon, $first = true) {
+  public function setIcon($icon, $first = true) {
+    if (!($icon instanceof PHUIIconView)) {
+      $icon = id(new PHUIIconView())
+        ->setIcon($icon);
+    }
     $this->icon = $icon;
     $this->iconFirst = $first;
     return $this;
   }
 
-  public function setIconFont($icon) {
-    $icon = id(new PHUIIconView())
-      ->setIconFont($icon);
-    $this->setIcon($icon);
-    return $this;
-  }
-
   protected function getTagName() {
     return $this->tag;
   }
diff --git a/src/view/phui/PHUICrumbView.php b/src/view/phui/PHUICrumbView.php
index 915dfbf41f..5039e17606 100644
--- a/src/view/phui/PHUICrumbView.php
+++ b/src/view/phui/PHUICrumbView.php
@@ -70,7 +70,7 @@ final class PHUICrumbView extends AphrontView {
     if ($this->icon) {
       $classes[] = 'phui-crumb-has-icon';
       $icon = id(new PHUIIconView())
-        ->setIconFont($this->icon);
+        ->setIcon($this->icon);
     }
 
     $name = phutil_tag(
@@ -83,7 +83,7 @@ final class PHUICrumbView extends AphrontView {
     $divider = null;
     if (!$this->isLastCrumb) {
       $divider = id(new PHUIIconView())
-        ->setIconFont('fa-angle-right')
+        ->setIcon('fa-angle-right')
         ->addClass('phui-crumb-divider')
         ->addClass('phui-crumb-view');
     } else {
diff --git a/src/view/phui/PHUICrumbsView.php b/src/view/phui/PHUICrumbsView.php
index f8f25b389c..c85c0055d1 100644
--- a/src/view/phui/PHUICrumbsView.php
+++ b/src/view/phui/PHUICrumbsView.php
@@ -60,7 +60,7 @@ final class PHUICrumbsView extends AphrontView {
           }
 
           $icon = id(new PHUIIconView())
-            ->setIconFont($icon_name);
+            ->setIcon($icon_name);
 
         }
         $name = phutil_tag(
diff --git a/src/view/phui/PHUIDocumentViewPro.php b/src/view/phui/PHUIDocumentViewPro.php
index dbab3ab54c..d60cd78d44 100644
--- a/src/view/phui/PHUIDocumentViewPro.php
+++ b/src/view/phui/PHUIDocumentViewPro.php
@@ -78,7 +78,7 @@ final class PHUIDocumentViewPro extends AphrontTagView {
       $toc_id = celerity_generate_unique_node_id();
       $toc[] = id(new PHUIButtonView())
         ->setTag('a')
-        ->setIconFont('fa-align-left')
+        ->setIcon('fa-align-left')
         ->setColor(PHUIButtonView::SIMPLE)
         ->addClass('phui-document-toc')
         ->addSigil('jx-toggle-class')
diff --git a/src/view/phui/PHUIFeedStoryView.php b/src/view/phui/PHUIFeedStoryView.php
index 3c6080aa34..40b7c76290 100644
--- a/src/view/phui/PHUIFeedStoryView.php
+++ b/src/view/phui/PHUIFeedStoryView.php
@@ -193,7 +193,7 @@ final class PHUIFeedStoryView extends AphrontView {
     $icon = null;
     if ($this->appIcon) {
       $icon = id(new PHUIIconView())
-        ->setIconFont($this->appIcon);
+        ->setIcon($this->appIcon);
     }
 
     $action_list = array();
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
index f96749bb2b..48fedd11ae 100644
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -117,7 +117,7 @@ final class PHUIHeaderView extends AphrontTagView {
     }
 
     $img = id(new PHUIIconView())
-      ->setIconFont($icon);
+      ->setIcon($icon);
 
     $tag = phutil_tag(
       'span',
@@ -287,7 +287,7 @@ final class PHUIHeaderView extends AphrontTagView {
 
     if ($this->headerIcon) {
       $icon = id(new PHUIIconView())
-        ->setIconFont($this->headerIcon);
+        ->setIcon($this->headerIcon);
       $left[] = $icon;
     }
     $left[] = phutil_tag(
@@ -461,7 +461,7 @@ final class PHUIHeaderView extends AphrontTagView {
     }
 
     $icon = id(new PHUIIconView())
-      ->setIconFont($policy->getIcon().' bluegrey');
+      ->setIcon($policy->getIcon().' bluegrey');
 
     $link = javelin_tag(
       'a',
diff --git a/src/view/phui/PHUIIconCircleView.php b/src/view/phui/PHUIIconCircleView.php
index 1269c4e28c..05612c26f2 100644
--- a/src/view/phui/PHUIIconCircleView.php
+++ b/src/view/phui/PHUIIconCircleView.php
@@ -15,7 +15,7 @@ final class PHUIIconCircleView extends AphrontTagView {
     return $this;
   }
 
-  public function setIconFont($icon) {
+  public function setIcon($icon) {
     $this->icon = $icon;
     return $this;
   }
@@ -60,7 +60,7 @@ final class PHUIIconCircleView extends AphrontTagView {
 
   protected function getTagContent() {
     return id(new PHUIIconView())
-      ->setIconFont($this->icon)
+      ->setIcon($this->icon)
       ->addClass($this->color);
   }
 
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
index c383aff30b..02e06be9e9 100644
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -48,7 +48,7 @@ final class PHUIIconView extends AphrontTagView {
     return $this;
   }
 
-  public function setIconFont($icon, $color = null) {
+  public function setIcon($icon, $color = null) {
     $this->iconFont = $icon;
     $this->iconColor = $color;
     return $this;
diff --git a/src/view/phui/PHUIListItemView.php b/src/view/phui/PHUIListItemView.php
index f0bb46fb87..33c511c9c0 100644
--- a/src/view/phui/PHUIListItemView.php
+++ b/src/view/phui/PHUIListItemView.php
@@ -269,7 +269,7 @@ final class PHUIListItemView extends AphrontTagView {
 
       $icon = id(new PHUIIconView())
         ->addClass('phui-list-item-icon')
-        ->setIconFont($icon_name);
+        ->setIcon($icon_name);
     }
 
     if ($this->profileImage) {
diff --git a/src/view/phui/PHUIObjectBoxView.php b/src/view/phui/PHUIObjectBoxView.php
index 7c2a28d75c..32440a09cf 100644
--- a/src/view/phui/PHUIObjectBoxView.php
+++ b/src/view/phui/PHUIObjectBoxView.php
@@ -264,7 +264,7 @@ final class PHUIObjectBoxView extends AphrontView {
     if ($this->actionListID) {
       $icon_id = celerity_generate_unique_node_id();
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-bars');
+        ->setIcon('fa-bars');
       $meta = array(
         'map' => array(
           $this->actionListID => 'phabricator-action-list-toggle',
diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php
index 5da85777b0..bc48351c96 100644
--- a/src/view/phui/PHUIObjectItemView.php
+++ b/src/view/phui/PHUIObjectItemView.php
@@ -175,7 +175,7 @@ final class PHUIObjectItemView extends AphrontTagView {
 
   public function setFontIcon($icon) {
     $this->fontIcon = id(new PHUIIconView())
-      ->setIconFont($icon);
+      ->setIcon($icon);
     return $this;
   }
 
@@ -401,7 +401,7 @@ final class PHUIObjectItemView extends AphrontTagView {
       foreach ($this->icons as $spec) {
         $icon = $spec['icon'];
         $icon = id(new PHUIIconView())
-          ->setIconFont($icon)
+          ->setIcon($icon)
           ->addClass('phui-object-item-icon-image');
 
         if (isset($spec['attributes']['tip'])) {
@@ -725,7 +725,7 @@ final class PHUIObjectItemView extends AphrontTagView {
     Javelin::initBehavior('phabricator-tooltips');
 
     $icon = id(new PHUIIconView())
-      ->setIconFont($icon);
+      ->setIcon($icon);
 
     $options = array(
       'class' => 'phui-object-item-status-icon',
diff --git a/src/view/phui/PHUIPinboardItemView.php b/src/view/phui/PHUIPinboardItemView.php
index 93e2277040..1fafefc3d6 100644
--- a/src/view/phui/PHUIPinboardItemView.php
+++ b/src/view/phui/PHUIPinboardItemView.php
@@ -95,7 +95,7 @@ final class PHUIPinboardItemView extends AphrontView {
       $icon_list = array();
       foreach ($this->iconBlock as $block) {
         $icon = id(new PHUIIconView())
-          ->setIconFont($block[0].' lightgreytext')
+          ->setIcon($block[0].' lightgreytext')
           ->addClass('phui-pinboard-icon');
 
         $count = phutil_tag('span', array(), $block[1]);
diff --git a/src/view/phui/PHUIPropertyListView.php b/src/view/phui/PHUIPropertyListView.php
index e498bf9a5b..0d60ed25b0 100644
--- a/src/view/phui/PHUIPropertyListView.php
+++ b/src/view/phui/PHUIPropertyListView.php
@@ -258,7 +258,7 @@ final class PHUIPropertyListView extends AphrontView {
     $name = $part['name'];
     if ($part['icon']) {
       $icon = id(new PHUIIconView())
-        ->setIconFont($part['icon'].' bluegrey');
+        ->setIcon($part['icon'].' bluegrey');
       $name = phutil_tag(
         'span',
         array(
diff --git a/src/view/phui/PHUIStatusItemView.php b/src/view/phui/PHUIStatusItemView.php
index b268360eef..dae7e7d472 100644
--- a/src/view/phui/PHUIStatusItemView.php
+++ b/src/view/phui/PHUIStatusItemView.php
@@ -70,7 +70,7 @@ final class PHUIStatusItemView extends AphrontTagView {
     $icon = null;
     if ($this->icon) {
       $icon = id(new PHUIIconView())
-        ->setIconFont($this->icon.' '.$this->iconColor);
+        ->setIcon($this->icon.' '.$this->iconColor);
 
       if ($this->iconLabel) {
         Javelin::initBehavior('phabricator-tooltips');
diff --git a/src/view/phui/PHUITagView.php b/src/view/phui/PHUITagView.php
index 439feb77c5..8b6e6aa8d6 100644
--- a/src/view/phui/PHUITagView.php
+++ b/src/view/phui/PHUITagView.php
@@ -166,7 +166,7 @@ final class PHUITagView extends AphrontTagView {
 
     if ($this->icon) {
       $icon = id(new PHUIIconView())
-        ->setIconFont($this->icon);
+        ->setIcon($this->icon);
     } else {
       $icon = null;
     }
diff --git a/src/view/phui/PHUITimelineEventView.php b/src/view/phui/PHUITimelineEventView.php
index f9f1d4d3b4..ecd9329860 100644
--- a/src/view/phui/PHUITimelineEventView.php
+++ b/src/view/phui/PHUITimelineEventView.php
@@ -236,7 +236,7 @@ final class PHUITimelineEventView extends AphrontView {
       }
 
       $icon = id(new PHUIIconView())
-        ->setIconFont($this->icon.' white')
+        ->setIcon($this->icon.' white')
         ->addClass('phui-timeline-icon');
 
       $icon = phutil_tag(
@@ -297,7 +297,7 @@ final class PHUITimelineEventView extends AphrontView {
 
     if ($items || $has_menu) {
       $icon = id(new PHUIIconView())
-        ->setIconFont('fa-caret-down');
+        ->setIcon('fa-caret-down');
       $aural = javelin_tag(
         'span',
         array(
diff --git a/src/view/phui/calendar/PHUICalendarDayView.php b/src/view/phui/calendar/PHUICalendarDayView.php
index dd8e5f3fb2..34299e39c3 100644
--- a/src/view/phui/calendar/PHUICalendarDayView.php
+++ b/src/view/phui/calendar/PHUICalendarDayView.php
@@ -340,7 +340,7 @@ final class PHUICalendarDayView extends AphrontView {
       $button_bar = new PHUIButtonBarView();
 
       $left_icon = id(new PHUIIconView())
-          ->setIconFont('fa-chevron-left bluegrey');
+          ->setIcon('fa-chevron-left bluegrey');
       $left = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
@@ -349,7 +349,7 @@ final class PHUICalendarDayView extends AphrontView {
         ->setIcon($left_icon);
 
       $right_icon = id(new PHUIIconView())
-          ->setIconFont('fa-chevron-right bluegrey');
+          ->setIcon('fa-chevron-right bluegrey');
       $right = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
diff --git a/src/view/phui/calendar/PHUICalendarListView.php b/src/view/phui/calendar/PHUICalendarListView.php
index 4de84ce3fd..9f9bc86a80 100644
--- a/src/view/phui/calendar/PHUICalendarListView.php
+++ b/src/view/phui/calendar/PHUICalendarListView.php
@@ -60,7 +60,7 @@ final class PHUICalendarListView extends AphrontTagView {
       }
 
       $dot = id(new PHUIIconView())
-        ->setIconFont($event->getIcon(), $icon_color)
+        ->setIcon($event->getIcon(), $icon_color)
         ->addClass('phui-calendar-list-item-icon');
 
       $title = phutil_tag(
diff --git a/src/view/phui/calendar/PHUICalendarMonthView.php b/src/view/phui/calendar/PHUICalendarMonthView.php
index 0308f542e5..5efa4c1059 100644
--- a/src/view/phui/calendar/PHUICalendarMonthView.php
+++ b/src/view/phui/calendar/PHUICalendarMonthView.php
@@ -396,7 +396,7 @@ final class PHUICalendarMonthView extends AphrontView {
       $button_bar = new PHUIButtonBarView();
 
       $left_icon = id(new PHUIIconView())
-          ->setIconFont('fa-chevron-left bluegrey');
+          ->setIcon('fa-chevron-left bluegrey');
       $left = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)
@@ -405,7 +405,7 @@ final class PHUICalendarMonthView extends AphrontView {
         ->setIcon($left_icon);
 
       $right_icon = id(new PHUIIconView())
-          ->setIconFont('fa-chevron-right bluegrey');
+          ->setIcon('fa-chevron-right bluegrey');
       $right = id(new PHUIButtonView())
         ->setTag('a')
         ->setColor(PHUIButtonView::GREY)