D15125.id36520.diff
No OneTemporary
Actions

Size

94 KB

Referenced Files

None

Subscribers

None

D15125.id36520.diff
View Options

	diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php
	--- a/src/applications/almanac/controller/AlmanacController.php
	+++ b/src/applications/almanac/controller/AlmanacController.php
	@@ -33,7 +33,7 @@
	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 @@
	));

	$icon_custom = id(new PHUIIconView())
	- ->setIconFont('fa-circle-o grey')
	+ ->setIcon('fa-circle-o grey')
	->addSigil('has-tooltip')
	->setMetadata(
	array(
	@@ -166,9 +166,7 @@
	->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
	--- a/src/applications/almanac/controller/AlmanacDeviceViewController.php
	+++ b/src/applications/almanac/controller/AlmanacDeviceViewController.php
	@@ -132,9 +132,7 @@
	->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 @@
	->setText(pht('Generate Keypair'))
	->setIcon(
	id(new PHUIIconView())
	- ->setIconFont('fa-lock')))
	+ ->setIcon('fa-lock')))
	->addActionLink(
	id(new PHUIButtonView())
	->setTag('a')
	@@ -195,7 +193,7 @@
	->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 @@
	$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
	--- a/src/applications/almanac/controller/AlmanacServiceViewController.php
	+++ b/src/applications/almanac/controller/AlmanacServiceViewController.php
	@@ -134,9 +134,7 @@
	->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
	--- a/src/applications/auth/controller/config/PhabricatorAuthListController.php
	+++ b/src/applications/auth/controller/config/PhabricatorAuthListController.php
	@@ -147,13 +147,11 @@
	->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
	--- a/src/applications/auth/data/PhabricatorAuthInviteAction.php
	+++ b/src/applications/auth/data/PhabricatorAuthInviteAction.php
	@@ -88,7 +88,7 @@
	}

	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
	--- a/src/applications/auth/view/PhabricatorAuthSSHKeyTableView.php
	+++ b/src/applications/auth/view/PhabricatorAuthSSHKeyTableView.php
	@@ -45,9 +45,9 @@
	}

	$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
	--- a/src/applications/base/controller/PhabricatorController.php
	+++ b/src/applications/base/controller/PhabricatorController.php
	@@ -400,7 +400,7 @@
	}

	$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
	--- a/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	+++ b/src/applications/calendar/controller/PhabricatorCalendarEventViewController.php
	@@ -125,16 +125,14 @@
	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
	--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	@@ -213,7 +213,7 @@
	->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
	--- a/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php
	+++ b/src/applications/conduit/query/PhabricatorConduitLogSearchEngine.php
	@@ -140,7 +140,7 @@
	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 @@
	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 @@
	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
	--- a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
	+++ b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
	@@ -87,23 +87,19 @@
	'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
	--- a/src/applications/config/controller/PhabricatorConfigCacheController.php
	+++ b/src/applications/config/controller/PhabricatorConfigCacheController.php
	@@ -39,15 +39,12 @@

	$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 @@

	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 @@

	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 @@

	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
	--- a/src/applications/config/controller/PhabricatorConfigDatabaseController.php
	+++ b/src/applications/config/controller/PhabricatorConfigDatabaseController.php
	@@ -36,7 +36,7 @@
	}

	return id(new PHUIIconView())
	- ->setIconFont($icon);
	+ ->setIcon($icon);
	}

	protected function renderAttr($attr, $issue) {
	@@ -71,9 +71,7 @@
	->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
	--- a/src/applications/config/controller/PhabricatorConfigWelcomeController.php
	+++ b/src/applications/config/controller/PhabricatorConfigWelcomeController.php
	@@ -374,7 +374,7 @@
	$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
	--- a/src/applications/config/module/PhabricatorConfigPHIDModule.php
	+++ b/src/applications/config/module/PhabricatorConfigPHIDModule.php
	@@ -25,7 +25,7 @@

	$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 @@

	$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
	--- a/src/applications/conpherence/controller/ConpherenceWidgetController.php
	+++ b/src/applications/conpherence/controller/ConpherenceWidgetController.php
	@@ -57,7 +57,7 @@

	$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
	--- a/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php
	+++ b/src/applications/conpherence/query/ConpherenceThreadSearchEngine.php
	@@ -149,7 +149,7 @@

	$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
	--- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php
	+++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
	@@ -214,7 +214,7 @@
	$icon = $conpherence->getPolicyIconName($policy_objects);
	$icon = id(new PHUIIconView())
	->addClass('mmr')
	- ->setIconFont($icon);
	+ ->setIcon($icon);
	return $icon;
	}

	@@ -277,9 +277,7 @@
	->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
	--- a/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
	+++ b/src/applications/conpherence/view/ConpherencePeopleWidgetView.php
	@@ -23,7 +23,7 @@
	$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
	--- a/src/applications/conpherence/view/ConpherenceThreadListView.php
	+++ b/src/applications/conpherence/view/ConpherenceThreadListView.php
	@@ -59,7 +59,7 @@
	$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 @@
	'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
	--- a/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
	+++ b/src/applications/dashboard/engine/PhabricatorDashboardPanelRenderingEngine.php
	@@ -165,7 +165,7 @@
	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 @@
	$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 @@
	'/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
	--- a/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
	+++ b/src/applications/dashboard/paneltype/PhabricatorDashboardQueryPanelType.php
	@@ -117,7 +117,7 @@
	$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
	--- a/src/applications/differential/constants/DifferentialRevisionStatus.php
	+++ b/src/applications/differential/constants/DifferentialRevisionStatus.php
	@@ -63,7 +63,7 @@
	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
	--- a/src/applications/differential/view/DifferentialChangesetDetailView.php
	+++ b/src/applications/differential/view/DifferentialChangesetDetailView.php
	@@ -206,7 +206,7 @@
	$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
	--- a/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
	+++ b/src/applications/differential/view/DifferentialChangesetFileTreeSideNavBuilder.php
	@@ -91,12 +91,12 @@
	$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
	--- a/src/applications/differential/view/DifferentialRevisionListView.php
	+++ b/src/applications/differential/view/DifferentialRevisionListView.php
	@@ -131,7 +131,7 @@

	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
	--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
	+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
	@@ -832,13 +832,11 @@
	$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 @@
	$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
	--- a/src/applications/diffusion/controller/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
	@@ -221,14 +221,12 @@
	$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
	--- a/src/applications/diffusion/controller/DiffusionRepositoryController.php
	+++ b/src/applications/diffusion/controller/DiffusionRepositoryController.php
	@@ -390,13 +390,10 @@
	$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 @@
	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 @@
	$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 @@
	->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
	--- a/src/applications/diffusion/view/DiffusionBranchTableView.php
	+++ b/src/applications/diffusion/view/DiffusionBranchTableView.php
	@@ -81,7 +81,7 @@
	}

	$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
	--- a/src/applications/diffusion/view/DiffusionView.php
	+++ b/src/applications/diffusion/view/DiffusionView.php
	@@ -55,7 +55,7 @@
	'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 @@
	}

	$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 @@
	$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
	--- a/src/applications/diviner/controller/DivinerBookController.php
	+++ b/src/applications/diviner/controller/DivinerBookController.php
	@@ -33,7 +33,7 @@
	->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
	--- a/src/applications/diviner/controller/DivinerMainController.php
	+++ b/src/applications/diviner/controller/DivinerMainController.php
	@@ -17,14 +17,11 @@
	$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
	--- a/src/applications/drydock/controller/DrydockBlueprintViewController.php
	+++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php
	@@ -168,7 +168,7 @@
	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 @@
	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
	--- a/src/applications/drydock/controller/DrydockController.php
	+++ b/src/applications/drydock/controller/DrydockController.php
	@@ -39,9 +39,9 @@
	->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 @@
	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
	--- a/src/applications/drydock/controller/DrydockResourceViewController.php
	+++ b/src/applications/drydock/controller/DrydockResourceViewController.php
	@@ -168,7 +168,7 @@
	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
	--- a/src/applications/drydock/view/DrydockLogListView.php
	+++ b/src/applications/drydock/view/DrydockLogListView.php
	@@ -71,7 +71,7 @@
	$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
	--- a/src/applications/files/controller/PhabricatorFileComposeController.php
	+++ b/src/applications/files/controller/PhabricatorFileComposeController.php
	@@ -110,7 +110,7 @@
	),
	),
	id(new PHUIIconView())
	- ->setIconFont($icon)
	+ ->setIcon($icon)
	->addClass('compose-icon-bg'));
	}

	@@ -122,7 +122,7 @@
	$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
	--- a/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
	+++ b/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
	@@ -35,7 +35,7 @@
	$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
	--- a/src/applications/files/iconset/PhabricatorIconSet.php
	+++ b/src/applications/files/iconset/PhabricatorIconSet.php
	@@ -49,7 +49,7 @@
	'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
	--- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php
	@@ -311,7 +311,7 @@
	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 @@
	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
	--- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	+++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php
	@@ -202,9 +202,7 @@
	->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
	--- a/src/applications/herald/adapter/HeraldAdapter.php
	+++ b/src/applications/herald/adapter/HeraldAdapter.php
	@@ -830,7 +830,7 @@
	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
	--- a/src/applications/home/controller/PhabricatorHomeMainController.php
	+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
	@@ -318,7 +318,7 @@
	),
	$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
	--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
	+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
	@@ -250,9 +250,7 @@
	->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
	--- a/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
	+++ b/src/applications/legalpad/query/LegalpadDocumentSearchEngine.php
	@@ -186,7 +186,7 @@
	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 @@
	} 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
	--- a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
	+++ b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php
	@@ -183,7 +183,7 @@
	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 @@
	->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 @@

	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
	--- a/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
	+++ b/src/applications/macro/markup/PhabricatorIconRemarkupRule.php
	@@ -80,7 +80,7 @@
	}

	$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
	--- a/src/applications/maniphest/constants/ManiphestTaskStatus.php
	+++ b/src/applications/maniphest/constants/ManiphestTaskStatus.php
	@@ -94,7 +94,7 @@
	$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
	--- a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
	+++ b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
	@@ -29,9 +29,7 @@
	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 @@
	->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
	--- a/src/applications/notification/controller/PhabricatorNotificationStatusController.php
	+++ b/src/applications/notification/controller/PhabricatorNotificationStatusController.php
	@@ -63,7 +63,7 @@
	));

	$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
	--- a/src/applications/notification/query/PhabricatorNotificationSearchEngine.php
	+++ b/src/applications/notification/query/PhabricatorNotificationSearchEngine.php
	@@ -85,7 +85,7 @@
	$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
	--- a/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleProfileManageController.php
	@@ -28,7 +28,7 @@

	$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
	--- a/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
	+++ b/src/applications/people/controller/PhabricatorPeopleProfileViewController.php
	@@ -29,7 +29,7 @@

	$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
	--- a/src/applications/phame/controller/PhameHomeController.php
	+++ b/src/applications/phame/controller/PhameHomeController.php
	@@ -60,7 +60,7 @@
	->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
	--- a/src/applications/phame/controller/blog/PhameBlogViewController.php
	+++ b/src/applications/phame/controller/blog/PhameBlogViewController.php
	@@ -48,7 +48,7 @@
	->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
	--- a/src/applications/phame/controller/post/PhamePostViewController.php
	+++ b/src/applications/phame/controller/post/PhamePostViewController.php
	@@ -29,7 +29,7 @@
	->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
	--- a/src/applications/phame/view/PhameBlogListView.php
	+++ b/src/applications/phame/view/PhameBlogListView.php
	@@ -45,7 +45,7 @@
	$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
	--- a/src/applications/phame/view/PhameDraftListView.php
	+++ b/src/applications/phame/view/PhameDraftListView.php
	@@ -53,7 +53,7 @@
	$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
	--- a/src/applications/phame/view/PhameNextPostView.php
	+++ b/src/applications/phame/view/PhameNextPostView.php
	@@ -30,7 +30,7 @@
	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 @@
	}

	$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
	--- a/src/applications/phid/PhabricatorObjectHandle.php
	+++ b/src/applications/phid/PhabricatorObjectHandle.php
	@@ -299,7 +299,7 @@
	$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
	--- a/src/applications/pholio/view/PholioMockImagesView.php
	+++ b/src/applications/pholio/view/PholioMockImagesView.php
	@@ -126,12 +126,12 @@

	$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
	--- a/src/applications/pholio/view/PholioTransactionView.php
	+++ b/src/applications/pholio/view/PholioTransactionView.php
	@@ -73,7 +73,7 @@

	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
	--- a/src/applications/phortune/controller/PhortuneAccountListController.php
	+++ b/src/applications/phortune/controller/PhortuneAccountListController.php
	@@ -48,9 +48,7 @@
	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 @@
	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
	--- a/src/applications/phortune/controller/PhortuneAccountViewController.php
	+++ b/src/applications/phortune/controller/PhortuneAccountViewController.php
	@@ -254,9 +254,7 @@
	->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 @@
	->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 @@
	->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
	--- a/src/applications/phortune/controller/PhortuneCartViewController.php
	+++ b/src/applications/phortune/controller/PhortuneCartViewController.php
	@@ -132,8 +132,7 @@
	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
	--- a/src/applications/phortune/controller/PhortuneMerchantViewController.php
	+++ b/src/applications/phortune/controller/PhortuneMerchantViewController.php
	@@ -279,7 +279,7 @@
	->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
	--- a/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
	+++ b/src/applications/phortune/controller/PhortuneSubscriptionViewController.php
	@@ -193,9 +193,7 @@
	->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
	--- a/src/applications/phortune/view/PhortuneCreditCardForm.php
	+++ b/src/applications/phortune/view/PhortuneCreditCardForm.php
	@@ -107,7 +107,7 @@
	),
	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
	--- a/src/applications/phriction/controller/PhrictionDocumentController.php
	+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
	@@ -207,7 +207,7 @@
	->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
	--- a/src/applications/policy/storage/PhabricatorPolicy.php
	+++ b/src/applications/policy/storage/PhabricatorPolicy.php
	@@ -274,7 +274,7 @@
	$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
	--- a/src/applications/ponder/view/PonderAnswerView.php
	+++ b/src/applications/ponder/view/PonderAnswerView.php
	@@ -74,7 +74,7 @@
	->setTag('a')
	->setText(pht('Actions'))
	->setHref('#')
	- ->setIconFont('fa-bars')
	+ ->setIcon('fa-bars')
	->setDropdownMenu($actions);

	$header_name = phutil_tag(
	@@ -116,7 +116,7 @@
	$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
	--- a/src/applications/ponder/view/PonderFooterView.php
	+++ b/src/applications/ponder/view/PonderFooterView.php
	@@ -37,11 +37,11 @@

	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
	--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
	@@ -405,7 +405,7 @@
	$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 @@
	}

	$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
	--- a/src/applications/project/controller/PhabricatorProjectMilestonesController.php
	+++ b/src/applications/project/controller/PhabricatorProjectMilestonesController.php
	@@ -50,7 +50,7 @@
	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
	--- a/src/applications/project/controller/PhabricatorProjectProfileController.php
	+++ b/src/applications/project/controller/PhabricatorProjectProfileController.php
	@@ -166,7 +166,7 @@
	}

	$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
	--- a/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
	+++ b/src/applications/project/controller/PhabricatorProjectSubprojectsController.php
	@@ -50,7 +50,7 @@
	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
	--- a/src/applications/project/query/PhabricatorProjectSearchEngine.php
	+++ b/src/applications/project/query/PhabricatorProjectSearchEngine.php
	@@ -137,7 +137,7 @@

	$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
	--- a/src/applications/project/view/PhabricatorProjectListView.php
	+++ b/src/applications/project/view/PhabricatorProjectListView.php
	@@ -29,7 +29,7 @@
	$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
	--- a/src/applications/project/view/PhabricatorProjectUserListView.php
	+++ b/src/applications/project/view/PhabricatorProjectUserListView.php
	@@ -86,7 +86,7 @@
	->setImageURI($handle->getImageURI());

	$icon = id(new PHUIIconView())
	- ->setIconFont($handle->getIcon().' lightbluetext');
	+ ->setIcon($handle->getIcon().' lightbluetext');

	$subtitle = $handle->getSubtitle();

	@@ -126,7 +126,7 @@
	->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
	--- a/src/applications/search/engine/PhabricatorProfilePanelEngine.php
	+++ b/src/applications/search/engine/PhabricatorProfilePanelEngine.php
	@@ -401,7 +401,7 @@
	$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 @@
	'tip' => pht('Expand'),
	'align' => 'E',
	))
	- ->setIconFont('fa-chevron-right');
	+ ->setIcon('fa-chevron-right');

	$items[] = id(new PHUIListItemView())
	->setName('Collapse')
	@@ -658,7 +658,7 @@
	->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
	--- a/src/applications/search/profilepanel/PhabricatorMotivatorProfilePanel.php
	+++ b/src/applications/search/profilepanel/PhabricatorMotivatorProfilePanel.php
	@@ -68,7 +68,7 @@
	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
	--- a/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
	+++ b/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
	@@ -126,14 +126,12 @@
	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
	--- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
	+++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
	@@ -143,14 +143,11 @@
	$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
	--- a/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php
	+++ b/src/applications/settings/panel/PhabricatorHomePreferencesSettingsPanel.php
	@@ -182,9 +182,7 @@
	->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
	--- a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
	+++ b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
	@@ -107,22 +107,18 @@
	$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
	--- a/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php
	+++ b/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php
	@@ -44,14 +44,12 @@
	$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 @@
	$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
	--- a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
	+++ b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
	@@ -112,15 +112,12 @@
	'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 @@

	$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
	--- a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
	+++ b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
	@@ -75,15 +75,12 @@
	'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
	--- a/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
	+++ b/src/applications/transactions/controller/PhabricatorApplicationTransactionValueController.php
	@@ -105,7 +105,7 @@
	$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
	--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
	+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
	@@ -1090,7 +1090,7 @@
	->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
	--- a/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php
	+++ b/src/applications/transactions/view/PhabricatorApplicationEditHTTPParameterHelpView.php
	@@ -210,8 +210,8 @@
	$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
	--- a/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
	+++ b/src/applications/typeahead/controller/PhabricatorTypeaheadModularDatasourceController.php
	@@ -237,7 +237,7 @@

	$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
	--- a/src/applications/uiexample/examples/PHUIBoxExample.php
	+++ b/src/applications/uiexample/examples/PHUIBoxExample.php
	@@ -61,12 +61,10 @@
	->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
	--- a/src/applications/uiexample/examples/PHUIButtonBarExample.php
	+++ b/src/applications/uiexample/examples/PHUIButtonBarExample.php
	@@ -23,21 +23,17 @@
	);
	$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 @@

	$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 @@
	$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
	--- a/src/applications/uiexample/examples/PHUIButtonExample.php
	+++ b/src/applications/uiexample/examples/PHUIButtonExample.php
	@@ -112,12 +112,10 @@
	'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 @@
	$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
	--- a/src/applications/uiexample/examples/PHUIFeedStoryExample.php
	+++ b/src/applications/uiexample/examples/PHUIFeedStoryExample.php
	@@ -70,7 +70,7 @@
	'<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 @@
	'<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
	--- a/src/applications/uiexample/examples/PHUIIconExample.php
	+++ b/src/applications/uiexample/examples/PHUIIconExample.php
	@@ -33,7 +33,7 @@
	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 @@
	foreach ($fas as $fa) {
	$ficons[] = id(new PHUIIconView())
	->addClass('phui-example-icon-name')
	- ->setIconFont($fa)
	+ ->setIcon($fa)
	->setText($fa);
	}

	@@ -115,7 +115,7 @@
	foreach ($circles as $circle) {
	$circleview[] =
	id(new PHUIIconCircleView())
	- ->setIconFont($circle)
	+ ->setIcon($circle)
	->setHref('#')
	->addClass('mmr');
	}
	@@ -124,7 +124,7 @@
	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
	--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
	+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
	@@ -154,7 +154,7 @@
	}

	$ghost_icon = id(new PHUIIconView())
	- ->setIconFont($ghosticon)
	+ ->setIcon($ghosticon)
	->addSigil('has-tooltip')
	->setMetadata(
	array(
	@@ -200,14 +200,14 @@
	$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 @@
	$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 @@

	$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 @@
	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 @@
	$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 @@
	));
	} 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
	--- a/src/infrastructure/diff/view/PHUIDiffRevealIconView.php
	+++ b/src/infrastructure/diff/view/PHUIDiffRevealIconView.php
	@@ -4,7 +4,7 @@

	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
	--- a/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
	+++ b/src/infrastructure/diff/view/PhabricatorInlineSummaryView.php
	@@ -31,7 +31,7 @@
	}

	$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 @@

	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
	--- a/src/view/control/AphrontCursorPagerView.php
	+++ b/src/view/control/AphrontCursorPagerView.php
	@@ -142,7 +142,7 @@
	$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 @@
	$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 @@
	$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
	--- a/src/view/control/AphrontTokenizerTemplateView.php
	+++ b/src/view/control/AphrontTokenizerTemplateView.php
	@@ -79,7 +79,7 @@
	$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
	--- a/src/view/form/control/AphrontFormDateControl.php
	+++ b/src/view/form/control/AphrontFormDateControl.php
	@@ -217,7 +217,7 @@
	$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
	--- a/src/view/form/control/AphrontFormPolicyControl.php
	+++ b/src/view/form/control/AphrontFormPolicyControl.php
	@@ -242,7 +242,7 @@
	$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
	--- a/src/view/layout/PhabricatorActionView.php
	+++ b/src/view/layout/PhabricatorActionView.php
	@@ -105,7 +105,7 @@
	}
	$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
	--- a/src/view/page/menu/PhabricatorMainMenuSearchView.php
	+++ b/src/view/page/menu/PhabricatorMainMenuSearchView.php
	@@ -203,7 +203,7 @@
	->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
	--- a/src/view/phui/PHUIActionPanelView.php
	+++ b/src/view/phui/PHUIActionPanelView.php
	@@ -80,7 +80,7 @@
	$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
	--- a/src/view/phui/PHUIBadgeMiniView.php
	+++ b/src/view/phui/PHUIBadgeMiniView.php
	@@ -65,7 +65,7 @@

	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
	--- a/src/view/phui/PHUIBadgeView.php
	+++ b/src/view/phui/PHUIBadgeView.php
	@@ -104,7 +104,7 @@
	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
	--- a/src/view/phui/PHUIBigInfoView.php
	+++ b/src/view/phui/PHUIBigInfoView.php
	@@ -44,7 +44,7 @@
	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
	--- a/src/view/phui/PHUIButtonView.php
	+++ b/src/view/phui/PHUIButtonView.php
	@@ -21,7 +21,6 @@
	private $tag = 'button';
	private $dropdown;
	private $icon;
	- private $iconFont;
	private $iconFirst;
	private $href = null;
	private $title = null;
	@@ -88,19 +87,16 @@
	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
	--- a/src/view/phui/PHUICrumbView.php
	+++ b/src/view/phui/PHUICrumbView.php
	@@ -70,7 +70,7 @@
	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 @@
	$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
	--- a/src/view/phui/PHUICrumbsView.php
	+++ b/src/view/phui/PHUICrumbsView.php
	@@ -60,7 +60,7 @@
	}

	$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
	--- a/src/view/phui/PHUIDocumentViewPro.php
	+++ b/src/view/phui/PHUIDocumentViewPro.php
	@@ -78,7 +78,7 @@
	$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
	--- a/src/view/phui/PHUIFeedStoryView.php
	+++ b/src/view/phui/PHUIFeedStoryView.php
	@@ -193,7 +193,7 @@
	$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
	--- a/src/view/phui/PHUIHeaderView.php
	+++ b/src/view/phui/PHUIHeaderView.php
	@@ -117,7 +117,7 @@
	}

	$img = id(new PHUIIconView())
	- ->setIconFont($icon);
	+ ->setIcon($icon);

	$tag = phutil_tag(
	'span',
	@@ -287,7 +287,7 @@

	if ($this->headerIcon) {
	$icon = id(new PHUIIconView())
	- ->setIconFont($this->headerIcon);
	+ ->setIcon($this->headerIcon);
	$left[] = $icon;
	}
	$left[] = phutil_tag(
	@@ -461,7 +461,7 @@
	}

	$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
	--- a/src/view/phui/PHUIIconCircleView.php
	+++ b/src/view/phui/PHUIIconCircleView.php
	@@ -15,7 +15,7 @@
	return $this;
	}

	- public function setIconFont($icon) {
	+ public function setIcon($icon) {
	$this->icon = $icon;
	return $this;
	}
	@@ -60,7 +60,7 @@

	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
	--- a/src/view/phui/PHUIIconView.php
	+++ b/src/view/phui/PHUIIconView.php
	@@ -48,7 +48,7 @@
	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
	--- a/src/view/phui/PHUIListItemView.php
	+++ b/src/view/phui/PHUIListItemView.php
	@@ -269,7 +269,7 @@

	$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
	--- a/src/view/phui/PHUIObjectBoxView.php
	+++ b/src/view/phui/PHUIObjectBoxView.php
	@@ -264,7 +264,7 @@
	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
	--- a/src/view/phui/PHUIObjectItemView.php
	+++ b/src/view/phui/PHUIObjectItemView.php
	@@ -175,7 +175,7 @@

	public function setFontIcon($icon) {
	$this->fontIcon = id(new PHUIIconView())
	- ->setIconFont($icon);
	+ ->setIcon($icon);
	return $this;
	}

	@@ -401,7 +401,7 @@
	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 @@
	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
	--- a/src/view/phui/PHUIPinboardItemView.php
	+++ b/src/view/phui/PHUIPinboardItemView.php
	@@ -95,7 +95,7 @@
	$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
	--- a/src/view/phui/PHUIPropertyListView.php
	+++ b/src/view/phui/PHUIPropertyListView.php
	@@ -258,7 +258,7 @@
	$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
	--- a/src/view/phui/PHUIStatusItemView.php
	+++ b/src/view/phui/PHUIStatusItemView.php
	@@ -70,7 +70,7 @@
	$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
	--- a/src/view/phui/PHUITagView.php
	+++ b/src/view/phui/PHUITagView.php
	@@ -166,7 +166,7 @@

	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
	--- a/src/view/phui/PHUITimelineEventView.php
	+++ b/src/view/phui/PHUITimelineEventView.php
	@@ -236,7 +236,7 @@
	}

	$icon = id(new PHUIIconView())
	- ->setIconFont($this->icon.' white')
	+ ->setIcon($this->icon.' white')
	->addClass('phui-timeline-icon');

	$icon = phutil_tag(
	@@ -297,7 +297,7 @@

	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
	--- a/src/view/phui/calendar/PHUICalendarDayView.php
	+++ b/src/view/phui/calendar/PHUICalendarDayView.php
	@@ -340,7 +340,7 @@
	$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 @@
	->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
	--- a/src/view/phui/calendar/PHUICalendarListView.php
	+++ b/src/view/phui/calendar/PHUICalendarListView.php
	@@ -60,7 +60,7 @@
	}

	$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
	--- a/src/view/phui/calendar/PHUICalendarMonthView.php
	+++ b/src/view/phui/calendar/PHUICalendarMonthView.php
	@@ -396,7 +396,7 @@
	$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 @@
	->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)

File Metadata

Mime Type: text/plain
Expires: Fri, Apr 11, 5:12 AM (1 w, 22 h ago)
Storage Engine: amazon-s3
Storage Format: Encrypted (AES-256-CBC)
Storage Handle: phabricator/secure/5j/5k/xdbad5gr6zu3i2mt
Default Alt Text: D15125.id36520.diff (94 KB)

D15125.id36520.diffNo OneTemporaryActions

D15125.id36520.diffView Options

File Metadata

Event Timeline

D15125.id36520.diff
No OneTemporary
Actions

D15125.id36520.diff
View Options