Move FontIcon calls to Icon

Summary: Normalizes all `setFontIcon` calls to `setIcon`.

Test Plan: UIExamples, Almanac, Apps list, etc.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, hach-que, yelirekim

Differential Revision: https://secure.phabricator.com/D15129

src/applications/almanac/application/PhabricatorAlmanacApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorAlmanacApplication extends PhabricatorApplication {
     return pht('Service Directory');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-server';
   }
 

src/applications/almanac/controller/AlmanacConsoleController.php

@@ -16,21 +16,21 @@ final class AlmanacConsoleController extends AlmanacController {
       id(new PHUIObjectItemView())
         ->setHeader(pht('Services'))
         ->setHref($this->getApplicationURI('service/'))
-        ->setFontIcon('fa-plug')
+        ->setIcon('fa-plug')
         ->addAttribute(pht('Manage Almanac services.')));
 
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Devices'))
         ->setHref($this->getApplicationURI('device/'))
-        ->setFontIcon('fa-server')
+        ->setIcon('fa-server')
         ->addAttribute(pht('Manage Almanac devices.')));
 
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Networks'))
         ->setHref($this->getApplicationURI('network/'))
-        ->setFontIcon('fa-globe')
+        ->setIcon('fa-globe')
         ->addAttribute(pht('Manage Almanac networks.')));
 
     $crumbs = $this->buildApplicationCrumbs();

src/applications/audit/application/PhabricatorAuditApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorAuditApplication extends PhabricatorApplication {
     return '/audit/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-check-circle-o';
   }
 

src/applications/auth/application/PhabricatorAuthApplication.php

@@ -10,7 +10,7 @@ final class PhabricatorAuthApplication extends PhabricatorApplication {
     return '/auth/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-key';
   }
 

src/applications/badges/application/PhabricatorBadgesApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorBadgesApplication extends PhabricatorApplication {
     return pht('Achievements and Notority');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-trophy';
   }
 

src/applications/badges/query/PhabricatorBadgesSearchEngine.php

@@ -147,7 +147,7 @@ final class PhabricatorBadgesSearchEngine
       ->setHref('/badges/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/base/PhabricatorApplication.php

@@ -155,7 +155,7 @@ abstract class PhabricatorApplication
     return null;
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-puzzle-piece';
   }
 

src/applications/base/controller/PhabricatorController.php

@@ -352,7 +352,7 @@ abstract class PhabricatorController extends AphrontController {
 
     $application = $this->getCurrentApplication();
     if ($application) {
-      $icon = $application->getFontIcon();
+      $icon = $application->getIcon();
       if (!$icon) {
         $icon = 'fa-puzzle';
       }

src/applications/calendar/application/PhabricatorCalendarApplication.php

@@ -18,7 +18,7 @@ final class PhabricatorCalendarApplication extends PhabricatorApplication {
     return '/calendar/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-calendar';
   }
 

src/applications/chatlog/application/PhabricatorChatLogApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorChatLogApplication extends PhabricatorApplication {
     return pht('(Deprecated)');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-coffee';
   }
 

src/applications/conduit/application/PhabricatorConduitApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorConduitApplication extends PhabricatorApplication {
     return '/conduit/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-tty';
   }
 

src/applications/config/application/PhabricatorConfigApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorConfigApplication extends PhabricatorApplication {
     return '/config/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-sliders';
   }
 

src/applications/config/controller/PhabricatorConfigListController.php

@@ -53,7 +53,7 @@ final class PhabricatorConfigListController
           ->setHeader($group->getName())
           ->setHref('/config/group/'.$group->getKey().'/')
           ->addAttribute($group->getDescription())
-          ->setFontIcon($group->getFontIcon());
+          ->setIcon($group->getIcon());
         $list->addItem($item);
       }
     }

src/applications/config/module/PhabricatorConfigPHIDModule.php

@@ -23,7 +23,7 @@ final class PhabricatorConfigPHIDModule extends PhabricatorConfigModule {
         $app = PhabricatorApplication::getByClass($class_name);
         $app_name = $app->getName();
 
-        $icon = $app->getFontIcon();
+        $icon = $app->getIcon();
         if ($icon) {
           $app_icon = id(new PHUIIconView())->setIcon($icon);
         } else {

src/applications/config/option/PhabricatorAWSConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorAWSConfigOptions
     return pht('Configure integration with AWS (EC2, SES, S3, etc).');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-server';
   }
 

src/applications/config/option/PhabricatorAccessLogConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorAccessLogConfigOptions
     return pht('Configure the access logs, which log HTTP/SSH requests.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-list';
   }
 

src/applications/config/option/PhabricatorApplicationConfigOptions.php

@@ -7,7 +7,7 @@ abstract class PhabricatorApplicationConfigOptions extends Phobject {
   abstract public function getGroup();
   abstract public function getOptions();
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-sliders';
   }
 

src/applications/config/option/PhabricatorAuthenticationConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorAuthenticationConfigOptions
     return pht('Options relating to authentication.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-key';
   }
 

src/applications/config/option/PhabricatorClusterConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorClusterConfigOptions
     return pht('Configure Phabricator to run on a cluster of hosts.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-sitemap';
   }
 

src/applications/config/option/PhabricatorCoreConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorCoreConfigOptions
     return pht('Configure core options, including URIs.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-bullseye';
   }
 

src/applications/config/option/PhabricatorDeveloperConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorDeveloperConfigOptions
     return pht('Options for Phabricator developers, including debugging.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-bug';
   }
 

src/applications/config/option/PhabricatorExtendingPhabricatorConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorExtendingPhabricatorConfigOptions
     return pht('Make Phabricator even cooler!');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-rocket';
   }
 

src/applications/config/option/PhabricatorMailgunConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorMailgunConfigOptions
     return pht('Configure Mailgun integration.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send-o';
   }
 

src/applications/config/option/PhabricatorMetaMTAConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorMetaMTAConfigOptions
     return pht('Configure Mail.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send';
   }
 

src/applications/config/option/PhabricatorMySQLConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorMySQLConfigOptions
     return pht('Database configuration.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-database';
   }
 

src/applications/config/option/PhabricatorNotificationConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorNotificationConfigOptions
     return pht('Configure real-time notifications.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-bell';
   }
 

src/applications/config/option/PhabricatorPHDConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorPHDConfigOptions
     return pht('Options relating to PHD (daemons).');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-pied-piper-alt';
   }
 

src/applications/config/option/PhabricatorPHPMailerConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorPHPMailerConfigOptions
     return pht('Configure PHPMailer.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send-o';
   }
 

src/applications/config/option/PhabricatorPhurlConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorPhurlConfigOptions
     return pht('Options for Phurl.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-link';
   }
 

src/applications/config/option/PhabricatorRecaptchaConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorRecaptchaConfigOptions
     return pht('Configure Recaptcha captchas.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-recycle';
   }
 

src/applications/config/option/PhabricatorSMSConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorSMSConfigOptions
     return pht('Configure SMS.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-mobile';
   }
 

src/applications/config/option/PhabricatorSecurityConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorSecurityConfigOptions
     return pht('Security options.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-lock';
   }
 

src/applications/config/option/PhabricatorSendGridConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorSendGridConfigOptions
     return pht('Configure SendGrid integration.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send-o';
   }
 

src/applications/config/option/PhabricatorSyntaxHighlightingConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorSyntaxHighlightingConfigOptions
     return pht('Options relating to syntax highlighting source code.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-code';
   }
 

src/applications/config/option/PhabricatorTranslationsConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorTranslationsConfigOptions
     return pht('Options relating to translations.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-globe';
   }
 

src/applications/config/option/PhabricatorUIConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorUIConfigOptions
     return pht('Configure the Phabricator UI, including colors.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-magnet';
   }
 

src/applications/conpherence/application/PhabricatorConpherenceApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorConpherenceApplication extends PhabricatorApplication {
     return pht('Chat with Others');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-comments';
   }
 

src/applications/conpherence/config/ConpherenceConfigOptions.php

@@ -11,7 +11,7 @@ final class ConpherenceConfigOptions
     return pht('Configure Conpherence messaging.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-comments';
   }
 

src/applications/countdown/application/PhabricatorCountdownApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorCountdownApplication extends PhabricatorApplication {
     return '/countdown/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-rocket';
   }
 

src/applications/countdown/query/PhabricatorCountdownSearchEngine.php

@@ -152,7 +152,7 @@ final class PhabricatorCountdownSearchEngine
       ->setHref('/countdown/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/daemon/application/PhabricatorDaemonsApplication.php

@@ -18,7 +18,7 @@ final class PhabricatorDaemonsApplication extends PhabricatorApplication {
     return "\xE2\x98\xAF";
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-pied-piper-alt';
   }
 

src/applications/dashboard/application/PhabricatorDashboardApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDashboardApplication extends PhabricatorApplication {
     return pht('Create Custom Pages');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-dashboard';
   }
 

src/applications/dashboard/controller/PhabricatorDashboardPanelListController.php

@@ -55,7 +55,7 @@ final class PhabricatorDashboardPanelListController
       ->setHref('/dashboard/panel/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/dashboard/query/PhabricatorDashboardSearchEngine.php

@@ -181,7 +181,7 @@ final class PhabricatorDashboardSearchEngine
       ->setHref('/dashboard/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/differential/application/PhabricatorDifferentialApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDifferentialApplication extends PhabricatorApplication {
     return pht('Review Code');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-cog';
   }
 

src/applications/differential/config/PhabricatorDifferentialConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorDifferentialConfigOptions
     return pht('Configure Differential code review.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-cog';
   }
 

src/applications/differential/query/DifferentialRevisionSearchEngine.php

@@ -348,7 +348,7 @@ final class DifferentialRevisionSearchEngine
       ->setHref('/differential/diff/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/diffusion/application/PhabricatorDiffusionApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDiffusionApplication extends PhabricatorApplication {
     return '/diffusion/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-code';
   }
 

src/applications/diffusion/config/PhabricatorDiffusionConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorDiffusionConfigOptions
     return pht('Configure Diffusion repository browsing.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-code';
   }
 

src/applications/diviner/application/PhabricatorDivinerApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorDivinerApplication extends PhabricatorApplication {
     return '/diviner/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-sun-o';
   }
 

src/applications/doorkeeper/application/PhabricatorDoorkeeperApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDoorkeeperApplication extends PhabricatorApplication {
     return pht('Doorkeeper');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-recycle';
   }
 

src/applications/doorkeeper/option/PhabricatorAsanaConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorAsanaConfigOptions
     return pht('Asana integration options.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-exchange';
   }
 

src/applications/drydock/application/PhabricatorDrydockApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorDrydockApplication extends PhabricatorApplication {
     return pht('Allocate Software Resources');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-truck';
   }
 

src/applications/drydock/controller/DrydockConsoleController.php

@@ -31,7 +31,7 @@ final class DrydockConsoleController extends DrydockController {
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Blueprints'))
-        ->setFontIcon('fa-map-o')
+        ->setIcon('fa-map-o')
         ->setHref($this->getApplicationURI('blueprint/'))
         ->addAttribute(
           pht(
@@ -41,7 +41,7 @@ final class DrydockConsoleController extends DrydockController {
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Resources'))
-        ->setFontIcon('fa-map')
+        ->setIcon('fa-map')
         ->setHref($this->getApplicationURI('resource/'))
         ->addAttribute(
           pht('View and manage resources Drydock has built, like hosts.')));
@@ -49,14 +49,14 @@ final class DrydockConsoleController extends DrydockController {
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Leases'))
-        ->setFontIcon('fa-link')
+        ->setIcon('fa-link')
         ->setHref($this->getApplicationURI('lease/'))
         ->addAttribute(pht('Manage leases on resources.')));
 
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Repository Operations'))
-        ->setFontIcon('fa-fighter-jet')
+        ->setIcon('fa-fighter-jet')
         ->setHref($this->getApplicationURI('operation/'))
         ->addAttribute(pht('Review the repository operation queue.')));
 

src/applications/fact/application/PhabricatorFactApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorFactApplication extends PhabricatorApplication {
     return '/fact/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-line-chart';
   }
 

src/applications/feed/application/PhabricatorFeedApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorFeedApplication extends PhabricatorApplication {
     return pht('Review Recent Activity');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-newspaper-o';
   }
 

src/applications/feed/config/PhabricatorFeedConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorFeedConfigOptions
     return pht('Feed options.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-newspaper-o';
   }
 

src/applications/files/application/PhabricatorFilesApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorFilesApplication extends PhabricatorApplication {
     return pht('Store and Share Files');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-file';
   }
 

src/applications/files/config/PhabricatorFilesConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorFilesConfigOptions
     return pht('Configure files and file storage.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-file';
   }
 

src/applications/files/query/PhabricatorFileSearchEngine.php

@@ -185,7 +185,7 @@ final class PhabricatorFileSearchEngine
       ->setHref('/file/upload/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/flag/application/PhabricatorFlagsApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorFlagsApplication extends PhabricatorApplication {
     return '/flag/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-flag';
   }
 

src/applications/fund/application/PhabricatorFundApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorFundApplication extends PhabricatorApplication {
     return pht('Donate');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-heart';
   }
 

src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorHarbormasterApplication extends PhabricatorApplication {
     return pht('Build/CI');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-ship';
   }
 

src/applications/harbormaster/config/PhabricatorHarbormasterConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorHarbormasterConfigOptions
     return pht('Configure Harbormaster build engine.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-ship';
   }
 

src/applications/herald/application/PhabricatorHeraldApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorHeraldApplication extends PhabricatorApplication {
     return '/herald/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-bullhorn';
   }
 

src/applications/herald/query/HeraldRuleSearchEngine.php

@@ -218,7 +218,7 @@ final class HeraldRuleSearchEngine extends PhabricatorApplicationSearchEngine {
       ->setHref('/herald/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/home/application/PhabricatorHomeApplication.php

@@ -16,7 +16,7 @@ final class PhabricatorHomeApplication extends PhabricatorApplication {
     return pht('Command Center');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-home';
   }
 

src/applications/legalpad/application/PhabricatorLegalpadApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorLegalpadApplication extends PhabricatorApplication {
     return pht('Agreements and Signatures');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-gavel';
   }
 

src/applications/legalpad/config/PhabricatorLegalpadConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorLegalpadConfigOptions
     return pht('Configure Legalpad.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-gavel';
   }
 

src/applications/legalpad/query/LegalpadDocumentSearchEngine.php

@@ -223,7 +223,7 @@ final class LegalpadDocumentSearchEngine
       ->setHref('/legalpad/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/macro/application/PhabricatorMacroApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorMacroApplication extends PhabricatorApplication {
     return pht('Image Macros and Memes');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-file-image-o';
   }
 

src/applications/macro/config/PhabricatorMacroConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorMacroConfigOptions
     return pht('Configure Macro.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-file-image-o';
   }
 

src/applications/macro/markup/PhabricatorIconRemarkupRule.php

@@ -54,12 +54,12 @@ final class PhabricatorIconRemarkupRule extends PhutilRemarkupRule {
 
     static $icon_names;
     if (!$icon_names) {
-      $icon_names = array_fuse(PHUIIconView::getFontIcons());
+      $icon_names = array_fuse(PHUIIconView::getIcons());
     }
 
     static $color_names;
     if (!$color_names) {
-      $color_names = array_fuse(PHUIIconView::getFontIconColors());
+      $color_names = array_fuse(PHUIIconView::getIconColors());
     }
 
     if (empty($icon_names['fa-'.$icon])) {

src/applications/macro/query/PhabricatorMacroSearchEngine.php

@@ -196,7 +196,7 @@ final class PhabricatorMacroSearchEngine
       ->setHref('/macro/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/maniphest/application/PhabricatorManiphestApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorManiphestApplication extends PhabricatorApplication {
     return '/maniphest/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-anchor';
   }
 

src/applications/maniphest/config/PhabricatorManiphestConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorManiphestConfigOptions
     return pht('Configure Maniphest.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-anchor';
   }
 

src/applications/maniphest/query/ManiphestTaskSearchEngine.php

@@ -392,7 +392,7 @@ final class ManiphestTaskSearchEngine
       ->setHref('/maniphest/task/edit/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/meta/application/PhabricatorApplicationsApplication.php

@@ -24,7 +24,7 @@ final class PhabricatorApplicationsApplication extends PhabricatorApplication {
     return pht('Explore More Applications');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-globe';
   }
 

src/applications/meta/query/PhabricatorAppSearchEngine.php

@@ -209,7 +209,7 @@ final class PhabricatorAppSearchEngine
       $list = new PHUIObjectItemListView();
 
       foreach ($applications as $application) {
-        $icon = $application->getFontIcon();
+        $icon = $application->getIcon();
         if (!$icon) {
           $icon = 'application';
         }

src/applications/meta/typeahead/PhabricatorApplicationDatasource.php

@@ -28,7 +28,7 @@ final class PhabricatorApplicationDatasource
         continue;
       }
       $name = $application->getName().' '.$application->getShortDescription();
-      $img = 'phui-font-fa phui-icon-view '.$application->getFontIcon();
+      $img = 'phui-font-fa phui-icon-view '.$application->getIcon();
       $results[] = id(new PhabricatorTypeaheadResult())
         ->setName($name)
         ->setURI($uri)

src/applications/meta/view/PhabricatorApplicationLaunchView.php

@@ -113,7 +113,7 @@ final class PhabricatorApplicationLaunchView extends AphrontTagView {
       if ($application->getIconURI()) {
         $styles[] = 'background-image: url('.$application->getIconURI().')';
       } else {
-        $classes[] = $application->getFontIcon();
+        $classes[] = $application->getIcon();
         $classes[] = 'phui-icon-view';
         $classes[] = 'phui-font-fa';
       }

src/applications/metamta/application/PhabricatorMetaMTAApplication.php

@@ -10,7 +10,7 @@ final class PhabricatorMetaMTAApplication extends PhabricatorApplication {
     return '/mail/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-send';
   }
 

src/applications/multimeter/application/PhabricatorMultimeterApplication.php

@@ -11,7 +11,7 @@ final class PhabricatorMultimeterApplication
     return '/multimeter/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-motorcycle';
   }
 

src/applications/notification/application/PhabricatorNotificationsApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorNotificationsApplication extends PhabricatorApplication {
     return pht('Real-Time Updates and Alerts');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-bell';
   }
 

src/applications/nuance/application/PhabricatorNuanceApplication.php

@@ -6,7 +6,7 @@ final class PhabricatorNuanceApplication extends PhabricatorApplication {
     return pht('Nuance');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-fax';
   }
 

src/applications/nuance/controller/NuanceConsoleController.php

@@ -16,14 +16,14 @@ final class NuanceConsoleController extends NuanceController {
       id(new PHUIObjectItemView())
         ->setHeader(pht('Queues'))
         ->setHref($this->getApplicationURI('queue/'))
-        ->setFontIcon('fa-align-left')
+        ->setIcon('fa-align-left')
         ->addAttribute(pht('Manage Nuance queues.')));
 
     $menu->addItem(
       id(new PHUIObjectItemView())
         ->setHeader(pht('Sources'))
         ->setHref($this->getApplicationURI('source/'))
-        ->setFontIcon('fa-filter')
+        ->setIcon('fa-filter')
         ->addAttribute(pht('Manage Nuance sources.')));
 
     $crumbs = $this->buildApplicationCrumbs();

src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorOAuthServerApplication extends PhabricatorApplication {
     return pht('OAuth Login Provider');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-hotel';
   }
 

src/applications/owners/application/PhabricatorOwnersApplication.php

@@ -10,7 +10,7 @@ final class PhabricatorOwnersApplication extends PhabricatorApplication {
     return '/owners/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-gift';
   }
 

src/applications/owners/config/PhabricatorOwnersConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorOwnersConfigOptions
     return pht('Configure Owners.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-gift';
   }
 

src/applications/owners/query/PhabricatorOwnersPackageSearchEngine.php

@@ -162,7 +162,7 @@ final class PhabricatorOwnersPackageSearchEngine
       ->setHref('/owners/edit/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/passphrase/application/PhabricatorPassphraseApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorPassphraseApplication extends PhabricatorApplication {
     return pht('Credential Store');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-user-secret';
   }
 

src/applications/passphrase/query/PassphraseCredentialSearchEngine.php

@@ -118,7 +118,7 @@ final class PassphraseCredentialSearchEngine
       ->setHref('/passphrase/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/paste/application/PhabricatorPasteApplication.php

@@ -10,7 +10,7 @@ final class PhabricatorPasteApplication extends PhabricatorApplication {
     return '/paste/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-paste';
   }
 

src/applications/paste/config/PhabricatorPasteConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorPasteConfigOptions
     return pht('Configure Paste.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-paste';
   }
 

src/applications/paste/query/PhabricatorPasteSearchEngine.php

@@ -210,7 +210,7 @@ final class PhabricatorPasteSearchEngine
       ->setHref('/paste/create/')
       ->setColor(PHUIButtonView::GREEN);
 
-    $icon = $this->getApplication()->getFontIcon();
+    $icon = $this->getApplication()->getIcon();
     $app_name =  $this->getApplication()->getName();
     $view = id(new PHUIBigInfoView())
       ->setIcon($icon)

src/applications/people/application/PhabricatorPeopleApplication.php

@@ -18,7 +18,7 @@ final class PhabricatorPeopleApplication extends PhabricatorApplication {
     return "\xE2\x99\x9F";
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-users';
   }
 

src/applications/people/config/PhabricatorUserConfigOptions.php

@@ -11,7 +11,7 @@ final class PhabricatorUserConfigOptions
     return pht('User profiles configuration.');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-users';
   }
 

src/applications/phame/application/PhabricatorPhameApplication.php

@@ -10,7 +10,7 @@ final class PhabricatorPhameApplication extends PhabricatorApplication {
     return '/phame/';
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-star';
   }
 

src/applications/phid/type/PhabricatorPHIDType.php

@@ -25,7 +25,7 @@ abstract class PhabricatorPHIDType extends Phobject {
     $application_class = $this->getPHIDTypeApplicationClass();
     if ($application_class) {
       $application = newv($application_class, array());
-      return $application->getFontIcon();
+      return $application->getIcon();
     }
 
     return null;

src/applications/phlux/application/PhabricatorPhluxApplication.php

@@ -14,7 +14,7 @@ final class PhabricatorPhluxApplication extends PhabricatorApplication {
     return pht('Key/Value Configuration Store');
   }
 
-  public function getFontIcon() {
+  public function getIcon() {
     return 'fa-copy';
   }