diff --git a/src/applications/almanac/application/PhabricatorAlmanacApplication.php b/src/applications/almanac/application/PhabricatorAlmanacApplication.php
index b399bba53e..4ef75aca08 100644
--- a/src/applications/almanac/application/PhabricatorAlmanacApplication.php
+++ b/src/applications/almanac/application/PhabricatorAlmanacApplication.php
@@ -1,92 +1,88 @@
 <?php
 
 final class PhabricatorAlmanacApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/almanac/';
   }
 
   public function getName() {
     return pht('Almanac');
   }
 
   public function getShortDescription() {
     return pht('Service Directory');
   }
 
-  public function getIconName() {
-    return 'almanac';
-  }
-
   public function getFontIcon() {
     return 'fa-server';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\x82";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Almanac User Guide');
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRoutes() {
     return array(
       '/almanac/' => array(
         '' => 'AlmanacConsoleController',
         'service/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'AlmanacServiceListController',
           'edit/(?:(?P<id>\d+)/)?' => 'AlmanacServiceEditController',
           'view/(?P<name>[^/]+)/' => 'AlmanacServiceViewController',
         ),
         'device/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'AlmanacDeviceListController',
           'edit/(?:(?P<id>\d+)/)?' => 'AlmanacDeviceEditController',
           'view/(?P<name>[^/]+)/' => 'AlmanacDeviceViewController',
         ),
         'interface/' => array(
           'edit/(?:(?P<id>\d+)/)?' => 'AlmanacInterfaceEditController',
         ),
         'binding/' => array(
           'edit/(?:(?P<id>\d+)/)?' => 'AlmanacBindingEditController',
           '(?P<id>\d+)/' => 'AlmanacBindingViewController',
         ),
         'network/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'AlmanacNetworkListController',
           'edit/(?:(?P<id>\d+)/)?' => 'AlmanacNetworkEditController',
           '(?P<id>\d+)/' => 'AlmanacNetworkViewController',
         ),
         'property/' => array(
           'edit/' => 'AlmanacPropertyEditController',
           'delete/' => 'AlmanacPropertyDeleteController',
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       AlmanacCreateServicesCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
       AlmanacCreateDevicesCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
       AlmanacCreateNetworksCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
       AlmanacCreateClusterServicesCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 
 }
diff --git a/src/applications/audit/application/PhabricatorAuditApplication.php b/src/applications/audit/application/PhabricatorAuditApplication.php
index 6cb960f24d..7b611d0969 100644
--- a/src/applications/audit/application/PhabricatorAuditApplication.php
+++ b/src/applications/audit/application/PhabricatorAuditApplication.php
@@ -1,98 +1,94 @@
 <?php
 
 final class PhabricatorAuditApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/audit/';
   }
 
-  public function getIconName() {
-    return 'audit';
-  }
-
   public function getFontIcon() {
     return 'fa-check-circle-o';
   }
 
   public function getName() {
     return pht('Audit');
   }
 
   public function getShortDescription() {
     return pht('Browse and Audit Commits');
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return true;
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Audit User Guide');
   }
 
   public function getEventListeners() {
     return array(
       new AuditActionMenuEventListener(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/audit/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorAuditListController',
         'addcomment/' => 'PhabricatorAuditAddCommentController',
         'preview/(?P<id>[1-9]\d*)/' => 'PhabricatorAuditPreviewController',
       ),
     );
   }
 
   public function getApplicationOrder() {
     return 0.130;
   }
 
   public function loadStatus(PhabricatorUser $user) {
     $status = array();
 
     $phids = PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);
 
     $query = id(new DiffusionCommitQuery())
       ->setViewer($user)
       ->withAuthorPHIDs(array($user->getPHID()))
       ->withAuditStatus(DiffusionCommitQuery::AUDIT_STATUS_CONCERN)
       ->setLimit(self::MAX_STATUS_ITEMS);
     $commits = $query->execute();
 
     $count = count($commits);
     $count_str = self::formatStatusCount(
       $count,
       '%s Problem Commits',
       '%d Problem Commit(s)');
     $type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)
       ->setText($count_str)
       ->setCount($count);
 
     $query = id(new DiffusionCommitQuery())
       ->setViewer($user)
       ->withAuditorPHIDs($phids)
       ->withAuditStatus(DiffusionCommitQuery::AUDIT_STATUS_OPEN)
       ->withAuditAwaitingUser($user)
       ->setLimit(self::MAX_STATUS_ITEMS);
     $commits = $query->execute();
 
     $count = count($commits);
     $count_str = self::formatStatusCount(
       $count,
       '%s Commits Awaiting Audit',
       '%d Commit(s) Awaiting Audit');
     $type = PhabricatorApplicationStatusView::TYPE_WARNING;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)
       ->setText($count_str)
       ->setCount($count);
 
     return $status;
   }
 
 }
diff --git a/src/applications/auth/application/PhabricatorAuthApplication.php b/src/applications/auth/application/PhabricatorAuthApplication.php
index 5c6e7a5d4d..70d1966fc2 100644
--- a/src/applications/auth/application/PhabricatorAuthApplication.php
+++ b/src/applications/auth/application/PhabricatorAuthApplication.php
@@ -1,158 +1,154 @@
 <?php
 
 final class PhabricatorAuthApplication extends PhabricatorApplication {
 
   public function canUninstall() {
     return false;
   }
 
   public function getBaseURI() {
     return '/auth/';
   }
 
-  public function getIconName() {
-    return 'authentication';
-  }
-
   public function getFontIcon() {
     return 'fa-key';
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return $viewer->getIsAdmin();
   }
 
   public function getName() {
     return pht('Auth');
   }
 
   public function getShortDescription() {
     return pht('Login/Registration');
   }
 
   public function getHelpURI() {
     // NOTE: Although reasonable help exists for this in "Configuring Accounts
     // and Registration", specifying a help URI here means we get the menu
     // item in all the login/link interfaces, which is confusing and not
     // helpful.
 
     // TODO: Special case this, or split the auth and auth administration
     // applications?
 
     return null;
   }
 
   public function buildMainMenuItems(
     PhabricatorUser $user,
     PhabricatorController $controller = null) {
 
     $items = array();
 
     if ($user->isLoggedIn()) {
       $item = id(new PHUIListItemView())
         ->addClass('core-menu-item')
         ->setName(pht('Log Out'))
         ->setIcon('fa-sign-out')
         ->setWorkflow(true)
         ->setHref('/logout/')
         ->setSelected(($controller instanceof PhabricatorLogoutController))
         ->setAural(pht('Log Out'))
         ->setOrder(900);
       $items[] = $item;
     } else {
       if ($controller instanceof PhabricatorAuthController) {
         // Don't show the "Login" item on auth controllers, since they're
         // generally all related to logging in anyway.
       } else {
         $uri = new PhutilURI('/auth/start/');
         if ($controller) {
           $path = $controller->getRequest()->getPath();
           $uri->setQueryParam('next', $path);
         }
         $item = id(new PHUIListItemView())
           ->addClass('core-menu-item')
           ->setName(pht('Log In'))
           // TODO: Login icon?
           ->setIcon('fa-sign-in')
           ->setHref($uri)
           ->setAural(pht('Log In'))
           ->setOrder(900);
         $items[] = $item;
       }
     }
 
     return $items;
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function getRoutes() {
     return array(
       '/auth/' => array(
         '' => 'PhabricatorAuthListController',
         'config/' => array(
           'new/' => 'PhabricatorAuthNewController',
           'new/(?P<className>[^/]+)/' => 'PhabricatorAuthEditController',
           'edit/(?P<id>\d+)/' => 'PhabricatorAuthEditController',
           '(?P<action>enable|disable)/(?P<id>\d+)/'
             => 'PhabricatorAuthDisableController',
         ),
         'login/(?P<pkey>[^/]+)/(?:(?P<extra>[^/]+)/)?'
           => 'PhabricatorAuthLoginController',
         'register/(?:(?P<akey>[^/]+)/)?' => 'PhabricatorAuthRegisterController',
         'start/' => 'PhabricatorAuthStartController',
         'validate/' => 'PhabricatorAuthValidateController',
         'finish/' => 'PhabricatorAuthFinishController',
         'unlink/(?P<pkey>[^/]+)/' => 'PhabricatorAuthUnlinkController',
         '(?P<action>link|refresh)/(?P<pkey>[^/]+)/'
           => 'PhabricatorAuthLinkController',
         'confirmlink/(?P<akey>[^/]+)/'
           => 'PhabricatorAuthConfirmLinkController',
         'session/terminate/(?P<id>[^/]+)/'
           => 'PhabricatorAuthTerminateSessionController',
         'token/revoke/(?P<id>[^/]+)/'
           => 'PhabricatorAuthRevokeTokenController',
         'session/downgrade/'
           => 'PhabricatorAuthDowngradeSessionController',
         'multifactor/'
           => 'PhabricatorAuthNeedsMultiFactorController',
         'sshkey/' => array(
           'generate/' => 'PhabricatorAuthSSHKeyGenerateController',
           'upload/' => 'PhabricatorAuthSSHKeyEditController',
           'edit/(?P<id>\d+)/' => 'PhabricatorAuthSSHKeyEditController',
           'delete/(?P<id>\d+)/' => 'PhabricatorAuthSSHKeyDeleteController',
         ),
       ),
 
       '/oauth/(?P<provider>\w+)/login/'
         => 'PhabricatorAuthOldOAuthRedirectController',
 
       '/login/' => array(
         '' => 'PhabricatorAuthStartController',
         'email/' => 'PhabricatorEmailLoginController',
         'once/'.
           '(?P<type>[^/]+)/'.
           '(?P<id>\d+)/'.
           '(?P<key>[^/]+)/'.
           '(?:(?P<emailID>\d+)/)?' => 'PhabricatorAuthOneTimeLoginController',
         'refresh/' => 'PhabricatorRefreshCSRFController',
         'mustverify/' => 'PhabricatorMustVerifyEmailController',
       ),
 
       '/emailverify/(?P<code>[^/]+)/'
         => 'PhabricatorEmailVerificationController',
 
       '/logout/' => 'PhabricatorLogoutController',
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       AuthManageProvidersCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 }
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
index 44598fb030..bcfcce952d 100644
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -1,541 +1,537 @@
 <?php
 
 /**
  * @task  info  Application Information
  * @task  ui    UI Integration
  * @task  uri   URI Routing
  * @task  mail  Email integration
  * @task  fact  Fact Integration
  * @task  meta  Application Management
  */
 abstract class PhabricatorApplication implements PhabricatorPolicyInterface {
 
   const MAX_STATUS_ITEMS      = 100;
 
   const GROUP_CORE            = 'core';
   const GROUP_UTILITIES       = 'util';
   const GROUP_ADMIN           = 'admin';
   const GROUP_DEVELOPER       = 'developer';
 
   public static function getApplicationGroups() {
     return array(
       self::GROUP_CORE          => pht('Core Applications'),
       self::GROUP_UTILITIES     => pht('Utilities'),
       self::GROUP_ADMIN         => pht('Administration'),
       self::GROUP_DEVELOPER     => pht('Developer Tools'),
     );
   }
 
 
 /* -(  Application Information  )-------------------------------------------- */
 
   public abstract function getName();
 
   public function getShortDescription() {
     return $this->getName().' Application';
   }
 
   public function isInstalled() {
     if (!$this->canUninstall()) {
       return true;
     }
 
     $prototypes = PhabricatorEnv::getEnvConfig('phabricator.show-prototypes');
     if (!$prototypes && $this->isPrototype()) {
       return false;
     }
 
     $uninstalled = PhabricatorEnv::getEnvConfig(
       'phabricator.uninstalled-applications');
 
     return empty($uninstalled[get_class($this)]);
   }
 
 
   public function isPrototype() {
     return false;
   }
 
 
   /**
    * Return `true` if this application should never appear in application lists
    * in the UI. Primarily intended for unit test applications or other
    * pseudo-applications.
    *
    * Few applications should be unlisted. For most applications, use
    * @{method:isLaunchable} to hide them from main launch views instead.
    *
    * @return bool True to remove application from UI lists.
    */
   public function isUnlisted() {
     return false;
   }
 
 
   /**
    * Return `true` if this application is a normal application with a base
    * URI and a web interface.
    *
    * Launchable applications can be pinned to the home page, and show up in the
    * "Launcher" view of the Applications application. Making an application
    * unlauncahble prevents pinning and hides it from this view.
    *
    * Usually, an application should be marked unlaunchable if:
    *
    *   - it is available on every page anyway (like search); or
    *   - it does not have a web interface (like subscriptions); or
    *   - it is still pre-release and being intentionally buried.
    *
    * To hide applications more completely, use @{method:isUnlisted}.
    *
    * @return bool True if the application is launchable.
    */
   public function isLaunchable() {
     return true;
   }
 
 
   /**
    * Return `true` if this application should be pinned by default.
    *
    * Users who have not yet set preferences see a default list of applications.
    *
    * @param PhabricatorUser User viewing the pinned application list.
    * @return bool True if this application should be pinned by default.
    */
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return false;
   }
 
 
   /**
    * Returns true if an application is first-party (developed by Phacility)
    * and false otherwise.
    *
    * @return bool True if this application is developed by Phacility.
    */
   final public function isFirstParty() {
     $where = id(new ReflectionClass($this))->getFileName();
     $root = phutil_get_library_root('phabricator');
 
     if (!Filesystem::isDescendant($where, $root)) {
       return false;
     }
 
     if (Filesystem::isDescendant($where, $root.'/extensions')) {
       return false;
     }
 
     return true;
   }
 
   public function canUninstall() {
     return true;
   }
 
   public function getPHID() {
     return 'PHID-APPS-'.get_class($this);
   }
 
   public function getTypeaheadURI() {
     return $this->isLaunchable() ? $this->getBaseURI() : null;
   }
 
   public function getBaseURI() {
     return null;
   }
 
   public function getApplicationURI($path = '') {
     return $this->getBaseURI().ltrim($path, '/');
   }
 
   public function getIconURI() {
     return null;
   }
 
-  public function getIconName() {
-    return 'application';
-  }
-
   public function getFontIcon() {
     return 'fa-puzzle-piece';
   }
 
   public function getApplicationOrder() {
     return PHP_INT_MAX;
   }
 
   public function getApplicationGroup() {
     return self::GROUP_CORE;
   }
 
   public function getTitleGlyph() {
     return null;
   }
 
   public function getHelpURI() {
     return null;
   }
 
   public function getOverview() {
     return null;
   }
 
   public function getEventListeners() {
     return array();
   }
 
   public function getRemarkupRules() {
     return array();
   }
 
 
 /* -(  URI Routing  )-------------------------------------------------------- */
 
 
   public function getRoutes() {
     return array();
   }
 
 
 /* -(  Email Integration  )-------------------------------------------------- */
 
 
   public function supportsEmailIntegration() {
     return false;
   }
 
   protected function getInboundEmailSupportLink() {
     return PhabricatorEnv::getDocLink('Configuring Inbound Email');
   }
 
   public function getAppEmailBlurb() {
     throw new Exception('Not Implemented.');
   }
 
 
 /* -(  Fact Integration  )--------------------------------------------------- */
 
 
   public function getFactObjectsForAnalysis() {
     return array();
   }
 
 
 /* -(  UI Integration  )----------------------------------------------------- */
 
 
   /**
    * Render status elements (like "3 Waiting Reviews") for application list
    * views. These provide a way to alert users to new or pending action items
    * in applications.
    *
    * @param PhabricatorUser Viewing user.
    * @return list<PhabricatorApplicationStatusView> Application status elements.
    * @task ui
    */
   public function loadStatus(PhabricatorUser $user) {
     return array();
   }
 
   /**
    * @return string
    * @task ui
    */
   public static function formatStatusCount(
     $count,
     $limit_string = '%s',
     $base_string = '%d') {
     if ($count == self::MAX_STATUS_ITEMS) {
       $count_str = pht($limit_string, ($count - 1).'+');
     } else {
       $count_str = pht($base_string, $count);
     }
     return $count_str;
   }
 
 
   /**
    * You can provide an optional piece of flavor text for the application. This
    * is currently rendered in application launch views if the application has no
    * status elements.
    *
    * @return string|null Flavor text.
    * @task ui
    */
   public function getFlavorText() {
     return null;
   }
 
 
   /**
    * Build items for the main menu.
    *
    * @param  PhabricatorUser    The viewing user.
    * @param  AphrontController  The current controller. May be null for special
    *                            pages like 404, exception handlers, etc.
    * @return list<PHUIListItemView> List of menu items.
    * @task ui
    */
   public function buildMainMenuItems(
     PhabricatorUser $user,
     PhabricatorController $controller = null) {
     return array();
   }
 
 
   /**
    * Build extra items for the main menu. Generally, this is used to render
    * static dropdowns.
    *
    * @param  PhabricatorUser    The viewing user.
    * @param  AphrontController  The current controller. May be null for special
    *                            pages like 404, exception handlers, etc.
    * @return view               List of menu items.
    * @task ui
    */
   public function buildMainMenuExtraNodes(
     PhabricatorUser $viewer,
     PhabricatorController $controller = null) {
     return array();
   }
 
 
   /**
    * Build items for the "quick create" menu.
    *
    * @param   PhabricatorUser         The viewing user.
    * @return  list<PHUIListItemView>  List of menu items.
    */
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     return array();
   }
 
 
 /* -(  Application Management  )--------------------------------------------- */
 
 
   public static function getByClass($class_name) {
     $selected = null;
     $applications = PhabricatorApplication::getAllApplications();
 
     foreach ($applications as $application) {
       if (get_class($application) == $class_name) {
         $selected = $application;
         break;
       }
     }
 
     if (!$selected) {
       throw new Exception("No application '{$class_name}'!");
     }
 
     return $selected;
   }
 
   public static function getAllApplications() {
     static $applications;
 
     if ($applications === null) {
       $apps = id(new PhutilSymbolLoader())
         ->setAncestorClass(__CLASS__)
         ->loadObjects();
 
       // Reorder the applications into "application order". Notably, this
       // ensures their event handlers register in application order.
       $apps = msort($apps, 'getApplicationOrder');
       $apps = mgroup($apps, 'getApplicationGroup');
 
       $group_order = array_keys(self::getApplicationGroups());
       $apps = array_select_keys($apps, $group_order) + $apps;
 
       $apps = array_mergev($apps);
 
       $applications = $apps;
     }
 
     return $applications;
   }
 
   public static function getAllInstalledApplications() {
     $all_applications = self::getAllApplications();
     $apps = array();
     foreach ($all_applications as $app) {
       if (!$app->isInstalled()) {
         continue;
       }
 
       $apps[] = $app;
     }
 
     return $apps;
   }
 
 
   /**
    * Determine if an application is installed, by application class name.
    *
    * To check if an application is installed //and// available to a particular
    * viewer, user @{method:isClassInstalledForViewer}.
    *
    * @param string  Application class name.
    * @return bool   True if the class is installed.
    * @task meta
    */
   public static function isClassInstalled($class) {
     return self::getByClass($class)->isInstalled();
   }
 
 
   /**
    * Determine if an application is installed and available to a viewer, by
    * application class name.
    *
    * To check if an application is installed at all, use
    * @{method:isClassInstalled}.
    *
    * @param string Application class name.
    * @param PhabricatorUser Viewing user.
    * @return bool True if the class is installed for the viewer.
    * @task meta
    */
   public static function isClassInstalledForViewer(
     $class,
     PhabricatorUser $viewer) {
 
     if (!self::isClassInstalled($class)) {
       return false;
     }
 
     return PhabricatorPolicyFilter::hasCapability(
       $viewer,
       self::getByClass($class),
       PhabricatorPolicyCapability::CAN_VIEW);
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array_merge(
       array(
         PhabricatorPolicyCapability::CAN_VIEW,
         PhabricatorPolicyCapability::CAN_EDIT,
       ),
       array_keys($this->getCustomCapabilities()));
   }
 
   public function getPolicy($capability) {
     $default = $this->getCustomPolicySetting($capability);
     if ($default) {
       return $default;
     }
 
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return PhabricatorPolicies::getMostOpenPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return PhabricatorPolicies::POLICY_ADMIN;
       default:
         $spec = $this->getCustomCapabilitySpecification($capability);
         return idx($spec, 'default', PhabricatorPolicies::POLICY_USER);
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
   public function describeAutomaticCapability($capability) {
     return null;
   }
 
 
 /* -(  Policies  )----------------------------------------------------------- */
 
   protected function getCustomCapabilities() {
     return array();
   }
 
   private function getCustomPolicySetting($capability) {
     if (!$this->isCapabilityEditable($capability)) {
       return null;
     }
 
     $policy_locked = PhabricatorEnv::getEnvConfig('policy.locked');
     if (isset($policy_locked[$capability])) {
       return $policy_locked[$capability];
     }
 
     $config = PhabricatorEnv::getEnvConfig('phabricator.application-settings');
 
     $app = idx($config, $this->getPHID());
     if (!$app) {
       return null;
     }
 
     $policy = idx($app, 'policy');
     if (!$policy) {
       return null;
     }
 
     return idx($policy, $capability);
   }
 
 
   private function getCustomCapabilitySpecification($capability) {
     $custom = $this->getCustomCapabilities();
     if (!isset($custom[$capability])) {
       throw new Exception("Unknown capability '{$capability}'!");
     }
     return $custom[$capability];
   }
 
   public function getCapabilityLabel($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return pht('Can Use Application');
       case PhabricatorPolicyCapability::CAN_EDIT:
         return pht('Can Configure Application');
     }
 
     $capobj = PhabricatorPolicyCapability::getCapabilityByKey($capability);
     if ($capobj) {
       return $capobj->getCapabilityName();
     }
 
     return null;
   }
 
   public function isCapabilityEditable($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->canUninstall();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return false;
       default:
         $spec = $this->getCustomCapabilitySpecification($capability);
         return idx($spec, 'edit', true);
     }
   }
 
   public function getCapabilityCaption($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         if (!$this->canUninstall()) {
           return pht(
             'This application is required for Phabricator to operate, so all '.
             'users must have access to it.');
         } else {
           return null;
         }
       case PhabricatorPolicyCapability::CAN_EDIT:
         return null;
       default:
         $spec = $this->getCustomCapabilitySpecification($capability);
         return idx($spec, 'caption');
     }
   }
 
 }
diff --git a/src/applications/calendar/application/PhabricatorCalendarApplication.php b/src/applications/calendar/application/PhabricatorCalendarApplication.php
index bc92475fc8..098e58795e 100644
--- a/src/applications/calendar/application/PhabricatorCalendarApplication.php
+++ b/src/applications/calendar/application/PhabricatorCalendarApplication.php
@@ -1,72 +1,68 @@
 <?php
 
 final class PhabricatorCalendarApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Calendar');
   }
 
   public function getShortDescription() {
     return pht('Upcoming Events');
   }
 
   public function getFlavorText() {
     return pht('Never miss an episode ever again.');
   }
 
   public function getBaseURI() {
     return '/calendar/';
   }
 
-  public function getIconName() {
-    return 'calendar';
-  }
-
   public function getFontIcon() {
     return 'fa-calendar';
   }
 
   public function getTitleGlyph() {
     // Unicode has a calendar character but it's in some distant code plane,
     // use "keyboard" since it looks vaguely similar.
     return "\xE2\x8C\xA8";
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRoutes() {
     return array(
       '/calendar/' => array(
         '' => 'PhabricatorCalendarViewController',
         'all/' => 'PhabricatorCalendarBrowseController',
         'event/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?'
             => 'PhabricatorCalendarEventListController',
           'create/'
             => 'PhabricatorCalendarEventEditController',
           'edit/(?P<id>[1-9]\d*)/'
             => 'PhabricatorCalendarEventEditController',
           'delete/(?P<id>[1-9]\d*)/'
             => 'PhabricatorCalendarEventDeleteController',
           'view/(?P<id>[1-9]\d*)/'
             => 'PhabricatorCalendarEventViewController',
         ),
       ),
     );
   }
 
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     $items = array();
 
     $item = id(new PHUIListItemView())
       ->setName(pht('Calendar Event'))
       ->setIcon('fa-calendar')
       ->setHref($this->getBaseURI().'event/create/');
     $items[] = $item;
 
     return $items;
   }
 
 }
diff --git a/src/applications/chatlog/application/PhabricatorChatLogApplication.php b/src/applications/chatlog/application/PhabricatorChatLogApplication.php
index 14dd5fca4f..74d6d8b645 100644
--- a/src/applications/chatlog/application/PhabricatorChatLogApplication.php
+++ b/src/applications/chatlog/application/PhabricatorChatLogApplication.php
@@ -1,47 +1,43 @@
 <?php
 
 final class PhabricatorChatLogApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/chatlog/';
   }
 
   public function getName() {
     return pht('ChatLog');
   }
 
   public function getShortDescription() {
     return pht('IRC Logs');
   }
 
-  public function getIconName() {
-    return 'chatlog';
-  }
-
   public function getFontIcon() {
     return 'fa-coffee';
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getTitleGlyph() {
     return "\xE0\xBC\x84";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
  public function getRoutes() {
     return array(
       '/chatlog/' => array(
        '' => 'PhabricatorChatLogChannelListController',
        'channel/(?P<channelID>[^/]+)/'
           => 'PhabricatorChatLogChannelLogController',
        ),
     );
   }
 
 }
diff --git a/src/applications/conduit/application/PhabricatorConduitApplication.php b/src/applications/conduit/application/PhabricatorConduitApplication.php
index 9c1c1de70a..8b2048507b 100644
--- a/src/applications/conduit/application/PhabricatorConduitApplication.php
+++ b/src/applications/conduit/application/PhabricatorConduitApplication.php
@@ -1,63 +1,59 @@
 <?php
 
 final class PhabricatorConduitApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/conduit/';
   }
 
-  public function getIconName() {
-    return 'conduit';
-  }
-
   public function getFontIcon() {
     return 'fa-tty';
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Conduit Technical Documentation');
   }
 
   public function getName() {
     return pht('Conduit');
   }
 
   public function getShortDescription() {
     return pht('Developer API');
   }
 
   public function getTitleGlyph() {
     return "\xE2\x87\xB5";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_DEVELOPER;
   }
 
   public function getApplicationOrder() {
     return 0.100;
   }
 
   public function getRoutes() {
     return array(
       '/conduit/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorConduitListController',
         'method/(?P<method>[^/]+)/' => 'PhabricatorConduitConsoleController',
         'log/' => 'PhabricatorConduitLogController',
         'log/view/(?P<view>[^/]+)/' => 'PhabricatorConduitLogController',
         'token/' => 'PhabricatorConduitTokenController',
         'token/edit/(?:(?P<id>\d+)/)?' =>
           'PhabricatorConduitTokenEditController',
         'token/terminate/(?:(?P<id>\d+)/)?' =>
           'PhabricatorConduitTokenTerminateController',
         'login/' => 'PhabricatorConduitTokenHandshakeController',
       ),
       '/api/(?P<method>[^/]+)' => 'PhabricatorConduitAPIController',
     );
   }
 
 }
diff --git a/src/applications/config/application/PhabricatorConfigApplication.php b/src/applications/config/application/PhabricatorConfigApplication.php
index e79925ef7c..0b3b6d4626 100644
--- a/src/applications/config/application/PhabricatorConfigApplication.php
+++ b/src/applications/config/application/PhabricatorConfigApplication.php
@@ -1,66 +1,62 @@
 <?php
 
 final class PhabricatorConfigApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/config/';
   }
 
-  public function getIconName() {
-    return 'setup';
-  }
-
   public function getFontIcon() {
     return 'fa-sliders';
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return $viewer->getIsAdmin();
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\xBA";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getName() {
     return 'Config';
   }
 
   public function getShortDescription() {
     return pht('Configure Phabricator');
   }
 
   public function getRoutes() {
     return array(
       '/config/' => array(
         '' => 'PhabricatorConfigListController',
         'all/' => 'PhabricatorConfigAllController',
         'history/' => 'PhabricatorConfigHistoryController',
         'edit/(?P<key>[\w\.\-]+)/' => 'PhabricatorConfigEditController',
         'group/(?P<key>[^/]+)/' => 'PhabricatorConfigGroupController',
         'welcome/' => 'PhabricatorConfigWelcomeController',
         'database/'.
           '(?:(?P<database>[^/]+)/'.
           '(?:(?P<table>[^/]+)/'.
           '(?:(?:col/(?P<column>[^/]+)|key/(?P<key>[^/]+))/)?)?)?'
           => 'PhabricatorConfigDatabaseStatusController',
         'dbissue/' => 'PhabricatorConfigDatabaseIssueController',
         '(?P<verb>ignore|unignore)/(?P<key>[^/]+)/'
           => 'PhabricatorConfigIgnoreController',
         'issue/' => array(
           '' => 'PhabricatorConfigIssueListController',
           '(?P<key>[^/]+)/' => 'PhabricatorConfigIssueViewController',
         ),
       ),
     );
   }
 
 }
diff --git a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
index 8d5c4c700e..6220d169dc 100644
--- a/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
+++ b/src/applications/conpherence/application/PhabricatorConpherenceApplication.php
@@ -1,63 +1,59 @@
 <?php
 
 final class PhabricatorConpherenceApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/conpherence/';
   }
 
   public function getName() {
     return pht('Conpherence');
   }
 
   public function getShortDescription() {
     return pht('Send Messages');
   }
 
-  public function getIconName() {
-    return 'conpherence';
-  }
-
   public function getFontIcon() {
     return 'fa-comments';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9C\x86";
   }
 
   public function getEventListeners() {
     return array(
       new ConpherenceActionMenuEventListener(),
       new ConpherenceHovercardEventListener(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/conpherence/' => array(
         ''                         => 'ConpherenceListController',
         'thread/(?P<id>[1-9]\d*)/' => 'ConpherenceListController',
         '(?P<id>[1-9]\d*)/'        => 'ConpherenceViewController',
         'new/'                     => 'ConpherenceNewController',
         'panel/'                   => 'ConpherenceNotificationPanelController',
         'widget/(?P<id>[1-9]\d*)/' => 'ConpherenceWidgetController',
         'update/(?P<id>[1-9]\d*)/' => 'ConpherenceUpdateController',
       ),
     );
   }
 
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     $items = array();
 
     $item = id(new PHUIListItemView())
       ->setName(pht('Conpherence Thread'))
       ->setIcon('fa-comments')
       ->setWorkflow(true)
       ->setHref($this->getBaseURI().'new/');
     $items[] = $item;
 
     return $items;
   }
 
 }
diff --git a/src/applications/countdown/application/PhabricatorCountdownApplication.php b/src/applications/countdown/application/PhabricatorCountdownApplication.php
index dec35a2254..5c00661bd0 100644
--- a/src/applications/countdown/application/PhabricatorCountdownApplication.php
+++ b/src/applications/countdown/application/PhabricatorCountdownApplication.php
@@ -1,63 +1,59 @@
 <?php
 
 final class PhabricatorCountdownApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/countdown/';
   }
 
-  public function getIconName() {
-    return 'countdown';
-  }
-
   public function getFontIcon() {
     return 'fa-rocket';
   }
 
   public function getName() {
     return pht('Countdown');
   }
 
   public function getShortDescription() {
     return pht('Countdown to Events');
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9A\xB2";
   }
 
   public function getFlavorText() {
     return pht('Utilize the full capabilities of your ALU.');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getRemarkupRules() {
     return array(
       new PhabricatorCountdownRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/countdown/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorCountdownListController',
         '(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownViewController',
         'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhabricatorCountdownEditController',
         'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorCountdownDeleteController',
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       PhabricatorCountdownDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for new countdowns.'),
       ),
     );
   }
 
 }
diff --git a/src/applications/daemon/application/PhabricatorDaemonsApplication.php b/src/applications/daemon/application/PhabricatorDaemonsApplication.php
index 40bc42bd74..f7f3cb77ee 100644
--- a/src/applications/daemon/application/PhabricatorDaemonsApplication.php
+++ b/src/applications/daemon/application/PhabricatorDaemonsApplication.php
@@ -1,57 +1,53 @@
 <?php
 
 final class PhabricatorDaemonsApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Daemons');
   }
 
   public function getShortDescription() {
     return pht('Manage Phabricator Daemons');
   }
 
   public function getBaseURI() {
     return '/daemon/';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\xAF";
   }
 
-  public function getIconName() {
-    return 'daemon';
-  }
-
   public function getFontIcon() {
     return 'fa-pied-piper-alt';
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getEventListeners() {
     return array(
       new PhabricatorDaemonEventListener(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/daemon/' => array(
         '' => 'PhabricatorDaemonConsoleController',
         'task/(?P<id>[1-9]\d*)/' => 'PhabricatorWorkerTaskDetailController',
         'log/' => array(
           '' => 'PhabricatorDaemonLogListController',
           '(?P<id>[1-9]\d*)/' => 'PhabricatorDaemonLogViewController',
         ),
         'event/(?P<id>[1-9]\d*)/' => 'PhabricatorDaemonLogEventViewController',
       ),
     );
   }
 
 }
diff --git a/src/applications/dashboard/application/PhabricatorDashboardApplication.php b/src/applications/dashboard/application/PhabricatorDashboardApplication.php
index 8fe5319de7..1e76c1e57b 100644
--- a/src/applications/dashboard/application/PhabricatorDashboardApplication.php
+++ b/src/applications/dashboard/application/PhabricatorDashboardApplication.php
@@ -1,66 +1,62 @@
 <?php
 
 final class PhabricatorDashboardApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Dashboards');
   }
 
   public function getBaseURI() {
     return '/dashboard/';
   }
 
   public function getShortDescription() {
     return pht('Create Custom Pages');
   }
 
-  public function getIconName() {
-    return 'fancyhome';
-  }
-
   public function getFontIcon() {
     return 'fa-dashboard';
   }
 
   public function getRoutes() {
     return array(
       '/W(?P<id>\d+)' => 'PhabricatorDashboardPanelViewController',
       '/dashboard/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorDashboardListController',
         'view/(?P<id>\d+)/' => 'PhabricatorDashboardViewController',
         'manage/(?P<id>\d+)/' => 'PhabricatorDashboardManageController',
         'history/(?P<id>\d+)/' => 'PhabricatorDashboardHistoryController',
         'create/' => 'PhabricatorDashboardEditController',
         'copy/(?:(?P<id>\d+)/)?' => 'PhabricatorDashboardCopyController',
         'edit/(?:(?P<id>\d+)/)?' => 'PhabricatorDashboardEditController',
         'install/(?P<id>\d+)/' => 'PhabricatorDashboardInstallController',
         'uninstall/(?P<id>\d+)/' => 'PhabricatorDashboardUninstallController',
         'addpanel/(?P<id>\d+)/' => 'PhabricatorDashboardAddPanelController',
         'movepanel/(?P<id>\d+)/' => 'PhabricatorDashboardMovePanelController',
         'removepanel/(?P<id>\d+)/'
           => 'PhabricatorDashboardRemovePanelController',
         'panel/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?'
             => 'PhabricatorDashboardPanelListController',
           'create/' => 'PhabricatorDashboardPanelEditController',
           'edit/(?:(?P<id>\d+)/)?' => 'PhabricatorDashboardPanelEditController',
           'render/(?P<id>\d+)/' => 'PhabricatorDashboardPanelRenderController',
           'archive/(?P<id>\d+)/'
             => 'PhabricatorDashboardPanelArchiveController',
         ),
       ),
     );
   }
 
   public function getRemarkupRules() {
     return array(
       new PhabricatorDashboardRemarkupRule(),
     );
   }
 
   public function canUninstall() {
     return false;
   }
 
 }
diff --git a/src/applications/differential/application/PhabricatorDifferentialApplication.php b/src/applications/differential/application/PhabricatorDifferentialApplication.php
index af9cbd477c..a510bb8f26 100644
--- a/src/applications/differential/application/PhabricatorDifferentialApplication.php
+++ b/src/applications/differential/application/PhabricatorDifferentialApplication.php
@@ -1,189 +1,185 @@
 <?php
 
 final class PhabricatorDifferentialApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/differential/';
   }
 
   public function getName() {
     return pht('Differential');
   }
 
   public function getShortDescription() {
     return pht('Review Code');
   }
 
-  public function getIconName() {
-    return 'differential';
-  }
-
   public function getFontIcon() {
     return 'fa-cog';
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return true;
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Differential User Guide');
   }
 
   public function getFactObjectsForAnalysis() {
     return array(
       new DifferentialRevision(),
     );
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9A\x99";
   }
 
   public function getEventListeners() {
     return array(
       new DifferentialActionMenuEventListener(),
       new DifferentialHovercardEventListener(),
       new DifferentialLandingActionMenuEventListener(),
     );
   }
 
   public function getOverview() {
     return pht(<<<EOTEXT
 Differential is a **code review application** which allows engineers to review,
 discuss and approve changes to software.
 EOTEXT
 );
   }
 
   public function getRoutes() {
     return array(
       '/D(?P<id>[1-9]\d*)' => 'DifferentialRevisionViewController',
       '/differential/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'DifferentialRevisionListController',
         'diff/' => array(
           '(?P<id>[1-9]\d*)/' => 'DifferentialDiffViewController',
           'create/' => 'DifferentialDiffCreateController',
         ),
         'changeset/' => 'DifferentialChangesetViewController',
         'revision/edit/(?:(?P<id>[1-9]\d*)/)?'
           => 'DifferentialRevisionEditController',
         'revision/land/(?:(?P<id>[1-9]\d*))/(?P<strategy>[^/]+)/'
           => 'DifferentialRevisionLandController',
         'revision/closedetails/(?P<phid>[^/]+)/'
           => 'DifferentialRevisionCloseDetailsController',
         'comment/' => array(
           'preview/(?P<id>[1-9]\d*)/' => 'DifferentialCommentPreviewController',
           'save/(?P<id>[1-9]\d*)/' => 'DifferentialCommentSaveController',
           'inline/' => array(
             'preview/(?P<id>[1-9]\d*)/'
               => 'DifferentialInlineCommentPreviewController',
             'edit/(?P<id>[1-9]\d*)/'
               => 'DifferentialInlineCommentEditController',
           ),
         ),
         'preview/' => 'PhabricatorMarkupPreviewController',
       ),
     );
   }
 
   public function getApplicationOrder() {
     return 0.100;
   }
 
   public function getRemarkupRules() {
     return array(
       new DifferentialRemarkupRule(),
     );
   }
 
   public function loadStatus(PhabricatorUser $user) {
     $revisions = id(new DifferentialRevisionQuery())
       ->setViewer($user)
       ->withResponsibleUsers(array($user->getPHID()))
       ->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
       ->needRelationships(true)
       ->setLimit(self::MAX_STATUS_ITEMS)
       ->execute();
 
     $status = array();
     if (count($revisions) == self::MAX_STATUS_ITEMS) {
       $all_count = count($revisions);
       $all_count_str = self::formatStatusCount(
         $all_count,
         '%s Active Reviews',
         '%d Active Review(s)');
       $type = PhabricatorApplicationStatusView::TYPE_WARNING;
       $status[] = id(new PhabricatorApplicationStatusView())
         ->setType($type)
         ->setText($all_count_str)
         ->setCount($all_count);
     } else {
       list($blocking, $active, $waiting) =
         DifferentialRevisionQuery::splitResponsible(
           $revisions,
           array($user->getPHID()));
 
       $blocking = count($blocking);
       $blocking_str = self::formatStatusCount(
         $blocking,
         '%s Reviews Blocking Others',
         '%d Review(s) Blocking Others');
       $type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
       $status[] = id(new PhabricatorApplicationStatusView())
         ->setType($type)
         ->setText($blocking_str)
         ->setCount($blocking);
 
       $active = count($active);
       $active_str = self::formatStatusCount(
         $active,
         '%s Reviews Need Attention',
         '%d Review(s) Need Attention');
       $type = PhabricatorApplicationStatusView::TYPE_WARNING;
       $status[] = id(new PhabricatorApplicationStatusView())
         ->setType($type)
         ->setText($active_str)
         ->setCount($active);
 
       $waiting = count($waiting);
       $waiting_str = self::formatStatusCount(
         $waiting,
         '%s Reviews Waiting on Others',
         '%d Review(s) Waiting on Others');
       $type = PhabricatorApplicationStatusView::TYPE_INFO;
       $status[] = id(new PhabricatorApplicationStatusView())
         ->setType($type)
         ->setText($waiting_str)
         ->setCount($waiting);
     }
 
     return $status;
   }
 
   public function supportsEmailIntegration() {
     return true;
   }
 
   public function getAppEmailBlurb() {
     return pht(
       'Send email to these addresses to create revisions. The body of the '.
       'message and / or one or more attachments should be the output of a '.
       '"diff" command. %s',
       phutil_tag(
         'a',
         array(
           'href' => $this->getInboundEmailSupportLink(),),
         pht('Learn More')));
   }
 
   protected function getCustomCapabilities() {
     return array(
       DifferentialDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created revisions.'),
       ),
     );
   }
 
 }
diff --git a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
index e2be00715a..80c478f65f 100644
--- a/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
+++ b/src/applications/diffusion/application/PhabricatorDiffusionApplication.php
@@ -1,150 +1,146 @@
 <?php
 
 final class PhabricatorDiffusionApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Diffusion');
   }
 
   public function getShortDescription() {
     return pht('Host and Browse Repositories');
   }
 
   public function getBaseURI() {
     return '/diffusion/';
   }
 
-  public function getIconName() {
-    return 'diffusion';
-  }
-
   public function getFontIcon() {
     return 'fa-code';
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return true;
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Diffusion User Guide');
   }
 
   public function getFactObjectsForAnalysis() {
     return array(
       new PhabricatorRepositoryCommit(),
     );
   }
 
   public function getEventListeners() {
     return array(
       new DiffusionHovercardEventListener(),
     );
   }
 
   public function getRemarkupRules() {
     return array(
       new DiffusionCommitRemarkupRule(),
       new DiffusionRepositoryRemarkupRule(),
       new DiffusionRepositoryByIDRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/r(?P<callsign>[A-Z]+)(?P<commit>[a-z0-9]+)'
         => 'DiffusionCommitController',
       '/diffusion/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'DiffusionRepositoryListController',
         'new/' => 'DiffusionRepositoryNewController',
         '(?P<edit>create)/' => 'DiffusionRepositoryCreateController',
         '(?P<edit>import)/' => 'DiffusionRepositoryCreateController',
         'pushlog/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'DiffusionPushLogListController',
           'view/(?P<id>\d+)/' => 'DiffusionPushEventViewController',
         ),
         '(?P<callsign>[A-Z]+)/' => array(
           '' => 'DiffusionRepositoryController',
 
           'repository/(?P<dblob>.*)'    => 'DiffusionRepositoryController',
           'change/(?P<dblob>.*)'        => 'DiffusionChangeController',
           'history/(?P<dblob>.*)'       => 'DiffusionHistoryController',
           'browse/(?P<dblob>.*)'        => 'DiffusionBrowseMainController',
           'lastmodified/(?P<dblob>.*)'  => 'DiffusionLastModifiedController',
           'diff/'                       => 'DiffusionDiffController',
           'tags/(?P<dblob>.*)'          => 'DiffusionTagListController',
           'branches/(?P<dblob>.*)'      => 'DiffusionBranchTableController',
           'lint/(?P<dblob>.*)'          => 'DiffusionLintController',
           'commit/(?P<commit>[a-z0-9]+)/branches/'
             => 'DiffusionCommitBranchesController',
           'commit/(?P<commit>[a-z0-9]+)/tags/'
             => 'DiffusionCommitTagsController',
           'commit/(?P<commit>[a-z0-9]+)/edit/'
             => 'DiffusionCommitEditController',
           'edit/' => array(
             '' => 'DiffusionRepositoryEditMainController',
             'basic/' => 'DiffusionRepositoryEditBasicController',
             'encoding/' => 'DiffusionRepositoryEditEncodingController',
             'activate/' => 'DiffusionRepositoryEditActivateController',
             'dangerous/' => 'DiffusionRepositoryEditDangerousController',
             'branches/' => 'DiffusionRepositoryEditBranchesController',
             'subversion/' => 'DiffusionRepositoryEditSubversionController',
             'actions/' => 'DiffusionRepositoryEditActionsController',
             '(?P<edit>remote)/' => 'DiffusionRepositoryCreateController',
             '(?P<edit>policy)/' => 'DiffusionRepositoryCreateController',
             'storage/' => 'DiffusionRepositoryEditStorageController',
             'delete/' => 'DiffusionRepositoryEditDeleteController',
             'hosting/' => 'DiffusionRepositoryEditHostingController',
             '(?P<serve>serve)/' => 'DiffusionRepositoryEditHostingController',
             'update/' => 'DiffusionRepositoryEditUpdateController',
           ),
           'pathtree/(?P<dblob>.*)' => 'DiffusionPathTreeController',
           'mirror/' => array(
             'edit/(?:(?P<id>\d+)/)?' => 'DiffusionMirrorEditController',
             'delete/(?P<id>\d+)/' => 'DiffusionMirrorDeleteController',
           ),
         ),
 
         // NOTE: This must come after the rule above; it just gives us a
         // catch-all for serving repositories over HTTP. We must accept
         // requests without the trailing "/" because SVN commands don't
         // necessarily include it.
         '(?P<callsign>[A-Z]+)(/|$).*' => 'DiffusionRepositoryDefaultController',
 
         'inline/' => array(
           'edit/(?P<phid>[^/]+)/' => 'DiffusionInlineCommentController',
           'preview/(?P<phid>[^/]+)/'
             => 'DiffusionInlineCommentPreviewController',
         ),
         'services/' => array(
           'path/' => array(
             'complete/' => 'DiffusionPathCompleteController',
             'validate/' => 'DiffusionPathValidateController',
           ),
         ),
         'symbol/(?P<name>[^/]+)/' => 'DiffusionSymbolController',
         'external/' => 'DiffusionExternalController',
         'lint/' => 'DiffusionLintController',
       ),
     );
   }
 
   public function getApplicationOrder() {
     return 0.120;
   }
 
   protected function getCustomCapabilities() {
     return array(
       DiffusionDefaultViewCapability::CAPABILITY => array(),
       DiffusionDefaultEditCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
       DiffusionDefaultPushCapability::CAPABILITY => array(),
       DiffusionCreateRepositoriesCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 
 }
diff --git a/src/applications/diviner/application/PhabricatorDivinerApplication.php b/src/applications/diviner/application/PhabricatorDivinerApplication.php
index 172d09b962..6826e3051a 100644
--- a/src/applications/diviner/application/PhabricatorDivinerApplication.php
+++ b/src/applications/diviner/application/PhabricatorDivinerApplication.php
@@ -1,56 +1,52 @@
 <?php
 
 final class PhabricatorDivinerApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/diviner/';
   }
 
-  public function getIconName() {
-    return 'diviner';
-  }
-
   public function getFontIcon() {
     return 'fa-sun-o';
   }
 
   public function getName() {
     return pht('Diviner');
   }
 
   public function getShortDescription() {
     return pht('Documentation');
   }
 
   public function getTitleGlyph() {
     return "\xE2\x97\x89";
   }
 
   public function getRoutes() {
     return array(
       '/diviner/' => array(
         '' => 'DivinerMainController',
         'query/((?<key>[^/]+)/)?' => 'DivinerAtomListController',
         'find/' => 'DivinerFindController',
       ),
       '/book/(?P<book>[^/]+)/' => 'DivinerBookController',
       '/book/'.
         '(?P<book>[^/]+)/'.
         '(?P<type>[^/]+)/'.
         '(?:(?P<context>[^/]+)/)?'.
         '(?P<name>[^/]+)/'.
         '(?:(?P<index>\d+)/)?' => 'DivinerAtomController',
     );
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getRemarkupRules() {
     return array(
       new DivinerSymbolRemarkupRule(),
     );
   }
 
 }
diff --git a/src/applications/drydock/application/PhabricatorDrydockApplication.php b/src/applications/drydock/application/PhabricatorDrydockApplication.php
index 2a6f0c33b6..033e2666c7 100644
--- a/src/applications/drydock/application/PhabricatorDrydockApplication.php
+++ b/src/applications/drydock/application/PhabricatorDrydockApplication.php
@@ -1,84 +1,80 @@
 <?php
 
 final class PhabricatorDrydockApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/drydock/';
   }
 
   public function getName() {
     return pht('Drydock');
   }
 
   public function getShortDescription() {
     return pht('Allocate Software Resources');
   }
 
-  public function getIconName() {
-    return 'drydock';
-  }
-
   public function getFontIcon() {
     return 'fa-truck';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\x82";
   }
 
   public function getFlavorText() {
     return pht('A nautical adventure.');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Drydock User Guide');
   }
 
   public function getRoutes() {
     return array(
       '/drydock/' => array(
         '' => 'DrydockConsoleController',
         'blueprint/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'DrydockBlueprintListController',
           '(?P<id>[1-9]\d*)/' => 'DrydockBlueprintViewController',
           'create/' => 'DrydockBlueprintCreateController',
           'edit/(?:(?P<id>[1-9]\d*)/)?' => 'DrydockBlueprintEditController',
         ),
         'resource/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'DrydockResourceListController',
           '(?P<id>[1-9]\d*)/' => 'DrydockResourceViewController',
           '(?P<id>[1-9]\d*)/close/' => 'DrydockResourceCloseController',
         ),
         'lease/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'DrydockLeaseListController',
           '(?P<id>[1-9]\d*)/' => 'DrydockLeaseViewController',
           '(?P<id>[1-9]\d*)/release/' => 'DrydockLeaseReleaseController',
         ),
         'log/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'DrydockLogListController',
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       DrydockDefaultViewCapability::CAPABILITY => array(),
       DrydockDefaultEditCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
       DrydockCreateBlueprintsCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 
 }
diff --git a/src/applications/fact/application/PhabricatorFactApplication.php b/src/applications/fact/application/PhabricatorFactApplication.php
index b8d19755e1..5967778c71 100644
--- a/src/applications/fact/application/PhabricatorFactApplication.php
+++ b/src/applications/fact/application/PhabricatorFactApplication.php
@@ -1,42 +1,38 @@
 <?php
 
 final class PhabricatorFactApplication extends PhabricatorApplication {
 
   public function getShortDescription() {
     return pht('Chart and Analyze Data');
   }
 
   public function getName() {
     return pht('Facts');
   }
 
   public function getBaseURI() {
     return '/fact/';
   }
 
-  public function getIconName() {
-    return 'fact';
-  }
-
   public function getFontIcon() {
     return 'fa-line-chart';
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRoutes() {
     return array(
       '/fact/' => array(
         '' => 'PhabricatorFactHomeController',
         'chart/' => 'PhabricatorFactChartController',
       ),
     );
   }
 
 }
diff --git a/src/applications/feed/application/PhabricatorFeedApplication.php b/src/applications/feed/application/PhabricatorFeedApplication.php
index 2d9cb4bf39..6f2dbea50a 100644
--- a/src/applications/feed/application/PhabricatorFeedApplication.php
+++ b/src/applications/feed/application/PhabricatorFeedApplication.php
@@ -1,39 +1,35 @@
 <?php
 
 final class PhabricatorFeedApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/feed/';
   }
 
   public function getName() {
     return pht('Feed');
   }
 
   public function getShortDescription() {
     return pht('Review Recent Activity');
   }
 
-  public function getIconName() {
-    return 'feed';
-  }
-
   public function getFontIcon() {
     return 'fa-newspaper-o';
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getRoutes() {
     return array(
       '/feed/' => array(
         'public/' => 'PhabricatorFeedPublicStreamController',
         '(?P<id>\d+)/' => 'PhabricatorFeedDetailController',
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorFeedListController',
       ),
     );
   }
 
 }
diff --git a/src/applications/files/application/PhabricatorFilesApplication.php b/src/applications/files/application/PhabricatorFilesApplication.php
index cf49fa2fd6..85116e9786 100644
--- a/src/applications/files/application/PhabricatorFilesApplication.php
+++ b/src/applications/files/application/PhabricatorFilesApplication.php
@@ -1,96 +1,92 @@
 <?php
 
 final class PhabricatorFilesApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/file/';
   }
 
   public function getName() {
     return pht('Files');
   }
 
   public function getShortDescription() {
     return pht('Store and Share Files');
   }
 
-  public function getIconName() {
-    return 'files';
-  }
-
   public function getFontIcon() {
     return 'fa-file';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x87\xAA";
   }
 
   public function getFlavorText() {
     return pht('Blob store for Pokemon pictures.');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getRemarkupRules() {
     return array(
       new PhabricatorEmbedFileRemarkupRule(),
     );
   }
 
   public function supportsEmailIntegration() {
     return true;
   }
 
   public function getAppEmailBlurb() {
     return pht(
       'Send emails with file attachments to these addresses to upload '.
       'files. %s',
       phutil_tag(
         'a',
         array(
           'href' => $this->getInboundEmailSupportLink(),),
         pht('Learn More')));
   }
 
   protected function getCustomCapabilities() {
     return array(
       FilesDefaultViewCapability::CAPABILITY => array(
         'caption' => pht(
           'Default view policy for newly created files.'),
       ),
     );
   }
 
   public function getRoutes() {
     return array(
       '/F(?P<id>[1-9]\d*)' => 'PhabricatorFileInfoController',
       '/file/' => array(
         '(query/(?P<key>[^/]+)/)?' => 'PhabricatorFileListController',
         'upload/' => 'PhabricatorFileUploadController',
         'dropupload/' => 'PhabricatorFileDropUploadController',
         'compose/' => 'PhabricatorFileComposeController',
         'comment/(?P<id>[1-9]\d*)/' => 'PhabricatorFileCommentController',
         'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorFileDeleteController',
         'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorFileEditController',
         'info/(?P<phid>[^/]+)/' => 'PhabricatorFileInfoController',
         'data/(?P<key>[^/]+)/(?P<phid>[^/]+)/(?P<token>[^/]+)/.*'
           => 'PhabricatorFileDataController',
         'data/(?P<key>[^/]+)/(?P<phid>[^/]+)/.*'
           => 'PhabricatorFileDataController',
         'proxy/' => 'PhabricatorFileProxyController',
         'xform/(?P<transform>[^/]+)/(?P<phid>[^/]+)/(?P<key>[^/]+)/'
           => 'PhabricatorFileTransformController',
         'uploaddialog/' => 'PhabricatorFileUploadDialogController',
         'download/(?P<phid>[^/]+)/' => 'PhabricatorFileDialogController',
       ),
     );
   }
 
 }
diff --git a/src/applications/flag/application/PhabricatorFlagsApplication.php b/src/applications/flag/application/PhabricatorFlagsApplication.php
index 023c4570a9..232f6f4dca 100644
--- a/src/applications/flag/application/PhabricatorFlagsApplication.php
+++ b/src/applications/flag/application/PhabricatorFlagsApplication.php
@@ -1,73 +1,69 @@
 <?php
 
 final class PhabricatorFlagsApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Flags');
   }
 
   public function getShortDescription() {
     return pht('Personal Bookmarks');
   }
 
   public function getBaseURI() {
     return '/flag/';
   }
 
-  public function getIconName() {
-    return 'flags';
-  }
-
   public function getFontIcon() {
     return 'fa-flag';
   }
 
   public function getEventListeners() {
     return array(
       new PhabricatorFlagsUIEventListener(),
     );
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9A\x90";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function loadStatus(PhabricatorUser $user) {
     $status = array();
 
     $flags = id(new PhabricatorFlagQuery())
       ->setViewer($user)
       ->withOwnerPHIDs(array($user->getPHID()))
       ->setLimit(self::MAX_STATUS_ITEMS)
       ->execute();
 
     $count = count($flags);
     $count_str = self::formatStatusCount(
       $count,
       '%s Flagged Objects',
       '%d Flagged Object(s)');
     $type = PhabricatorApplicationStatusView::TYPE_WARNING;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)
       ->setText($count_str)
       ->setCount($count);
 
     return $status;
   }
 
   public function getRoutes() {
     return array(
       '/flag/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorFlagListController',
         'view/(?P<view>[^/]+)/' => 'PhabricatorFlagListController',
         'edit/(?P<phid>[^/]+)/' => 'PhabricatorFlagEditController',
         'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorFlagDeleteController',
       ),
     );
   }
 
 }
diff --git a/src/applications/fund/application/PhabricatorFundApplication.php b/src/applications/fund/application/PhabricatorFundApplication.php
index 1dcce4a8fd..72207995b8 100644
--- a/src/applications/fund/application/PhabricatorFundApplication.php
+++ b/src/applications/fund/application/PhabricatorFundApplication.php
@@ -1,69 +1,65 @@
 <?php
 
 final class PhabricatorFundApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Fund');
   }
 
   public function getBaseURI() {
     return '/fund/';
   }
 
   public function getShortDescription() {
     return pht('Donate');
   }
 
-  public function getIconName() {
-    return 'phund';
-  }
-
   public function getFontIcon() {
     return 'fa-heart';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x99\xA5";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRemarkupRules() {
     return array(
       new FundInitiativeRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/I(?P<id>[1-9]\d*)' => 'FundInitiativeViewController',
       '/fund/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'FundInitiativeListController',
         'create/' => 'FundInitiativeEditController',
         'edit/(?:(?P<id>\d+)/)?' => 'FundInitiativeEditController',
         'close/(?P<id>\d+)/' => 'FundInitiativeCloseController',
         'back/(?P<id>\d+)/' => 'FundInitiativeBackController',
         'backers/(?:(?P<id>\d+)/)?(?:query/(?P<queryKey>[^/]+)/)?'
           => 'FundBackerListController',
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       FundDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created initiatives.'),
       ),
       FundCreateInitiativesCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 
 }
diff --git a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
index f01f0d58c7..fd491f707b 100644
--- a/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
+++ b/src/applications/harbormaster/application/PhabricatorHarbormasterApplication.php
@@ -1,97 +1,93 @@
 <?php
 
 final class PhabricatorHarbormasterApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/harbormaster/';
   }
 
   public function getName() {
     return pht('Harbormaster');
   }
 
   public function getShortDescription() {
     return pht('Build/CI');
   }
 
-  public function getIconName() {
-    return 'harbormaster';
-  }
-
   public function getFontIcon() {
     return 'fa-ship';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x99\xBB";
   }
 
   public function getFlavorText() {
     return pht('Ship Some Freight');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getEventListeners() {
     return array(
       new HarbormasterUIEventListener(),
     );
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRemarkupRules() {
     return array(
       new HarbormasterRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/B(?P<id>[1-9]\d*)' => 'HarbormasterBuildableViewController',
       '/harbormaster/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'HarbormasterBuildableListController',
         'step/' => array(
           'add/(?:(?P<id>\d+)/)?' => 'HarbormasterStepAddController',
           'new/(?P<plan>\d+)/(?P<class>[^/]+)/'
             => 'HarbormasterStepEditController',
           'edit/(?:(?P<id>\d+)/)?' => 'HarbormasterStepEditController',
           'delete/(?:(?P<id>\d+)/)?' => 'HarbormasterStepDeleteController',
         ),
         'buildable/' => array(
           '(?P<id>\d+)/(?P<action>stop|resume|restart)/'
             => 'HarbormasterBuildableActionController',
         ),
         'build/' => array(
           '(?P<id>\d+)/' => 'HarbormasterBuildViewController',
           '(?P<action>stop|resume|restart)/(?P<id>\d+)/(?:(?P<via>[^/]+)/)?'
             => 'HarbormasterBuildActionController',
         ),
         'plan/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?'
             => 'HarbormasterPlanListController',
           'edit/(?:(?P<id>\d+)/)?' => 'HarbormasterPlanEditController',
           'order/(?:(?P<id>\d+)/)?' => 'HarbormasterPlanOrderController',
           'disable/(?P<id>\d+)/' => 'HarbormasterPlanDisableController',
           'run/(?P<id>\d+)/' => 'HarbormasterPlanRunController',
           '(?P<id>\d+)/' => 'HarbormasterPlanViewController',
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       HarbormasterManagePlansCapability::CAPABILITY => array(
         'caption' => pht('Can create and manage build plans.'),
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 
 }
diff --git a/src/applications/herald/application/PhabricatorHeraldApplication.php b/src/applications/herald/application/PhabricatorHeraldApplication.php
index 11f6554be7..d6fedeca7f 100644
--- a/src/applications/herald/application/PhabricatorHeraldApplication.php
+++ b/src/applications/herald/application/PhabricatorHeraldApplication.php
@@ -1,77 +1,73 @@
 <?php
 
 final class PhabricatorHeraldApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/herald/';
   }
 
-  public function getIconName() {
-    return 'herald';
-  }
-
   public function getFontIcon() {
     return 'fa-bullhorn';
   }
 
   public function getName() {
     return pht('Herald');
   }
 
   public function getShortDescription() {
     return pht('Create Notification Rules');
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\xBF";
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Herald User Guide');
   }
 
   public function getFlavorText() {
     return pht('Watch for danger!');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getRemarkupRules() {
     return array(
       new HeraldRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/herald/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'HeraldRuleListController',
         'new/' => 'HeraldNewController',
         'rule/(?P<id>[1-9]\d*)/' => 'HeraldRuleViewController',
         'edit/(?:(?P<id>[1-9]\d*)/)?' => 'HeraldRuleController',
         'disable/(?P<id>[1-9]\d*)/(?P<action>\w+)/'
           => 'HeraldDisableController',
         'history/(?:(?P<id>[1-9]\d*)/)?' => 'HeraldRuleEditHistoryController',
         'test/' => 'HeraldTestConsoleController',
         'transcript/' => array(
           '' => 'HeraldTranscriptListController',
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'HeraldTranscriptListController',
           '(?P<id>[1-9]\d*)/(?:(?P<filter>\w+)/)?'
             => 'HeraldTranscriptController',
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       HeraldManageGlobalRulesCapability::CAPABILITY => array(
         'caption' => pht('Global rules can bypass access controls.'),
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 
 }
diff --git a/src/applications/home/application/PhabricatorHomeApplication.php b/src/applications/home/application/PhabricatorHomeApplication.php
index 2e80a620de..ad013b03fa 100644
--- a/src/applications/home/application/PhabricatorHomeApplication.php
+++ b/src/applications/home/application/PhabricatorHomeApplication.php
@@ -1,121 +1,117 @@
 <?php
 
 final class PhabricatorHomeApplication extends PhabricatorApplication {
 
   const DASHBOARD_DEFAULT = 'dashboard:default';
 
   public function getBaseURI() {
     return '/home/';
   }
 
   public function getName() {
     return pht('Home');
   }
 
   public function getShortDescription() {
     return pht('Command Center');
   }
 
-  public function getIconName() {
-    return 'home';
-  }
-
   public function getFontIcon() {
     return 'fa-home';
   }
 
   public function getRoutes() {
     return array(
       '/' => 'PhabricatorHomeMainController',
       '/(?P<only>home)/' => 'PhabricatorHomeMainController',
       '/home/' => array(
         'create/' => 'PhabricatorHomeQuickCreateController',
       ),
     );
   }
 
   public function isLaunchable() {
     return false;
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getApplicationOrder() {
     return 9;
   }
 
   public function buildMainMenuItems(
     PhabricatorUser $user,
     PhabricatorController $controller = null) {
 
     $items = array();
 
     if ($user->isLoggedIn() && $user->isUserActivated()) {
       $create_id = celerity_generate_unique_node_id();
       Javelin::initBehavior(
         'aphlict-dropdown',
         array(
           'bubbleID' => $create_id,
           'dropdownID' => 'phabricator-quick-create-menu',
           'local' => true,
           'desktop' => true,
           'right' => true,
         ));
 
       $item = id(new PHUIListItemView())
         ->setName(pht('Create New...'))
         ->setIcon('fa-plus')
         ->addClass('core-menu-item')
         ->setHref('/home/create/')
         ->addSigil('quick-create-menu')
         ->setID($create_id)
         ->setAural(pht('Quick Create'))
         ->setOrder(300);
       $items[] = $item;
     }
 
     return $items;
   }
 
   public function loadAllQuickCreateItems(PhabricatorUser $viewer) {
     $applications = id(new PhabricatorApplicationQuery())
       ->setViewer($viewer)
       ->withInstalled(true)
       ->execute();
 
     $items = array();
     foreach ($applications as $application) {
       $app_items = $application->getQuickCreateItems($viewer);
       foreach ($app_items as $app_item) {
         $items[] = $app_item;
       }
     }
 
     return $items;
   }
 
   public function buildMainMenuExtraNodes(
     PhabricatorUser $viewer,
     PhabricatorController $controller = null) {
 
     $items = $this->loadAllQuickCreateItems($viewer);
 
     $view = new PHUIListView();
     $view->newLabel(pht('Create New...'));
     foreach ($items as $item) {
       $view->addMenuItem($item);
     }
 
     return phutil_tag(
       'div',
       array(
         'id' => 'phabricator-quick-create-menu',
         'class' => 'phabricator-main-menu-dropdown phui-list-sidenav',
         'style' => 'display: none',
       ),
       $view);
   }
 
 }
diff --git a/src/applications/legalpad/application/PhabricatorLegalpadApplication.php b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
index cae15d0b25..a453881ca8 100644
--- a/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
+++ b/src/applications/legalpad/application/PhabricatorLegalpadApplication.php
@@ -1,82 +1,78 @@
 <?php
 
 final class PhabricatorLegalpadApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/legalpad/';
   }
 
   public function getName() {
     return pht('Legalpad');
   }
 
   public function getShortDescription() {
     return pht('Agreements and Signatures');
   }
 
-  public function getIconName() {
-    return 'legalpad';
-  }
-
   public function getFontIcon() {
     return 'fa-gavel';
   }
 
   public function getTitleGlyph() {
     return "\xC2\xA9";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getRemarkupRules() {
     return array(
       new LegalpadDocumentRemarkupRule(),
     );
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Legalpad User Guide');
   }
 
   public function getOverview() {
     return pht(
       '**Legalpad** is a simple application for tracking signatures and '.
       'legal agreements. At the moment, it is primarily intended to help '.
       'open source projects keep track of Contributor License Agreements.');
   }
 
   public function getRoutes() {
     return array(
       '/L(?P<id>\d+)' => 'LegalpadDocumentSignController',
       '/legalpad/' => array(
         '' => 'LegalpadDocumentListController',
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'LegalpadDocumentListController',
         'create/' => 'LegalpadDocumentEditController',
         'edit/(?P<id>\d+)/' => 'LegalpadDocumentEditController',
         'comment/(?P<id>\d+)/' => 'LegalpadDocumentCommentController',
         'view/(?P<id>\d+)/' => 'LegalpadDocumentManageController',
         'done/' => 'LegalpadDocumentDoneController',
         'verify/(?P<code>[^/]+)/'
           => 'LegalpadDocumentSignatureVerificationController',
         'signatures/(?:(?P<id>\d+)/)?(?:query/(?P<queryKey>[^/]+)/)?'
           => 'LegalpadDocumentSignatureListController',
         'addsignature/(?P<id>\d+)/' => 'LegalpadDocumentSignatureAddController',
         'signature/(?P<id>\d+)/' => 'LegalpadDocumentSignatureViewController',
         'document/' => array(
           'preview/' => 'PhabricatorMarkupPreviewController',
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       LegalpadCreateDocumentsCapability::CAPABILITY => array(),
       LegalpadDefaultViewCapability::CAPABILITY => array(),
       LegalpadDefaultEditCapability::CAPABILITY => array(),
     );
   }
 
 }
diff --git a/src/applications/macro/application/PhabricatorMacroApplication.php b/src/applications/macro/application/PhabricatorMacroApplication.php
index be971f682d..0168d5f2c8 100644
--- a/src/applications/macro/application/PhabricatorMacroApplication.php
+++ b/src/applications/macro/application/PhabricatorMacroApplication.php
@@ -1,64 +1,60 @@
 <?php
 
 final class PhabricatorMacroApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/macro/';
   }
 
   public function getName() {
     return pht('Macro');
   }
 
   public function getShortDescription() {
     return pht('Image Macros and Memes');
   }
 
-  public function getIconName() {
-    return 'macro';
-  }
-
   public function getFontIcon() {
     return 'fa-file-image-o';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9A\x98";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getRoutes() {
     return array(
       '/macro/' => array(
         '(query/(?P<key>[^/]+)/)?' => 'PhabricatorMacroListController',
         'create/' => 'PhabricatorMacroEditController',
         'view/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroViewController',
         'comment/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroCommentController',
         'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroEditController',
         'audio/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroAudioController',
         'disable/(?P<id>[1-9]\d*)/' => 'PhabricatorMacroDisableController',
         'meme/' => 'PhabricatorMacroMemeController',
         'meme/create/' => 'PhabricatorMacroMemeDialogController',
       ),
     );
   }
 
   public function getRemarkupRules() {
     return array(
       new PhabricatorIconRemarkupRule(),
       new PhabricatorEmojiRemarkupRule(),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       PhabricatorMacroManageCapability::CAPABILITY => array(
         'caption' => pht('Allows creating and editing macros.'),
       ),
     );
   }
 
 }
diff --git a/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php b/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
index a3409dc1ba..00198328f3 100644
--- a/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
+++ b/src/applications/mailinglists/application/PhabricatorMailingListsApplication.php
@@ -1,44 +1,40 @@
 <?php
 
 final class PhabricatorMailingListsApplication extends PhabricatorApplication {
 
   public function getName() {
     return 'Mailing Lists';
   }
 
   public function getBaseURI() {
     return '/mailinglists/';
   }
 
   public function getShortDescription() {
     return 'Manage External Lists';
   }
 
-  public function getIconName() {
-    return 'mail';
-  }
-
   public function getFontIcon() {
     return 'fa-mail-reply-all';
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function getRoutes() {
     return array(
       '/mailinglists/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorMailingListsListController',
         'edit/(?:(?P<id>[1-9]\d*)/)?'
           => 'PhabricatorMailingListsEditController',
       ),
     );
   }
 
   public function getTitleGlyph() {
     return '@';
   }
 
 }
diff --git a/src/applications/maniphest/application/PhabricatorManiphestApplication.php b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
index 1df47ad390..fa2e2c0c90 100644
--- a/src/applications/maniphest/application/PhabricatorManiphestApplication.php
+++ b/src/applications/maniphest/application/PhabricatorManiphestApplication.php
@@ -1,151 +1,147 @@
 <?php
 
 final class PhabricatorManiphestApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Maniphest');
   }
 
   public function getShortDescription() {
     return pht('Tasks and Bugs');
   }
 
   public function getBaseURI() {
     return '/maniphest/';
   }
 
-  public function getIconName() {
-    return 'maniphest';
-  }
-
   public function getFontIcon() {
     return 'fa-anchor';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9A\x93";
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return true;
   }
 
   public function getApplicationOrder() {
     return 0.110;
   }
 
   public function getFactObjectsForAnalysis() {
     return array(
       new ManiphestTask(),
     );
   }
 
   public function getEventListeners() {
     return array(
       new ManiphestNameIndexEventListener(),
       new ManiphestActionMenuEventListener(),
       new ManiphestHovercardEventListener(),
     );
   }
 
   public function getRemarkupRules() {
     return array(
       new ManiphestRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/T(?P<id>[1-9]\d*)' => 'ManiphestTaskDetailController',
       '/maniphest/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'ManiphestTaskListController',
         'report/(?:(?P<view>\w+)/)?' => 'ManiphestReportController',
         'batch/' => 'ManiphestBatchEditController',
         'task/' => array(
           'create/' => 'ManiphestTaskEditController',
           'edit/(?P<id>[1-9]\d*)/' => 'ManiphestTaskEditController',
           'descriptionpreview/'
             => 'PhabricatorMarkupPreviewController',
         ),
         'transaction/' => array(
           'save/' => 'ManiphestTransactionSaveController',
           'preview/(?P<id>[1-9]\d*)/'
             => 'ManiphestTransactionPreviewController',
         ),
         'export/(?P<key>[^/]+)/' => 'ManiphestExportController',
         'subpriority/' => 'ManiphestSubpriorityController',
       ),
     );
   }
 
   public function loadStatus(PhabricatorUser $user) {
     $status = array();
 
     if (!$user->isLoggedIn()) {
       return $status;
     }
 
     $query = id(new ManiphestTaskQuery())
       ->setViewer($user)
       ->withStatuses(ManiphestTaskStatus::getOpenStatusConstants())
       ->withOwners(array($user->getPHID()))
       ->setLimit(self::MAX_STATUS_ITEMS);
     $count = count($query->execute());
     $count_str = self::formatStatusCount(
       $count,
       '%s Assigned Tasks',
       '%d Assigned Task(s)');
 
     $type = PhabricatorApplicationStatusView::TYPE_WARNING;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)
       ->setText($count_str)
       ->setCount($count);
 
     return $status;
   }
 
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     $items = array();
 
     $item = id(new PHUIListItemView())
       ->setName(pht('Maniphest Task'))
       ->setIcon('fa-anchor')
       ->setHref($this->getBaseURI().'task/create/');
     $items[] = $item;
 
     return $items;
   }
 
   public function supportsEmailIntegration() {
     return true;
   }
 
   public function getAppEmailBlurb() {
     return pht(
       'Send email to these addresses to create tasks. %s',
       phutil_tag(
         'a',
         array(
           'href' => $this->getInboundEmailSupportLink(),),
         pht('Learn More')));
   }
 
   protected function getCustomCapabilities() {
     return array(
       ManiphestDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created tasks.'),
       ),
       ManiphestDefaultEditCapability::CAPABILITY => array(
         'caption' => pht('Default edit policy for newly created tasks.'),
       ),
       ManiphestEditStatusCapability::CAPABILITY => array(),
       ManiphestEditAssignCapability::CAPABILITY => array(),
       ManiphestEditPoliciesCapability::CAPABILITY => array(),
       ManiphestEditPriorityCapability::CAPABILITY => array(),
       ManiphestEditProjectsCapability::CAPABILITY => array(),
       ManiphestBulkEditCapability::CAPABILITY => array(),
     );
   }
 
 }
diff --git a/src/applications/meta/application/PhabricatorApplicationsApplication.php b/src/applications/meta/application/PhabricatorApplicationsApplication.php
index 8b5e801057..1b1d90e975 100644
--- a/src/applications/meta/application/PhabricatorApplicationsApplication.php
+++ b/src/applications/meta/application/PhabricatorApplicationsApplication.php
@@ -1,56 +1,52 @@
 <?php
 
 final class PhabricatorApplicationsApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Applications');
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function isLaunchable() {
     // This application is launchable in the traditional sense, but showing it
     // on the application launch list is confusing.
     return false;
   }
 
   public function getBaseURI() {
     return '/applications/';
   }
 
   public function getShortDescription() {
     return pht('Explore More Applications');
   }
 
-  public function getIconName() {
-    return 'application';
-  }
-
   public function getFontIcon() {
     return 'fa-globe';
   }
 
   public function getTitleGlyph() {
     return "\xE0\xBC\x84";
   }
 
   public function getRoutes() {
     return array(
       '/applications/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorApplicationsListController',
         'view/(?P<application>\w+)/'
           => 'PhabricatorApplicationDetailViewController',
         'edit/(?P<application>\w+)/'
           => 'PhabricatorApplicationEditController',
         'editemail/(?P<application>\w+)/'
           => 'PhabricatorApplicationEditEmailController',
         '(?P<application>\w+)/(?P<action>install|uninstall)/'
           => 'PhabricatorApplicationUninstallController',
       ),
     );
   }
 
 }
diff --git a/src/applications/metamta/application/PhabricatorMetaMTAApplication.php b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
index 5a356acc26..802b3f1661 100644
--- a/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
+++ b/src/applications/metamta/application/PhabricatorMetaMTAApplication.php
@@ -1,54 +1,50 @@
 <?php
 
 final class PhabricatorMetaMTAApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('MetaMTA');
   }
 
-  public function getIconName() {
-    return 'metamta';
-  }
-
   public function getFontIcon() {
     return 'fa-send';
   }
 
   public function getShortDescription() {
     return pht('Delivers Mail');
   }
 
   public function getFlavorText() {
     return pht('Yo dawg, we heard you like MTAs.');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function isLaunchable() {
     return false;
   }
 
   public function getTypeaheadURI() {
     return null;
   }
 
   public function getRoutes() {
     return array(
       '/mail/' => array(
         'sendgrid/' => 'PhabricatorMetaMTASendGridReceiveController',
         'mailgun/'  => 'PhabricatorMetaMTAMailgunReceiveController',
       ),
     );
   }
 
   public function getTitleGlyph() {
     return '@';
   }
 
 }
diff --git a/src/applications/nuance/application/PhabricatorNuanceApplication.php b/src/applications/nuance/application/PhabricatorNuanceApplication.php
index 87e3c8b0b4..31f06c4b64 100644
--- a/src/applications/nuance/application/PhabricatorNuanceApplication.php
+++ b/src/applications/nuance/application/PhabricatorNuanceApplication.php
@@ -1,81 +1,77 @@
 <?php
 
 final class PhabricatorNuanceApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Nuance');
   }
 
-  public function getIconName() {
-    return 'nuance';
-  }
-
   public function getFontIcon() {
     return 'fa-fax';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\x8E";
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function isLaunchable() {
     // Try to hide this even more for now.
     return false;
   }
 
   public function canUninstall() {
     return true;
   }
 
   public function getBaseURI() {
     return '/nuance/';
   }
 
   public function getShortDescription() {
     return pht('High-Volume Task Queues');
   }
 
   public function getRoutes() {
     return array(
       '/nuance/' => array(
         'item/' => array(
           'view/(?P<id>[1-9]\d*)/' => 'NuanceItemViewController',
           'edit/(?P<id>[1-9]\d*)/' => 'NuanceItemEditController',
           'new/'                   => 'NuanceItemEditController',
         ),
         'source/' => array(
           'view/(?P<id>[1-9]\d*)/' => 'NuanceSourceViewController',
           'edit/(?P<id>[1-9]\d*)/' => 'NuanceSourceEditController',
           'new/'                   => 'NuanceSourceEditController',
         ),
         'queue/' => array(
           'view/(?P<id>[1-9]\d*)/' => 'NuanceQueueViewController',
           'edit/(?P<id>[1-9]\d*)/' => 'NuanceQueueEditController',
           'new/'                   => 'NuanceQueueEditController',
         ),
         'requestor/' => array(
           'view/(?P<id>[1-9]\d*)/' => 'NuanceRequestorViewController',
           'edit/(?P<id>[1-9]\d*)/' => 'NuanceRequestorEditController',
           'new/'                   => 'NuanceRequestorEditController',
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       NuanceSourceDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created sources.'),
       ),
       NuanceSourceDefaultEditCapability::CAPABILITY => array(
         'caption' => pht('Default edit policy for newly created sources.'),
       ),
       NuanceSourceManageCapability::CAPABILITY => array(),
     );
   }
 
 }
diff --git a/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
index 94faae69dd..82bb0d6821 100644
--- a/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
+++ b/src/applications/oauthserver/application/PhabricatorOAuthServerApplication.php
@@ -1,72 +1,68 @@
 <?php
 
 final class PhabricatorOAuthServerApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('OAuth Server');
   }
 
   public function getBaseURI() {
     return '/oauthserver/';
   }
 
   public function getShortDescription() {
     return pht('OAuth Login Provider');
   }
 
-  public function getIconName() {
-    return 'oauthserver';
-  }
-
   public function getFontIcon() {
     return 'fa-hotel';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x99\x86";
   }
 
   public function getFlavorText() {
     return pht('Login with Phabricator');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Using the Phabricator OAuth Server');
   }
 
   public function getRoutes() {
     return array(
       '/oauthserver/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorOAuthClientListController',
         'auth/' => 'PhabricatorOAuthServerAuthController',
         'test/(?P<id>\d+)/' => 'PhabricatorOAuthServerTestController',
         'token/' => 'PhabricatorOAuthServerTokenController',
         'client/' => array(
           'create/' => 'PhabricatorOAuthClientEditController',
           'delete/(?P<phid>[^/]+)/' => 'PhabricatorOAuthClientDeleteController',
           'edit/(?P<phid>[^/]+)/' => 'PhabricatorOAuthClientEditController',
           'view/(?P<phid>[^/]+)/' => 'PhabricatorOAuthClientViewController',
           'secret/(?P<phid>[^/]+)/' => 'PhabricatorOAuthClientSecretController',
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       PhabricatorOAuthServerCreateClientsCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 
 }
diff --git a/src/applications/owners/application/PhabricatorOwnersApplication.php b/src/applications/owners/application/PhabricatorOwnersApplication.php
index 18acb9ab9d..fc11103179 100644
--- a/src/applications/owners/application/PhabricatorOwnersApplication.php
+++ b/src/applications/owners/application/PhabricatorOwnersApplication.php
@@ -1,54 +1,50 @@
 <?php
 
 final class PhabricatorOwnersApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Owners');
   }
 
   public function getBaseURI() {
     return '/owners/';
   }
 
-  public function getIconName() {
-    return 'owners';
-  }
-
   public function getFontIcon() {
     return 'fa-gift';
   }
 
   public function getShortDescription() {
     return pht('Own Source Code');
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\x81";
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Owners Tool User Guide');
   }
 
   public function getFlavorText() {
     return pht('Adopt today!');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getRoutes() {
     return array(
       '/owners/' => array(
         '' => 'PhabricatorOwnersListController',
         'view/(?P<view>[^/]+)/' => 'PhabricatorOwnersListController',
         'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorOwnersEditController',
         'new/' => 'PhabricatorOwnersEditController',
         'package/(?P<id>[1-9]\d*)/' => 'PhabricatorOwnersDetailController',
         'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorOwnersDeleteController',
       ),
     );
   }
 
 }
diff --git a/src/applications/passphrase/application/PhabricatorPassphraseApplication.php b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
index d5fb4d1fa8..d549a451e5 100644
--- a/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
+++ b/src/applications/passphrase/application/PhabricatorPassphraseApplication.php
@@ -1,64 +1,60 @@
 <?php
 
 final class PhabricatorPassphraseApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Passphrase');
   }
 
   public function getBaseURI() {
     return '/passphrase/';
   }
 
   public function getShortDescription() {
     return pht('Credential Store');
   }
 
-  public function getIconName() {
-    return 'passphrase';
-  }
-
   public function getFontIcon() {
     return 'fa-user-secret';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x97\x88";
   }
 
   public function getFlavorText() {
     return pht('Put your secrets in a lockbox.');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getRoutes() {
     return array(
       '/K(?P<id>\d+)' => 'PassphraseCredentialViewController',
       '/passphrase/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PassphraseCredentialListController',
         'create/' => 'PassphraseCredentialCreateController',
         'edit/(?:(?P<id>\d+)/)?' => 'PassphraseCredentialEditController',
         'destroy/(?P<id>\d+)/' => 'PassphraseCredentialDestroyController',
         'reveal/(?P<id>\d+)/' => 'PassphraseCredentialRevealController',
         'public/(?P<id>\d+)/' => 'PassphraseCredentialPublicController',
         'lock/(?P<id>\d+)/' => 'PassphraseCredentialLockController',
         'conduit/(?P<id>\d+)/' => 'PassphraseCredentialConduitController',
       ),
     );
   }
 
   public function getRemarkupRules() {
     return array(
       new PassphraseRemarkupRule(),
     );
   }
 
 }
diff --git a/src/applications/paste/application/PhabricatorPasteApplication.php b/src/applications/paste/application/PhabricatorPasteApplication.php
index 6de712a92a..38f0484339 100644
--- a/src/applications/paste/application/PhabricatorPasteApplication.php
+++ b/src/applications/paste/application/PhabricatorPasteApplication.php
@@ -1,89 +1,85 @@
 <?php
 
 final class PhabricatorPasteApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Paste');
   }
 
   public function getBaseURI() {
     return '/paste/';
   }
 
-  public function getIconName() {
-    return 'paste';
-  }
-
   public function getFontIcon() {
     return 'fa-paste';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9C\x8E";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getShortDescription() {
     return pht('Share Text Snippets');
   }
 
   public function getRemarkupRules() {
     return array(
       new PhabricatorPasteRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/P(?P<id>[1-9]\d*)(?:\$(?P<lines>\d+(?:-\d+)?))?'
         => 'PhabricatorPasteViewController',
       '/paste/' => array(
         '(query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorPasteListController',
         'create/' => 'PhabricatorPasteEditController',
         'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorPasteEditController',
         'comment/(?P<id>[1-9]\d*)/' => 'PhabricatorPasteCommentController',
       ),
     );
   }
 
   public function supportsEmailIntegration() {
     return true;
   }
 
   public function getAppEmailBlurb() {
     return pht(
       'Send email to these addresses to create pastes. %s',
       phutil_tag(
         'a',
         array(
           'href' => $this->getInboundEmailSupportLink(),),
         pht('Learn More')));
   }
 
   protected function getCustomCapabilities() {
     return array(
       PasteDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for newly created pastes.'),
       ),
       PasteDefaultEditCapability::CAPABILITY => array(
         'caption' => pht('Default edit policy for newly created pastes.'),
       ),
     );
   }
 
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     $items = array();
 
     $item = id(new PHUIListItemView())
       ->setName(pht('Paste'))
       ->setIcon('fa-clipboard')
       ->setHref($this->getBaseURI().'create/');
     $items[] = $item;
 
     return $items;
   }
 
 }
diff --git a/src/applications/people/application/PhabricatorPeopleApplication.php b/src/applications/people/application/PhabricatorPeopleApplication.php
index 165a7b387f..d46a2c4f6d 100644
--- a/src/applications/people/application/PhabricatorPeopleApplication.php
+++ b/src/applications/people/application/PhabricatorPeopleApplication.php
@@ -1,175 +1,171 @@
 <?php
 
 final class PhabricatorPeopleApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('People');
   }
 
   public function getShortDescription() {
     return pht('User Accounts and Profiles');
   }
 
   public function getBaseURI() {
     return '/people/';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x99\x9F";
   }
 
-  public function getIconName() {
-    return 'people';
-  }
-
   public function getFontIcon() {
     return 'fa-users';
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return $viewer->getIsAdmin();
   }
 
   public function getFlavorText() {
     return pht('Sort of a social utility.');
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function getEventListeners() {
     return array(
       new PhabricatorPeopleHovercardEventListener(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/people/' => array(
         '(query/(?P<key>[^/]+)/)?' => 'PhabricatorPeopleListController',
         'logs/(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorPeopleLogsController',
         'approve/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleApproveController',
         '(?P<via>disapprove)/(?P<id>[1-9]\d*)/'
           => 'PhabricatorPeopleDisableController',
         '(?P<via>disable)/(?P<id>[1-9]\d*)/'
           => 'PhabricatorPeopleDisableController',
         'empower/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleEmpowerController',
         'delete/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleDeleteController',
         'rename/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleRenameController',
         'welcome/(?P<id>[1-9]\d*)/' => 'PhabricatorPeopleWelcomeController',
         'create/' => 'PhabricatorPeopleCreateController',
         'new/(?P<type>[^/]+)/' => 'PhabricatorPeopleNewController',
         'ldap/' => 'PhabricatorPeopleLdapController',
         'editprofile/(?P<id>[1-9]\d*)/' =>
           'PhabricatorPeopleProfileEditController',
         'picture/(?P<id>[1-9]\d*)/' =>
           'PhabricatorPeopleProfilePictureController',
       ),
       '/p/(?P<username>[\w._-]+)/'
         => 'PhabricatorPeopleProfileController',
       '/p/(?P<username>[\w._-]+)/calendar/'
         => 'PhabricatorPeopleCalendarController',
     );
   }
 
   public function getRemarkupRules() {
     return array(
       new PhabricatorMentionRemarkupRule(),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       PeopleCreateUsersCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
       PeopleBrowseUserDirectoryCapability::CAPABILITY => array(),
     );
   }
 
   public function loadStatus(PhabricatorUser $user) {
     if (!$user->getIsAdmin()) {
       return array();
     }
 
     $need_approval = id(new PhabricatorPeopleQuery())
       ->setViewer($user)
       ->withIsApproved(false)
       ->withIsDisabled(false)
       ->setLimit(self::MAX_STATUS_ITEMS)
       ->execute();
 
     if (!$need_approval) {
       return array();
     }
 
     $status = array();
 
     $count = count($need_approval);
     $count_str = self::formatStatusCount(
       $count,
       '%s Users Need Approval',
       '%d User(s) Need Approval');
     $type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)
       ->setText($count_str)
       ->setCount($count);
 
     return $status;
   }
 
   public function buildMainMenuItems(
     PhabricatorUser $user,
     PhabricatorController $controller = null) {
 
     $items = array();
 
     if ($user->isLoggedIn() && $user->isUserActivated()) {
       $image = $user->loadProfileImageURI();
 
       $item = id(new PHUIListItemView())
         ->setName($user->getUsername())
         ->setHref('/p/'.$user->getUsername().'/')
         ->addClass('core-menu-item')
         ->setAural(pht('Profile'))
         ->setOrder(100);
 
       $classes = array(
         'phabricator-core-menu-icon',
         'phabricator-core-menu-profile-image',
       );
 
       $item->appendChild(
         phutil_tag(
           'span',
           array(
             'class' => implode(' ', $classes),
             'style' => 'background-image: url('.$image.')',
           ),
           ''));
 
       $items[] = $item;
     }
 
     return $items;
   }
 
 
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     $items = array();
 
     if ($viewer->getIsAdmin()) {
       $item = id(new PHUIListItemView())
         ->setName(pht('User Account'))
         ->setIcon('fa-users')
         ->setHref($this->getBaseURI().'create/');
       $items[] = $item;
     }
 
     return $items;
   }
 
 }
diff --git a/src/applications/phame/application/PhabricatorPhameApplication.php b/src/applications/phame/application/PhabricatorPhameApplication.php
index 82f5205a4d..452a521854 100644
--- a/src/applications/phame/application/PhabricatorPhameApplication.php
+++ b/src/applications/phame/application/PhabricatorPhameApplication.php
@@ -1,71 +1,67 @@
 <?php
 
 final class PhabricatorPhameApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Phame');
   }
 
   public function getBaseURI() {
     return '/phame/';
   }
 
-  public function getIconName() {
-    return 'phame';
-  }
-
   public function getFontIcon() {
     return 'fa-star';
   }
 
   public function getShortDescription() {
     return 'Blog';
   }
 
   public function getTitleGlyph() {
     return "\xe2\x9c\xa9";
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Phame User Guide');
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRoutes() {
     return array(
      '/phame/' => array(
         '' => 'PhamePostListController',
         'r/(?P<id>\d+)/(?P<hash>[^/]+)/(?P<name>.*)'
           => 'PhameResourceController',
 
         'live/(?P<id>[^/]+)/(?P<more>.*)' => 'PhameBlogLiveController',
         'post/' => array(
           '(?:(?P<filter>draft|all)/)?' => 'PhamePostListController',
           'blogger/(?P<bloggername>[\w\.-_]+)/' => 'PhamePostListController',
           'delete/(?P<id>[^/]+)/' => 'PhamePostDeleteController',
           'edit/(?:(?P<id>[^/]+)/)?' => 'PhamePostEditController',
           'view/(?P<id>\d+)/' => 'PhamePostViewController',
           'publish/(?P<id>\d+)/' => 'PhamePostPublishController',
           'unpublish/(?P<id>\d+)/' => 'PhamePostUnpublishController',
           'notlive/(?P<id>\d+)/' => 'PhamePostNotLiveController',
           'preview/' => 'PhamePostPreviewController',
           'framed/(?P<id>\d+)/' => 'PhamePostFramedController',
           'new/' => 'PhamePostNewController',
           'move/(?P<id>\d+)/' => 'PhamePostNewController',
         ),
         'blog/' => array(
           '(?:(?P<filter>user|all)/)?' => 'PhameBlogListController',
           'delete/(?P<id>[^/]+)/' => 'PhameBlogDeleteController',
           'edit/(?P<id>[^/]+)/' => 'PhameBlogEditController',
           'view/(?P<id>[^/]+)/' => 'PhameBlogViewController',
           'feed/(?P<id>[^/]+)/' => 'PhameBlogFeedController',
           'new/' => 'PhameBlogEditController',
         ),
       ),
     );
   }
 
 }
diff --git a/src/applications/phlux/application/PhabricatorPhluxApplication.php b/src/applications/phlux/application/PhabricatorPhluxApplication.php
index feaf981eec..aabd7c9d1a 100644
--- a/src/applications/phlux/application/PhabricatorPhluxApplication.php
+++ b/src/applications/phlux/application/PhabricatorPhluxApplication.php
@@ -1,47 +1,43 @@
 <?php
 
 final class PhabricatorPhluxApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Phlux');
   }
 
   public function getBaseURI() {
     return '/phlux/';
   }
 
   public function getShortDescription() {
     return pht('Key/Value Configuration Store');
   }
 
-  public function getIconName() {
-    return 'phlux';
-  }
-
   public function getFontIcon() {
     return 'fa-copy';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\xBD";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRoutes() {
     return array(
       '/phlux/' => array(
         '' => 'PhluxListController',
         'view/(?P<key>[^/]+)/' => 'PhluxViewController',
         'edit/(?:(?P<key>[^/]+)/)?' => 'PhluxEditController',
       ),
     );
   }
 
 }
diff --git a/src/applications/pholio/application/PhabricatorPholioApplication.php b/src/applications/pholio/application/PhabricatorPholioApplication.php
index 06e554158c..4524852085 100644
--- a/src/applications/pholio/application/PhabricatorPholioApplication.php
+++ b/src/applications/pholio/application/PhabricatorPholioApplication.php
@@ -1,84 +1,80 @@
 <?php
 
 final class PhabricatorPholioApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Pholio');
   }
 
   public function getBaseURI() {
     return '/pholio/';
   }
 
   public function getShortDescription() {
     return pht('Review Mocks and Design');
   }
 
-  public function getIconName() {
-    return 'pholio';
-  }
-
   public function getFontIcon() {
     return 'fa-camera-retro';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9D\xA6";
   }
 
   public function getFlavorText() {
     return pht('Things before they were cool.');
   }
 
   public function getEventListeners() {
     return array(
       new PholioActionMenuEventListener(),
     );
   }
 
   public function getRemarkupRules() {
     return array(
       new PholioRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/M(?P<id>[1-9]\d*)(?:/(?P<imageID>\d+)/)?' => 'PholioMockViewController',
       '/pholio/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PholioMockListController',
         'new/'                  => 'PholioMockEditController',
         'edit/(?P<id>\d+)/'     => 'PholioMockEditController',
         'comment/(?P<id>\d+)/'  => 'PholioMockCommentController',
         'inline/' => array(
           '(?:(?P<id>\d+)/)?' => 'PholioInlineController',
           'list/(?P<id>\d+)/' => 'PholioInlineListController',
           'thumb/(?P<imageid>\d+)/' => 'PholioInlineThumbController',
         ),
         'image/' => array(
           'upload/' => 'PholioImageUploadController',
         ),
       ),
     );
   }
 
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     $items = array();
 
     $item = id(new PHUIListItemView())
       ->setName(pht('Pholio Mock'))
       ->setIcon('fa-picture-o')
       ->setHref($this->getBaseURI().'new/');
     $items[] = $item;
 
     return $items;
   }
 
   protected function getCustomCapabilities() {
     return array(
       PholioDefaultViewCapability::CAPABILITY => array(),
       PholioDefaultEditCapability::CAPABILITY => array(),
     );
   }
 
 }
diff --git a/src/applications/phortune/application/PhabricatorPhortuneApplication.php b/src/applications/phortune/application/PhabricatorPhortuneApplication.php
index 23da65f4fc..8eac0d16b7 100644
--- a/src/applications/phortune/application/PhabricatorPhortuneApplication.php
+++ b/src/applications/phortune/application/PhabricatorPhortuneApplication.php
@@ -1,113 +1,109 @@
 <?php
 
 final class PhabricatorPhortuneApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Phortune');
   }
 
   public function getBaseURI() {
     return '/phortune/';
   }
 
   public function getShortDescription() {
     return pht('Accounts and Billing');
   }
 
-  public function getIconName() {
-    return 'phortune';
-  }
-
   public function getFontIcon() {
     return 'fa-diamond';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x97\x87";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRoutes() {
     return array(
       '/phortune/' => array(
         '' => 'PhortuneLandingController',
         '(?P<accountID>\d+)/' => array(
           '' => 'PhortuneAccountViewController',
           'card/' => array(
             'new/' => 'PhortunePaymentMethodCreateController',
           ),
           'order/(?:query/(?P<queryKey>[^/]+)/)?'
             => 'PhortuneCartListController',
           'subscription/' => array(
             '(?:query/(?P<queryKey>[^/]+)/)?'
               => 'PhortuneSubscriptionListController',
             'view/(?P<id>\d+)/'
               => 'PhortuneSubscriptionViewController',
             'order/(?P<subscriptionID>\d+)/'
               => 'PhortuneCartListController',
           ),
           'charge/(?:query/(?P<queryKey>[^/]+)/)?'
             => 'PhortuneChargeListController',
         ),
         'card/(?P<id>\d+)/' => array(
           'edit/' => 'PhortunePaymentMethodEditController',
           'disable/' => 'PhortunePaymentMethodDisableController',
         ),
         'cart/(?P<id>\d+)/' => array(
           '' => 'PhortuneCartViewController',
           'checkout/' => 'PhortuneCartCheckoutController',
           '(?P<action>cancel|refund)/' => 'PhortuneCartCancelController',
           'update/' => 'PhortuneCartUpdateController',
           'accept/' => 'PhortuneCartAcceptController',
         ),
         'account/' => array(
           '' => 'PhortuneAccountListController',
           'edit/(?:(?P<id>\d+)/)?' => 'PhortuneAccountEditController',
         ),
         'product/' => array(
           '' => 'PhortuneProductListController',
           'view/(?P<id>\d+)/' => 'PhortuneProductViewController',
           'edit/(?:(?P<id>\d+)/)?' => 'PhortuneProductEditController',
         ),
         'provider/' => array(
           'edit/(?:(?P<id>\d+)/)?' => 'PhortuneProviderEditController',
           'disable/(?P<id>\d+)/' => 'PhortuneProviderDisableController',
           '(?P<id>\d+)/(?P<action>[^/]+)/'
             => 'PhortuneProviderActionController',
         ),
         'merchant/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhortuneMerchantListController',
           'edit/(?:(?P<id>\d+)/)?' => 'PhortuneMerchantEditController',
           'orders/(?P<merchantID>\d+)/(?:query/(?P<queryKey>[^/]+)/)?'
             => 'PhortuneCartListController',
           '(?P<merchantID>\d+)/subscription/' => array(
             '(?:query/(?P<queryKey>[^/]+)/)?'
               => 'PhortuneSubscriptionListController',
             'view/(?P<id>\d+)/'
               => 'PhortuneSubscriptionViewController',
             'order/(?P<subscriptionID>\d+)/'
               => 'PhortuneCartListController',
           ),
           '(?P<id>\d+)/' => 'PhortuneMerchantViewController',
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       PhortuneMerchantCapability::CAPABILITY => array(
         'caption' => pht('Merchant accounts can receive payments.'),
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
     );
   }
 
 }
diff --git a/src/applications/phpast/application/PhabricatorPHPASTApplication.php b/src/applications/phpast/application/PhabricatorPHPASTApplication.php
index f24f03650d..8a9efa5a99 100644
--- a/src/applications/phpast/application/PhabricatorPHPASTApplication.php
+++ b/src/applications/phpast/application/PhabricatorPHPASTApplication.php
@@ -1,51 +1,47 @@
 <?php
 
 final class PhabricatorPHPASTApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('PHPAST');
   }
 
   public function getBaseURI() {
     return '/xhpast/';
   }
 
-  public function getIconName() {
-    return 'phpast';
-  }
-
   public function getFontIcon() {
     return 'fa-ambulance';
   }
 
   public function getShortDescription() {
     return 'Visual PHP Parser';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x96\xA0";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_DEVELOPER;
   }
 
   public function getRoutes() {
     return array(
       '/xhpast/' => array(
         '' => 'PhabricatorXHPASTViewRunController',
         'view/(?P<id>[1-9]\d*)/'
           => 'PhabricatorXHPASTViewFrameController',
         'frameset/(?P<id>[1-9]\d*)/'
           => 'PhabricatorXHPASTViewFramesetController',
         'input/(?P<id>[1-9]\d*)/'
           => 'PhabricatorXHPASTViewInputController',
         'tree/(?P<id>[1-9]\d*)/'
           => 'PhabricatorXHPASTViewTreeController',
         'stream/(?P<id>[1-9]\d*)/'
           => 'PhabricatorXHPASTViewStreamController',
       ),
     );
   }
 
 }
diff --git a/src/applications/phragment/application/PhabricatorPhragmentApplication.php b/src/applications/phragment/application/PhabricatorPhragmentApplication.php
index 90e2e69928..9463835811 100644
--- a/src/applications/phragment/application/PhabricatorPhragmentApplication.php
+++ b/src/applications/phragment/application/PhabricatorPhragmentApplication.php
@@ -1,74 +1,70 @@
 <?php
 
 final class PhabricatorPhragmentApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Phragment');
   }
 
   public function getBaseURI() {
     return '/phragment/';
   }
 
   public function getShortDescription() {
     return pht('Versioned Artifact Storage');
   }
 
-  public function getIconName() {
-    return 'phragment';
-  }
-
   public function getFontIcon() {
     return 'fa-floppy-o';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x26\xB6";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function canUninstall() {
     return true;
   }
 
   public function getRoutes() {
     return array(
       '/phragment/' => array(
         '' => 'PhragmentBrowseController',
         'browse/(?P<dblob>.*)' => 'PhragmentBrowseController',
         'create/(?P<dblob>.*)' => 'PhragmentCreateController',
         'update/(?P<dblob>.+)' => 'PhragmentUpdateController',
         'policy/(?P<dblob>.+)' => 'PhragmentPolicyController',
         'history/(?P<dblob>.+)' => 'PhragmentHistoryController',
         'zip/(?P<dblob>.+)' => 'PhragmentZIPController',
         'zip@(?P<snapshot>[^/]+)/(?P<dblob>.+)' => 'PhragmentZIPController',
         'version/(?P<id>[0-9]*)/' => 'PhragmentVersionController',
         'patch/(?P<aid>[0-9x]*)/(?P<bid>[0-9]*)/' => 'PhragmentPatchController',
         'revert/(?P<id>[0-9]*)/(?P<dblob>.*)' => 'PhragmentRevertController',
         'snapshot/' => array(
           'create/(?P<dblob>.*)' => 'PhragmentSnapshotCreateController',
           'view/(?P<id>[0-9]*)/' => 'PhragmentSnapshotViewController',
           'delete/(?P<id>[0-9]*)/' => 'PhragmentSnapshotDeleteController',
           'promote/' => array(
             'latest/(?P<dblob>.*)' => 'PhragmentSnapshotPromoteController',
             '(?P<id>[0-9]*)/' => 'PhragmentSnapshotPromoteController',
           ),
         ),
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       PhragmentCanCreateCapability::CAPABILITY => array(),
     );
   }
 
 }
diff --git a/src/applications/phrequent/application/PhabricatorPhrequentApplication.php b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
index fb627fea76..bc0c39994f 100644
--- a/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
+++ b/src/applications/phrequent/application/PhabricatorPhrequentApplication.php
@@ -1,75 +1,71 @@
 <?php
 
 final class PhabricatorPhrequentApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Phrequent');
   }
 
   public function getShortDescription() {
     return pht('Track Time Spent');
   }
 
   public function getBaseURI() {
     return '/phrequent/';
   }
 
   public function isPrototype() {
     return true;
   }
 
-  public function getIconName() {
-    return 'phrequent';
-  }
-
   public function getFontIcon() {
     return 'fa-clock-o';
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getApplicationOrder() {
     return 0.110;
   }
 
   public function getEventListeners() {
     return array(
       new PhrequentUIEventListener(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/phrequent/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhrequentListController',
         'track/(?P<verb>[a-z]+)/(?P<phid>[^/]+)/'
           => 'PhrequentTrackController',
       ),
     );
   }
 
   public function loadStatus(PhabricatorUser $user) {
     $status = array();
 
     // Show number of objects that are currently
     // being tracked for a user.
 
     $count = PhrequentUserTimeQuery::getUserTotalObjectsTracked(
       $user,
       self::MAX_STATUS_ITEMS);
     $count_str = self::formatStatusCount(
       $count,
       '%s Objects Tracked',
       '%d Object(s) Tracked');
     $type = PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION;
     $status[] = id(new PhabricatorApplicationStatusView())
       ->setType($type)
       ->setText($count_str)
       ->setCount($count);
 
     return $status;
   }
 
 }
diff --git a/src/applications/phriction/application/PhabricatorPhrictionApplication.php b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
index dd5f4a2c27..db378633a4 100644
--- a/src/applications/phriction/application/PhabricatorPhrictionApplication.php
+++ b/src/applications/phriction/application/PhabricatorPhrictionApplication.php
@@ -1,71 +1,67 @@
 <?php
 
 final class PhabricatorPhrictionApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Phriction');
   }
 
   public function getShortDescription() {
     return pht('Wiki');
   }
 
   public function getBaseURI() {
     return '/w/';
   }
 
-  public function getIconName() {
-    return 'phriction';
-  }
-
   public function getFontIcon() {
     return 'fa-book';
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return true;
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Phriction User Guide');
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9A\xA1";
   }
 
   public function getRemarkupRules() {
     return array(
       new PhrictionRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       // Match "/w/" with slug "/".
       '/w(?P<slug>/)'    => 'PhrictionDocumentController',
       // Match "/w/x/y/z/" with slug "x/y/z/".
       '/w/(?P<slug>.+/)' => 'PhrictionDocumentController',
 
       '/phriction/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhrictionListController',
 
         'history(?P<slug>/)'     => 'PhrictionHistoryController',
         'history/(?P<slug>.+/)'  => 'PhrictionHistoryController',
 
         'edit/(?:(?P<id>[1-9]\d*)/)?' => 'PhrictionEditController',
         'delete/(?P<id>[1-9]\d*)/'    => 'PhrictionDeleteController',
         'new/'                        => 'PhrictionNewController',
         'move/(?P<id>[1-9]\d*)/' => 'PhrictionMoveController',
 
         'preview/' => 'PhabricatorMarkupPreviewController',
         'diff/(?P<id>[1-9]\d*)/' => 'PhrictionDiffController',
       ),
     );
   }
 
   public function getApplicationOrder() {
     return 0.140;
   }
 
 }
diff --git a/src/applications/ponder/application/PhabricatorPonderApplication.php b/src/applications/ponder/application/PhabricatorPonderApplication.php
index 2122fbc181..a23a370d60 100644
--- a/src/applications/ponder/application/PhabricatorPonderApplication.php
+++ b/src/applications/ponder/application/PhabricatorPonderApplication.php
@@ -1,73 +1,69 @@
 <?php
 
 final class PhabricatorPonderApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/ponder/';
   }
 
   public function getName() {
     return pht('Ponder');
   }
 
   public function getShortDescription() {
     return pht('Questions and Answers');
   }
 
-  public function getIconName() {
-    return 'ponder';
-  }
-
   public function getFontIcon() {
     return 'fa-university';
   }
 
   public function getFactObjectsForAnalysis() {
     return array(
       new PonderQuestion(),
     );
   }
 
   public function getTitleGlyph() {
     return "\xE2\x97\xB3";
   }
 
   public function loadStatus(PhabricatorUser $user) {
     // replace with "x new unanswered questions" or some such
     // make sure to use self::formatStatusCount and friends...!
     $status = array();
 
     return $status;
   }
 
   public function getRemarkupRules() {
     return array(
       new PonderRemarkupRule(),
     );
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRoutes() {
     return array(
       '/Q(?P<id>[1-9]\d*)' => 'PonderQuestionViewController',
       '/ponder/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PonderQuestionListController',
         'answer/add/' => 'PonderAnswerSaveController',
         'answer/edit/(?P<id>\d+)/' => 'PonderAnswerEditController',
         'answer/comment/(?P<id>\d+)/' => 'PonderAnswerCommentController',
         'answer/history/(?P<id>\d+)/' => 'PonderAnswerHistoryController',
         'question/edit/(?:(?P<id>\d+)/)?' => 'PonderQuestionEditController',
         'question/comment/(?P<id>\d+)/' => 'PonderQuestionCommentController',
         'question/history/(?P<id>\d+)/' => 'PonderQuestionHistoryController',
         'preview/' => 'PhabricatorMarkupPreviewController',
         'question/(?P<status>open|close)/(?P<id>[1-9]\d*)/'
           => 'PonderQuestionStatusController',
         'vote/' => 'PonderVoteSaveController',
       ),
     );
   }
 
 }
diff --git a/src/applications/project/application/PhabricatorProjectApplication.php b/src/applications/project/application/PhabricatorProjectApplication.php
index 0dd6983181..7f874da3be 100644
--- a/src/applications/project/application/PhabricatorProjectApplication.php
+++ b/src/applications/project/application/PhabricatorProjectApplication.php
@@ -1,140 +1,136 @@
 <?php
 
 final class PhabricatorProjectApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Projects');
   }
 
   public function getShortDescription() {
     return pht('Get Organized');
   }
 
   public function isPinnedByDefault(PhabricatorUser $viewer) {
     return true;
   }
 
   public function getBaseURI() {
     return '/project/';
   }
 
-  public function getIconName() {
-    return 'projects';
-  }
-
   public function getFontIcon() {
     return 'fa-briefcase';
   }
 
   public function getFlavorText() {
     return pht('Group stuff into big piles.');
   }
 
   public function getRemarkupRules() {
     return array(
       new ProjectRemarkupRule(),
     );
   }
 
   public function getEventListeners() {
     return array(
       new PhabricatorProjectUIEventListener(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/project/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorProjectListController',
         'filter/(?P<filter>[^/]+)/' => 'PhabricatorProjectListController',
         'details/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectEditDetailsController',
         'archive/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectArchiveController',
         'members/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectMembersEditController',
         'members/(?P<id>[1-9]\d*)/remove/'
           => 'PhabricatorProjectMembersRemoveController',
         'profile/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectProfileController',
         'feed/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectFeedController',
         'view/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectViewController',
         'picture/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectEditPictureController',
         'icon/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectEditIconController',
         'icon/'
           => 'PhabricatorProjectEditIconController',
         'create/' => 'PhabricatorProjectEditDetailsController',
         'board/(?P<id>[1-9]\d*)/'.
           '(?P<filter>filter/)?'.
           '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorProjectBoardViewController',
         'move/(?P<id>[1-9]\d*)/' => 'PhabricatorProjectMoveController',
         'board/(?P<projectID>[1-9]\d*)/' => array(
           'edit/(?:(?P<id>\d+)/)?'
             => 'PhabricatorProjectColumnEditController',
           'hide/(?:(?P<id>\d+)/)?'
             => 'PhabricatorProjectColumnHideController',
           'column/(?:(?P<id>\d+)/)?'
             => 'PhabricatorProjectColumnDetailController',
           'import/'
             => 'PhabricatorProjectBoardImportController',
           'reorder/'
             => 'PhabricatorProjectBoardReorderController',
         ),
         'update/(?P<id>[1-9]\d*)/(?P<action>[^/]+)/'
           => 'PhabricatorProjectUpdateController',
         'history/(?P<id>[1-9]\d*)/' => 'PhabricatorProjectHistoryController',
         '(?P<action>watch|unwatch)/(?P<id>[1-9]\d*)/'
           => 'PhabricatorProjectWatchController',
       ),
       '/tag/' => array(
         '(?P<slug>[^/]+)/' => 'PhabricatorProjectViewController',
         '(?P<slug>[^/]+)/board/' => 'PhabricatorProjectBoardViewController',
       ),
     );
   }
 
   public function getQuickCreateItems(PhabricatorUser $viewer) {
     $can_create = PhabricatorPolicyFilter::hasCapability(
       $viewer,
       $this,
       ProjectCreateProjectsCapability::CAPABILITY);
 
     $items = array();
     if ($can_create) {
       $item = id(new PHUIListItemView())
         ->setName(pht('Project'))
         ->setIcon('fa-briefcase')
         ->setHref($this->getBaseURI().'create/');
       $items[] = $item;
     }
 
     return $items;
   }
 
   protected function getCustomCapabilities() {
     return array(
       ProjectCreateProjectsCapability::CAPABILITY => array(),
       ProjectCanLockProjectsCapability::CAPABILITY => array(
         'default' => PhabricatorPolicies::POLICY_ADMIN,
       ),
       ProjectDefaultViewCapability::CAPABILITY => array(
         'caption' => pht(
           'Default view policy for newly created projects.'),
       ),
       ProjectDefaultEditCapability::CAPABILITY => array(
         'caption' => pht(
           'Default edit policy for newly created projects.'),
       ),
       ProjectDefaultJoinCapability::CAPABILITY => array(
         'caption' => pht(
           'Default join policy for newly created projects.'),
       ),
     );
   }
 
 }
diff --git a/src/applications/releeph/application/PhabricatorReleephApplication.php b/src/applications/releeph/application/PhabricatorReleephApplication.php
index b9d4ff3d23..064aaea6a6 100644
--- a/src/applications/releeph/application/PhabricatorReleephApplication.php
+++ b/src/applications/releeph/application/PhabricatorReleephApplication.php
@@ -1,85 +1,81 @@
 <?php
 
 final class PhabricatorReleephApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Releeph');
   }
 
   public function getShortDescription() {
     return pht('Pull Requests');
   }
 
   public function getBaseURI() {
     return '/releeph/';
   }
 
-  public function getIconName() {
-    return 'releeph';
-  }
-
   public function getFontIcon() {
     return 'fa-flag-checkered';
   }
 
   public function isPrototype() {
     return true;
   }
 
   public function getRoutes() {
     return array(
       '/Y(?P<requestID>[1-9]\d*)' => 'ReleephRequestViewController',
 
       // TODO: Remove these older routes eventually.
       '/RQ(?P<requestID>[1-9]\d*)' => 'ReleephRequestViewController',
       '/releeph/request/(?P<requestID>[1-9]\d*)/'
         => 'ReleephRequestViewController',
 
       '/releeph/' => array(
         '' => 'ReleephProductListController',
         '(?:product|project)/' => array(
           '(?:query/(?P<queryKey>[^/]+)/)?' => 'ReleephProductListController',
           'create/' => 'ReleephProductCreateController',
           '(?P<projectID>[1-9]\d*)/' => array(
             '(?:query/(?P<queryKey>[^/]+)/)?' => 'ReleephProductViewController',
             'edit/' => 'ReleephProductEditController',
             'cutbranch/' => 'ReleephBranchCreateController',
             'action/(?P<action>.+)/' => 'ReleephProductActionController',
             'history/' => 'ReleephProductHistoryController',
           ),
         ),
 
         'branch/' => array(
           'edit/(?P<branchID>[1-9]\d*)/'
             => 'ReleephBranchEditController',
           '(?P<action>close|re-open)/(?P<branchID>[1-9]\d*)/'
             => 'ReleephBranchAccessController',
           'preview/' => 'ReleephBranchNamePreviewController',
           '(?P<branchID>[1-9]\d*)/' => array(
             'history/' => 'ReleephBranchHistoryController',
             '(?:query/(?P<queryKey>[^/]+)/)?' => 'ReleephBranchViewController',
           ),
           'pull/(?P<branchID>[1-9]\d*)/'
             => 'ReleephRequestEditController',
         ),
 
         'request/' => array(
           'create/' => 'ReleephRequestEditController',
           'differentialcreate/' => array(
             'D(?P<diffRevID>[1-9]\d*)' =>
               'ReleephRequestDifferentialCreateController',
           ),
           'edit/(?P<requestID>[1-9]\d*)/'
             => 'ReleephRequestEditController',
           'action/(?P<action>.+)/(?P<requestID>[1-9]\d*)/'
             => 'ReleephRequestActionController',
           'typeahead/' =>
             'ReleephRequestTypeaheadController',
           'comment/(?P<requestID>[1-9]\d*)/'
             => 'ReleephRequestCommentController',
         ),
       ),
     );
   }
 
 }
diff --git a/src/applications/repository/application/PhabricatorRepositoriesApplication.php b/src/applications/repository/application/PhabricatorRepositoriesApplication.php
index 66568e882f..534db063e7 100644
--- a/src/applications/repository/application/PhabricatorRepositoriesApplication.php
+++ b/src/applications/repository/application/PhabricatorRepositoriesApplication.php
@@ -1,45 +1,41 @@
 <?php
 
 final class PhabricatorRepositoriesApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/repository/';
   }
 
-  public function getIconName() {
-    return 'repositories';
-  }
-
   public function getFontIcon() {
     return 'fa-hdd-o';
   }
 
   public function getName() {
     return pht('Repositories');
   }
 
   public function getShortDescription() {
     return pht('(Deprecated)');
   }
 
   public function getTitleGlyph() {
     return 'rX';
   }
 
   public function getApplicationGroup() {
     return self::GROUP_ADMIN;
   }
 
   public function getRoutes() {
     return array(
       '/repository/' => array(
         '' => 'PhabricatorRepositoryListController',
         'project/edit/(?P<id>[1-9]\d*)/'
           => 'PhabricatorRepositoryArcanistProjectEditController',
         'project/delete/(?P<id>[1-9]\d*)/'
           => 'PhabricatorRepositoryArcanistProjectDeleteController',
       ),
     );
   }
 
 }
diff --git a/src/applications/search/application/PhabricatorSearchApplication.php b/src/applications/search/application/PhabricatorSearchApplication.php
index cdb3835556..51d5e9780c 100644
--- a/src/applications/search/application/PhabricatorSearchApplication.php
+++ b/src/applications/search/application/PhabricatorSearchApplication.php
@@ -1,52 +1,48 @@
 <?php
 
 final class PhabricatorSearchApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/search/';
   }
 
   public function getName() {
     return pht('Search');
   }
 
   public function getShortDescription() {
     return pht('Full-Text Search');
   }
 
   public function getFlavorText() {
     return pht('Find stuff in big piles.');
   }
 
-  public function getIconName() {
-    return 'search';
-  }
-
   public function getFontIcon() {
     return 'fa-search';
   }
 
   public function isLaunchable() {
     return false;
   }
 
   public function getRoutes() {
     return array(
       '/search/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?' => 'PhabricatorSearchController',
         'attach/(?P<phid>[^/]+)/(?P<type>\w+)/(?:(?P<action>\w+)/)?'
           => 'PhabricatorSearchAttachController',
         'select/(?P<type>\w+)/'
           => 'PhabricatorSearchSelectController',
         'index/(?P<phid>[^/]+)/' => 'PhabricatorSearchIndexController',
         'hovercard/(?P<mode>retrieve|test)/'
           => 'PhabricatorSearchHovercardController',
         'edit/(?P<queryKey>[^/]+)/' => 'PhabricatorSearchEditController',
         'delete/(?P<queryKey>[^/]+)/(?P<engine>[^/]+)/'
           => 'PhabricatorSearchDeleteController',
         'order/(?P<engine>[^/]+)/' => 'PhabricatorSearchOrderController',
       ),
     );
   }
 
 }
diff --git a/src/applications/settings/application/PhabricatorSettingsApplication.php b/src/applications/settings/application/PhabricatorSettingsApplication.php
index b7b809d977..da0daf65d2 100644
--- a/src/applications/settings/application/PhabricatorSettingsApplication.php
+++ b/src/applications/settings/application/PhabricatorSettingsApplication.php
@@ -1,69 +1,65 @@
 <?php
 
 final class PhabricatorSettingsApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/settings/';
   }
 
   public function getName() {
     return pht('Settings');
   }
 
   public function getShortDescription() {
     return pht('User Preferences');
   }
 
-  public function getIconName() {
-    return 'settings';
-  }
-
   public function getFontIcon() {
     return 'fa-wrench';
   }
 
   public function canUninstall() {
     return false;
   }
 
   public function isLaunchable() {
     return false;
   }
 
   public function getRoutes() {
     return array(
       '/settings/' => array(
         '(?:(?P<id>\d+)/)?(?:panel/(?P<key>[^/]+)/)?'
           => 'PhabricatorSettingsMainController',
         'adjust/' => 'PhabricatorSettingsAdjustController',
       ),
     );
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function buildMainMenuItems(
     PhabricatorUser $user,
     PhabricatorController $controller = null) {
 
     $items = array();
 
     if ($user->isLoggedIn() && $user->isUserActivated()) {
       $selected = ($controller instanceof PhabricatorSettingsMainController);
       $item = id(new PHUIListItemView())
         ->setName(pht('Settings'))
         ->setIcon('fa-wrench')
         ->addClass('core-menu-item')
         ->setSelected($selected)
         ->setHref('/settings/')
         ->setAural(pht('Settings'))
         ->setOrder(400);
       $items[] = $item;
     }
 
     return $items;
   }
 
 }
diff --git a/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
index b5cdf31f06..9114b0ea89 100644
--- a/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
+++ b/src/applications/slowvote/application/PhabricatorSlowvoteApplication.php
@@ -1,70 +1,66 @@
 <?php
 
 final class PhabricatorSlowvoteApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/vote/';
   }
 
-  public function getIconName() {
-    return 'slowvote';
-  }
-
   public function getFontIcon() {
     return 'fa-bar-chart';
   }
 
   public function getName() {
     return pht('Slowvote');
   }
 
   public function getShortDescription() {
     return pht('Conduct Polls');
   }
 
   public function getTitleGlyph() {
     return "\xE2\x9C\x94";
   }
 
   public function getHelpURI() {
     return PhabricatorEnv::getDoclink('Slowvote User Guide');
   }
 
   public function getFlavorText() {
     return pht('Design by committee.');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getRemarkupRules() {
     return array(
       new SlowvoteRemarkupRule(),
     );
   }
 
   public function getRoutes() {
     return array(
       '/V(?P<id>[1-9]\d*)' => 'PhabricatorSlowvotePollController',
       '/vote/' => array(
         '(?:query/(?P<queryKey>[^/]+)/)?'
           => 'PhabricatorSlowvoteListController',
         'create/' => 'PhabricatorSlowvoteEditController',
         'edit/(?P<id>[1-9]\d*)/' => 'PhabricatorSlowvoteEditController',
         '(?P<id>[1-9]\d*)/' => 'PhabricatorSlowvoteVoteController',
         'comment/(?P<id>[1-9]\d*)/' => 'PhabricatorSlowvoteCommentController',
         'close/(?P<id>[1-9]\d*)/' => 'PhabricatorSlowvoteCloseController',
       ),
     );
   }
 
   protected function getCustomCapabilities() {
     return array(
       PhabricatorSlowvoteDefaultViewCapability::CAPABILITY => array(
         'caption' => pht('Default view policy for new polls.'),
       ),
     );
   }
 
 }
diff --git a/src/applications/tokens/application/PhabricatorTokensApplication.php b/src/applications/tokens/application/PhabricatorTokensApplication.php
index f8682e3143..4462d1a132 100644
--- a/src/applications/tokens/application/PhabricatorTokensApplication.php
+++ b/src/applications/tokens/application/PhabricatorTokensApplication.php
@@ -1,50 +1,46 @@
 <?php
 
 final class PhabricatorTokensApplication extends PhabricatorApplication {
 
   public function getName() {
     return pht('Tokens');
   }
 
   public function getBaseURI() {
     return '/token/';
   }
 
-  public function getIconName() {
-    return 'token';
-  }
-
   public function getFontIcon() {
     return 'fa-trophy';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x99\xA6";
   }
 
   public function getShortDescription() {
     return pht('Award and Acquire Trinkets');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_UTILITIES;
   }
 
   public function getRoutes() {
     return array(
       '/token/' => array(
         '' => 'PhabricatorTokenGivenController',
         'given/' => 'PhabricatorTokenGivenController',
         'give/(?<phid>[^/]+)/' => 'PhabricatorTokenGiveController',
         'leaders/' => 'PhabricatorTokenLeaderController',
       ),
     );
   }
 
   public function getEventListeners() {
     return array(
       new PhabricatorTokenUIEventListener(),
     );
   }
 
 }
diff --git a/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php b/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
index ebc9703039..c347a101e9 100644
--- a/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
+++ b/src/applications/uiexample/application/PhabricatorUIExamplesApplication.php
@@ -1,50 +1,46 @@
 <?php
 
 final class PhabricatorUIExamplesApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/uiexample/';
   }
 
   public function getShortDescription() {
     return pht('Developer UI Examples');
   }
 
   public function getName() {
     return pht('UIExamples');
   }
 
-  public function getIconName() {
-    return 'uiexamples';
-  }
-
   public function getFontIcon() {
     return 'fa-magnet';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x8F\x9A";
   }
 
   public function getFlavorText() {
     return pht('A gallery of modern art.');
   }
 
   public function getApplicationGroup() {
     return self::GROUP_DEVELOPER;
   }
 
   public function getApplicationOrder() {
     return 0.110;
   }
 
   public function getRoutes() {
     return array(
       '/uiexample/' => array(
         '' => 'PhabricatorUIExampleRenderController',
         'view/(?P<class>[^/]+)/' => 'PhabricatorUIExampleRenderController',
       ),
     );
   }
 
 }
diff --git a/src/applications/xhprof/application/PhabricatorXHProfApplication.php b/src/applications/xhprof/application/PhabricatorXHProfApplication.php
index cb30ca2405..ad480a821a 100644
--- a/src/applications/xhprof/application/PhabricatorXHProfApplication.php
+++ b/src/applications/xhprof/application/PhabricatorXHProfApplication.php
@@ -1,43 +1,39 @@
 <?php
 
 final class PhabricatorXHProfApplication extends PhabricatorApplication {
 
   public function getBaseURI() {
     return '/xhprof/';
   }
 
   public function getName() {
     return pht('XHProf');
   }
 
   public function getShortDescription() {
     return pht('PHP Profiling Tool');
   }
 
-  public function getIconName() {
-    return 'xhprof';
-  }
-
   public function getFontIcon() {
     return 'fa-stethoscope';
   }
 
   public function getTitleGlyph() {
     return "\xE2\x98\x84";
   }
 
   public function getApplicationGroup() {
     return self::GROUP_DEVELOPER;
   }
 
   public function getRoutes() {
     return array(
       '/xhprof/' => array(
         '' => 'PhabricatorXHProfSampleListController',
         'list/(?P<view>[^/]+)/' => 'PhabricatorXHProfSampleListController',
         'profile/(?P<phid>[^/]+)/' => 'PhabricatorXHProfProfileController',
       ),
     );
   }
 
 }