diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 6af5f0ab35..83a1db4fb2 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'e25569a9',
     'conpherence.pkg.js' => '6249a1cf',
-    'core.pkg.css' => 'b28c96fb',
+    'core.pkg.css' => '22581832',
     'core.pkg.js' => '1fa7c0c5',
     'darkconsole.pkg.js' => 'e7393ebb',
     'differential.pkg.css' => '4815647b',
@@ -112,7 +112,7 @@ return array(
     'rsrc/css/core/z-index.css' => '5e72c4e0',
     'rsrc/css/diviner/diviner-shared.css' => 'aa3656aa',
     'rsrc/css/font/font-aleo.css' => '8bdb2835',
-    'rsrc/css/font/font-awesome.css' => '2b7ebbcc',
+    'rsrc/css/font/font-awesome.css' => 'e838e088',
     'rsrc/css/font/font-lato.css' => 'c7ccd872',
     'rsrc/css/font/phui-font-icon-base.css' => '870a7360',
     'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
@@ -187,10 +187,10 @@ return array(
     'rsrc/externals/font/aleo/aleo-regular.ttf' => '751e7479',
     'rsrc/externals/font/aleo/aleo-regular.woff' => 'c3744be9',
     'rsrc/externals/font/aleo/aleo-regular.woff2' => '851aa0ee',
-    'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '59b3076c',
-    'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '45ad7e57',
-    'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => 'f861e2a8',
-    'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '0ee0f078',
+    'rsrc/externals/font/fontawesome/fontawesome-webfont.eot' => '24a7064f',
+    'rsrc/externals/font/fontawesome/fontawesome-webfont.ttf' => '0039fe26',
+    'rsrc/externals/font/fontawesome/fontawesome-webfont.woff' => 'de978a43',
+    'rsrc/externals/font/fontawesome/fontawesome-webfont.woff2' => '2a832057',
     'rsrc/externals/font/lato/lato-bold.eot' => '99fbcf8c',
     'rsrc/externals/font/lato/lato-bold.svg' => '2aa83045',
     'rsrc/externals/font/lato/lato-bold.ttf' => '0a7141f7',
@@ -584,7 +584,7 @@ return array(
     'diffusion-source-css' => '68b30fd3',
     'diviner-shared-css' => 'aa3656aa',
     'font-aleo' => '8bdb2835',
-    'font-fontawesome' => '2b7ebbcc',
+    'font-fontawesome' => 'e838e088',
     'font-lato' => 'c7ccd872',
     'global-drag-and-drop-css' => '5c1b47c2',
     'harbormaster-css' => 'f491c9f4',
diff --git a/src/view/phui/PHUIIconView.php b/src/view/phui/PHUIIconView.php
index cdc3825135..d6b1ad0ccd 100644
--- a/src/view/phui/PHUIIconView.php
+++ b/src/view/phui/PHUIIconView.php
@@ -507,6 +507,7 @@ final class PHUIIconView extends AphrontTagView {
       'fa-pied-piper-square',
       'fa-pied-piper',
       'fa-pied-piper-alt',
+      'fa-pied-piper-pp',
       'fa-drupal',
       'fa-joomla',
       'fa-language',
@@ -781,6 +782,69 @@ final class PHUIIconView extends AphrontTagView {
       'fa-snapchat',
       'fa-snapchat-ghost',
       'fa-snapchat-square',
+      'fa-first-order',
+      'fa-yoast',
+      'fa-themeisle',
+      'fa-google-plus-circle',
+      'fa-google-plus-official',
+      'fa-fa',
+      'fa-font-awesome',
+      'fa-handshake-o',
+      'fa-envelope-open',
+      'fa-envelope-open-o',
+      'fa-linode',
+      'fa-address-book',
+      'fa-address-book-o',
+      'fa-vcard',
+      'fa-address-card',
+      'fa-vcard-o',
+      'fa-address-card-o',
+      'fa-user-circle',
+      'fa-user-circle-o',
+      'fa-user-o:before',
+      'fa-id-badge',
+      'fa-drivers-license',
+      'fa-id-card',
+      'fa-drivers-license-o',
+      'fa-id-card-o',
+      'fa-quora',
+      'fa-free-code-camp',
+      'fa-telegram',
+      'fa-thermometer-4',
+      'fa-thermometer',
+      'fa-thermometer-full',
+      'fa-thermometer-3',
+      'fa-thermometer-three-quarters',
+      'fa-thermometer-2',
+      'fa-thermometer-half',
+      'fa-thermometer-1',
+      'fa-thermometer-quarter',
+      'fa-thermometer-0:',
+      'fa-thermometer-empty',
+      'fa-shower',
+      'fa-bathtub',
+      'fa-s15',
+      'fa-bath',
+      'fa-podcast',
+      'fa-window-maximize',
+      'fa-window-minimize',
+      'fa-window-restore',
+      'fa-times-rectangle',
+      'fa-window-close',
+      'fa-times-rectangle-o',
+      'fa-window-close-o',
+      'fa-bandcamp',
+      'fa-grav',
+      'fa-etsy',
+      'fa-imdb',
+      'fa-ravelry',
+      'fa-eercast',
+      'fa-microchip',
+      'fa-snowflake-o',
+      'fa-superpowers',
+      'fa-wpexplorer',
+      'fa-meetup',
+
     );
   }
 
diff --git a/webroot/rsrc/css/font/font-awesome.css b/webroot/rsrc/css/font/font-awesome.css
index 4157229cb3..1579f70f22 100644
--- a/webroot/rsrc/css/font/font-awesome.css
+++ b/webroot/rsrc/css/font/font-awesome.css
@@ -3,15 +3,15 @@
  */
 
 /*!
- *  Font Awesome 4.6.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('/rsrc/externals/font/fontawesome/fontawesome-webfont.eot?v=4.6.0');
-  src: url('/rsrc/externals/font/fontawesome/fontawesome-webfont.eot?#iefix&v=4.6.0') format('embedded-opentype'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2?v=4.6.0') format('woff2'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.woff?v=4.6.0') format('woff'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf?v=4.6.0') format('truetype'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.svg?v=4.6.0#fontawesomeregular') format('svg');
+  src: url('/rsrc/externals/font/fontawesome/fontawesome-webfont.eot?v=4.7.0');
+  src: url('/rsrc/externals/font/fontawesome/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('/rsrc/externals/font/fontawesome/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -1246,7 +1246,7 @@
 .fa-digg:before {
   content: "\f1a6";
 }
-.fa-pied-piper:before {
+.fa-pied-piper-pp:before {
   content: "\f1a7";
 }
 .fa-pied-piper-alt:before {
@@ -1372,6 +1372,7 @@
   content: "\f1ce";
 }
 .fa-ra:before,
+.fa-resistance:before,
 .fa-rebel:before {
   content: "\f1d0";
 }
@@ -1694,6 +1695,7 @@
   content: "\f23e";
 }
 .fa-battery-4:before,
+.fa-battery:before,
 .fa-battery-full:before {
   content: "\f240";
 }
@@ -2020,6 +2022,163 @@
 .fa-snapchat-square:before {
   content: "\f2ad";
 }
+.fa-pied-piper:before {
+  content: "\f2ae";
+}
+.fa-first-order:before {
+  content: "\f2b0";
+}
+.fa-yoast:before {
+  content: "\f2b1";
+}
+.fa-themeisle:before {
+  content: "\f2b2";
+}
+.fa-google-plus-circle:before,
+.fa-google-plus-official:before {
+  content: "\f2b3";
+}
+.fa-fa:before,
+.fa-font-awesome:before {
+  content: "\f2b4";
+}
+.fa-handshake-o:before {
+  content: "\f2b5";
+}
+.fa-envelope-open:before {
+  content: "\f2b6";
+}
+.fa-envelope-open-o:before {
+  content: "\f2b7";
+}
+.fa-linode:before {
+  content: "\f2b8";
+}
+.fa-address-book:before {
+  content: "\f2b9";
+}
+.fa-address-book-o:before {
+  content: "\f2ba";
+}
+.fa-vcard:before,
+.fa-address-card:before {
+  content: "\f2bb";
+}
+.fa-vcard-o:before,
+.fa-address-card-o:before {
+  content: "\f2bc";
+}
+.fa-user-circle:before {
+  content: "\f2bd";
+}
+.fa-user-circle-o:before {
+  content: "\f2be";
+}
+.fa-user-o:before {
+  content: "\f2c0";
+}
+.fa-id-badge:before {
+  content: "\f2c1";
+}
+.fa-drivers-license:before,
+.fa-id-card:before {
+  content: "\f2c2";
+}
+.fa-drivers-license-o:before,
+.fa-id-card-o:before {
+  content: "\f2c3";
+}
+.fa-quora:before {
+  content: "\f2c4";
+}
+.fa-free-code-camp:before {
+  content: "\f2c5";
+}
+.fa-telegram:before {
+  content: "\f2c6";
+}
+.fa-thermometer-4:before,
+.fa-thermometer:before,
+.fa-thermometer-full:before {
+  content: "\f2c7";
+}
+.fa-thermometer-3:before,
+.fa-thermometer-three-quarters:before {
+  content: "\f2c8";
+}
+.fa-thermometer-2:before,
+.fa-thermometer-half:before {
+  content: "\f2c9";
+}
+.fa-thermometer-1:before,
+.fa-thermometer-quarter:before {
+  content: "\f2ca";
+}
+.fa-thermometer-0:before,
+.fa-thermometer-empty:before {
+  content: "\f2cb";
+}
+.fa-shower:before {
+  content: "\f2cc";
+}
+.fa-bathtub:before,
+.fa-s15:before,
+.fa-bath:before {
+  content: "\f2cd";
+}
+.fa-podcast:before {
+  content: "\f2ce";
+}
+.fa-window-maximize:before {
+  content: "\f2d0";
+}
+.fa-window-minimize:before {
+  content: "\f2d1";
+}
+.fa-window-restore:before {
+  content: "\f2d2";
+}
+.fa-times-rectangle:before,
+.fa-window-close:before {
+  content: "\f2d3";
+}
+.fa-times-rectangle-o:before,
+.fa-window-close-o:before {
+  content: "\f2d4";
+}
+.fa-bandcamp:before {
+  content: "\f2d5";
+}
+.fa-grav:before {
+  content: "\f2d6";
+}
+.fa-etsy:before {
+  content: "\f2d7";
+}
+.fa-imdb:before {
+  content: "\f2d8";
+}
+.fa-ravelry:before {
+  content: "\f2d9";
+}
+.fa-eercast:before {
+  content: "\f2da";
+}
+.fa-microchip:before {
+  content: "\f2db";
+}
+.fa-snowflake-o:before {
+  content: "\f2dc";
+}
+.fa-superpowers:before {
+  content: "\f2dd";
+}
+.fa-wpexplorer:before {
+  content: "\f2de";
+}
+.fa-meetup:before {
+  content: "\f2e0";
+}
 .sr-only {
   position: absolute;
   width: 1px;
diff --git a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.eot b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.eot
index b15a0f5131..e9f60ca953 100644
Binary files a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.eot and b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.eot differ
diff --git a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf
index cec09e000a..35acda2fa1 100644
Binary files a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf and b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.ttf differ
diff --git a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff
index 52d8116589..400014a4b0 100644
Binary files a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff and b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff differ
diff --git a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2 b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2
index 65aeb01eb7..4d13fc6040 100644
Binary files a/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2 and b/webroot/rsrc/externals/font/fontawesome/fontawesome-webfont.woff2 differ