Convert all calls to 'IconFont' to just 'Icon'

Summary: Mostly for consistency, we're not using other forms of icons and this makes all classes that use an icon call it in the same way. Test Plan: tested uiexamples, lots of other random pages. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D15125
2024-12-22 05:20:56 +01:00 · 2016-01-27 20:38:01 -08:00 · 2016-01-27 20:38:01 -08:00 · 36158dbdc0
commit 36158dbdc0
parent 43b8581d72
130 changed files with 212 additions and 306 deletions
--- 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'))
--- 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) {
--- 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)
--- 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'));

--- 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(
--- 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) {
--- 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');

--- 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'));
--- 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',
--- 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(
--- 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'))
--- 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,
    );
--- 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')));
  }
--- 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),
--- 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;
      }
--- 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');
--- 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)
--- 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() {
--- 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(
--- 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);
--- 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);
--- 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);

--- 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',
--- 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());
--- 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(
--- 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(
--- 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;
  }
--- 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)
--- 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'));
--- 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(
--- 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',
--- 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);

--- 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'))
--- 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())
--- 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())
--- 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())
--- 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),
--- 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(
--- 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';
--- 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(),
      ));
--- 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())
--- 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));

--- 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()) {
--- 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)
--- 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)
--- 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'),
            ));
--- 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(
--- 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);
  }
--- 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',
--- 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');
--- 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')
--- 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')
--- 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())
--- 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())
--- 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);

--- 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);

--- 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);

--- 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(
--- 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(
--- 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',
--- 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(
--- 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/'))
--- 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(
--- 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())
--- 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')));

--- 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()));
      }
    }
--- 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'))
--- 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')));

--- 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,
        ));
--- 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);

--- 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()) {
--- 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(
--- 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));
    }

--- 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(
--- 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));
--- 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')
--- 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));
--- 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(),
      );
--- 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();

--- 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}/"));
    }
--- 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())
--- 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,
        );
--- 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(
--- 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);
    }
--- 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)
--- 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);
--- 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);
--- 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);
    }

--- 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'))
--- 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());

--- 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;
--- 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) {
--- 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,
          );
--- 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);

--- 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);
    }
--- 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);
      }
--- 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)
--- 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');
--- 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 {
--- 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(
--- a/Show more
+++ b/Show more