diff --git a/resources/sprite/icons_1x/subscribe-add.png b/resources/sprite/icons_1x/subscribe-add.png
deleted file mode 100644
index d898c85fe6..0000000000
Binary files a/resources/sprite/icons_1x/subscribe-add.png and /dev/null differ
diff --git a/resources/sprite/icons_1x/subscribe-auto.png b/resources/sprite/icons_1x/subscribe-auto.png
deleted file mode 100644
index 403831a91d..0000000000
Binary files a/resources/sprite/icons_1x/subscribe-auto.png and /dev/null differ
diff --git a/resources/sprite/icons_1x/subscribe-delete.png b/resources/sprite/icons_1x/subscribe-delete.png
deleted file mode 100644
index 176ddf726f..0000000000
Binary files a/resources/sprite/icons_1x/subscribe-delete.png and /dev/null differ
diff --git a/resources/sprite/icons_2x/subscribe-add.png b/resources/sprite/icons_2x/subscribe-add.png
deleted file mode 100644
index 78c865ab60..0000000000
Binary files a/resources/sprite/icons_2x/subscribe-add.png and /dev/null differ
diff --git a/resources/sprite/icons_2x/subscribe-auto.png b/resources/sprite/icons_2x/subscribe-auto.png
deleted file mode 100644
index c9a8c11e97..0000000000
Binary files a/resources/sprite/icons_2x/subscribe-auto.png and /dev/null differ
diff --git a/resources/sprite/icons_2x/subscribe-delete.png b/resources/sprite/icons_2x/subscribe-delete.png
deleted file mode 100644
index 8de0bdb58a..0000000000
Binary files a/resources/sprite/icons_2x/subscribe-delete.png and /dev/null differ
diff --git a/resources/sprite/icons_grey_1x/subscribe-add.png b/resources/sprite/icons_grey_1x/subscribe-add.png
deleted file mode 100644
index 757e2a742b..0000000000
Binary files a/resources/sprite/icons_grey_1x/subscribe-add.png and /dev/null differ
diff --git a/resources/sprite/icons_grey_1x/subscribe-auto.png b/resources/sprite/icons_grey_1x/subscribe-auto.png
deleted file mode 100644
index 5a53a56bcc..0000000000
Binary files a/resources/sprite/icons_grey_1x/subscribe-auto.png and /dev/null differ
diff --git a/resources/sprite/icons_grey_1x/subscribe-delete.png b/resources/sprite/icons_grey_1x/subscribe-delete.png
deleted file mode 100644
index 1a706f06c0..0000000000
Binary files a/resources/sprite/icons_grey_1x/subscribe-delete.png and /dev/null differ
diff --git a/resources/sprite/icons_grey_2x/subscribe-add.png b/resources/sprite/icons_grey_2x/subscribe-add.png
deleted file mode 100644
index da8558dba7..0000000000
Binary files a/resources/sprite/icons_grey_2x/subscribe-add.png and /dev/null differ
diff --git a/resources/sprite/icons_grey_2x/subscribe-auto.png b/resources/sprite/icons_grey_2x/subscribe-auto.png
deleted file mode 100644
index 512689290a..0000000000
Binary files a/resources/sprite/icons_grey_2x/subscribe-auto.png and /dev/null differ
diff --git a/resources/sprite/icons_grey_2x/subscribe-delete.png b/resources/sprite/icons_grey_2x/subscribe-delete.png
deleted file mode 100644
index d9d0be9e00..0000000000
Binary files a/resources/sprite/icons_grey_2x/subscribe-delete.png and /dev/null differ
diff --git a/resources/sprite/icons_white_1x/subscribe-add.png b/resources/sprite/icons_white_1x/subscribe-add.png
deleted file mode 100644
index 8e183fee16..0000000000
Binary files a/resources/sprite/icons_white_1x/subscribe-add.png and /dev/null differ
diff --git a/resources/sprite/icons_white_1x/subscribe-auto.png b/resources/sprite/icons_white_1x/subscribe-auto.png
deleted file mode 100644
index fcfc71d6b3..0000000000
Binary files a/resources/sprite/icons_white_1x/subscribe-auto.png and /dev/null differ
diff --git a/resources/sprite/icons_white_1x/subscribe-delete.png b/resources/sprite/icons_white_1x/subscribe-delete.png
deleted file mode 100644
index 5e42f30189..0000000000
Binary files a/resources/sprite/icons_white_1x/subscribe-delete.png and /dev/null differ
diff --git a/resources/sprite/icons_white_2x/subscribe-add.png b/resources/sprite/icons_white_2x/subscribe-add.png
deleted file mode 100644
index 6b25e63422..0000000000
Binary files a/resources/sprite/icons_white_2x/subscribe-add.png and /dev/null differ
diff --git a/resources/sprite/icons_white_2x/subscribe-auto.png b/resources/sprite/icons_white_2x/subscribe-auto.png
deleted file mode 100644
index 6335367367..0000000000
Binary files a/resources/sprite/icons_white_2x/subscribe-auto.png and /dev/null differ
diff --git a/resources/sprite/icons_white_2x/subscribe-delete.png b/resources/sprite/icons_white_2x/subscribe-delete.png
deleted file mode 100644
index 53415af0a9..0000000000
Binary files a/resources/sprite/icons_white_2x/subscribe-delete.png and /dev/null differ
diff --git a/resources/sprite/manifest/icons.json b/resources/sprite/manifest/icons.json
index 78ff768d06..790cc2ab17 100644
--- a/resources/sprite/manifest/icons.json
+++ b/resources/sprite/manifest/icons.json
@@ -796,51 +796,6 @@
       "rule" : ".icons-start-sandcastle-white, .device-desktop .phabricator-action-view:hover .icons-start-sandcastle, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-start-sandcastle",
       "hash" : "40d1583f799732728f26b8f05066b241"
     },
-    "icons-subscribe-add"            : {
-      "name" : "icons-subscribe-add",
-      "rule" : ".icons-subscribe-add",
-      "hash" : "133ad9e3a38f20d2460f558de3f71d09"
-    },
-    "icons-subscribe-add-grey"       : {
-      "name" : "icons-subscribe-add-grey",
-      "rule" : ".icons-subscribe-add-grey",
-      "hash" : "67fc8a303205ca2219badbf59f3bd15c"
-    },
-    "icons-subscribe-add-white"      : {
-      "name" : "icons-subscribe-add-white",
-      "rule" : ".icons-subscribe-add-white, .device-desktop .phabricator-action-view:hover .icons-subscribe-add, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-subscribe-add",
-      "hash" : "cec0acb841b0035a4a82873441b2e54e"
-    },
-    "icons-subscribe-auto"           : {
-      "name" : "icons-subscribe-auto",
-      "rule" : ".icons-subscribe-auto",
-      "hash" : "b14648970a1a1fb29d1981b4d00464b6"
-    },
-    "icons-subscribe-auto-grey"      : {
-      "name" : "icons-subscribe-auto-grey",
-      "rule" : ".icons-subscribe-auto-grey",
-      "hash" : "980f27ed95a0ceb95fd629237bc1919c"
-    },
-    "icons-subscribe-auto-white"     : {
-      "name" : "icons-subscribe-auto-white",
-      "rule" : ".icons-subscribe-auto-white, .device-desktop .phabricator-action-view:hover .icons-subscribe-auto, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-subscribe-auto",
-      "hash" : "88cd74cfdc56d8e0ccc4bc6f584ec7c2"
-    },
-    "icons-subscribe-delete"         : {
-      "name" : "icons-subscribe-delete",
-      "rule" : ".icons-subscribe-delete",
-      "hash" : "7b2f40a2bb3053aee9e73744fdc228e4"
-    },
-    "icons-subscribe-delete-grey"    : {
-      "name" : "icons-subscribe-delete-grey",
-      "rule" : ".icons-subscribe-delete-grey",
-      "hash" : "e1bd9aa4e20759584ac1ac84cbaf36b7"
-    },
-    "icons-subscribe-delete-white"   : {
-      "name" : "icons-subscribe-delete-white",
-      "rule" : ".icons-subscribe-delete-white, .device-desktop .phabricator-action-view:hover .icons-subscribe-delete, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-subscribe-delete",
-      "hash" : "6c2216a1d2ea9786a7beae8487ae5520"
-    },
     "icons-tag"                      : {
       "name" : "icons-tag",
       "rule" : ".icons-tag",
diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index e8adb2f3dd..db9d93d4d7 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -611,15 +611,15 @@ celerity_register_resource_map(array(
   ),
   '/rsrc/image/sprite-icons-X2.png' =>
   array(
-    'hash' => '227d0f0ab827dddcfb5666e379a1dedf',
-    'uri' => '/res/227d0f0a/rsrc/image/sprite-icons-X2.png',
+    'hash' => '2af9115430df3089023079170a8fccd6',
+    'uri' => '/res/2af91154/rsrc/image/sprite-icons-X2.png',
     'disk' => '/rsrc/image/sprite-icons-X2.png',
     'type' => 'png',
   ),
   '/rsrc/image/sprite-icons.png' =>
   array(
-    'hash' => '88b3df11bbffc40f561f0c9e5921a615',
-    'uri' => '/res/88b3df11/rsrc/image/sprite-icons.png',
+    'hash' => '6efd19d6cd71f3acc7bbbabc80ccecd2',
+    'uri' => '/res/6efd19d6/rsrc/image/sprite-icons.png',
     'disk' => '/rsrc/image/sprite-icons.png',
     'type' => 'png',
   ),
@@ -3961,7 +3961,7 @@ celerity_register_resource_map(array(
   ),
   'sprite-icons-css' =>
   array(
-    'uri' => '/res/cb08e89b/rsrc/css/sprite-icons.css',
+    'uri' => '/res/ff3b50d2/rsrc/css/sprite-icons.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -4025,7 +4025,7 @@ celerity_register_resource_map(array(
 ), array(
   'packages' =>
   array(
-    '1d64f8e9' =>
+    'f47c276a' =>
     array(
       'name' => 'core.pkg.css',
       'symbols' =>
@@ -4073,7 +4073,7 @@ celerity_register_resource_map(array(
         40 => 'phabricator-property-list-view-css',
         41 => 'phabricator-tag-view-css',
       ),
-      'uri' => '/res/pkg/1d64f8e9/core.pkg.css',
+      'uri' => '/res/pkg/f47c276a/core.pkg.css',
       'type' => 'css',
     ),
     'f2ad0683' =>
@@ -4267,16 +4267,16 @@ celerity_register_resource_map(array(
   'reverse' =>
   array(
     'aphront-attached-file-view-css' => 'a7ca34a9',
-    'aphront-dialog-view-css' => '1d64f8e9',
-    'aphront-error-view-css' => '1d64f8e9',
-    'aphront-form-view-css' => '1d64f8e9',
-    'aphront-list-filter-view-css' => '1d64f8e9',
-    'aphront-pager-view-css' => '1d64f8e9',
-    'aphront-panel-view-css' => '1d64f8e9',
-    'aphront-table-view-css' => '1d64f8e9',
-    'aphront-tokenizer-control-css' => '1d64f8e9',
-    'aphront-tooltip-css' => '1d64f8e9',
-    'aphront-typeahead-control-css' => '1d64f8e9',
+    'aphront-dialog-view-css' => 'f47c276a',
+    'aphront-error-view-css' => 'f47c276a',
+    'aphront-form-view-css' => 'f47c276a',
+    'aphront-list-filter-view-css' => 'f47c276a',
+    'aphront-pager-view-css' => 'f47c276a',
+    'aphront-panel-view-css' => 'f47c276a',
+    'aphront-table-view-css' => 'f47c276a',
+    'aphront-tokenizer-control-css' => 'f47c276a',
+    'aphront-tooltip-css' => 'f47c276a',
+    'aphront-typeahead-control-css' => 'f47c276a',
     'differential-changeset-view-css' => 'dd27a69b',
     'differential-core-view-css' => 'dd27a69b',
     'differential-inline-comment-editor' => '9488bb69',
@@ -4290,7 +4290,7 @@ celerity_register_resource_map(array(
     'differential-table-of-contents-css' => 'dd27a69b',
     'diffusion-commit-view-css' => 'c8ce2d88',
     'diffusion-icons-css' => 'c8ce2d88',
-    'global-drag-and-drop-css' => '1d64f8e9',
+    'global-drag-and-drop-css' => 'f47c276a',
     'inline-comment-summary-css' => 'dd27a69b',
     'javelin-aphlict' => 'f2ad0683',
     'javelin-behavior' => 'a9f14d76',
@@ -4364,55 +4364,55 @@ celerity_register_resource_map(array(
     'javelin-util' => 'a9f14d76',
     'javelin-vector' => 'a9f14d76',
     'javelin-workflow' => 'a9f14d76',
-    'lightbox-attachment-css' => '1d64f8e9',
+    'lightbox-attachment-css' => 'f47c276a',
     'maniphest-task-summary-css' => 'a7ca34a9',
     'maniphest-transaction-detail-css' => 'a7ca34a9',
-    'phabricator-action-list-view-css' => '1d64f8e9',
-    'phabricator-application-launch-view-css' => '1d64f8e9',
+    'phabricator-action-list-view-css' => 'f47c276a',
+    'phabricator-application-launch-view-css' => 'f47c276a',
     'phabricator-busy' => 'f2ad0683',
     'phabricator-content-source-view-css' => 'dd27a69b',
-    'phabricator-core-buttons-css' => '1d64f8e9',
-    'phabricator-core-css' => '1d64f8e9',
-    'phabricator-crumbs-view-css' => '1d64f8e9',
+    'phabricator-core-buttons-css' => 'f47c276a',
+    'phabricator-core-css' => 'f47c276a',
+    'phabricator-crumbs-view-css' => 'f47c276a',
     'phabricator-drag-and-drop-file-upload' => '9488bb69',
     'phabricator-dropdown-menu' => 'f2ad0683',
     'phabricator-file-upload' => 'f2ad0683',
-    'phabricator-filetree-view-css' => '1d64f8e9',
-    'phabricator-flag-css' => '1d64f8e9',
-    'phabricator-form-view-css' => '1d64f8e9',
-    'phabricator-header-view-css' => '1d64f8e9',
+    'phabricator-filetree-view-css' => 'f47c276a',
+    'phabricator-flag-css' => 'f47c276a',
+    'phabricator-form-view-css' => 'f47c276a',
+    'phabricator-header-view-css' => 'f47c276a',
     'phabricator-hovercard' => 'f2ad0683',
-    'phabricator-jump-nav' => '1d64f8e9',
+    'phabricator-jump-nav' => 'f47c276a',
     'phabricator-keyboard-shortcut' => 'f2ad0683',
     'phabricator-keyboard-shortcut-manager' => 'f2ad0683',
-    'phabricator-main-menu-view' => '1d64f8e9',
+    'phabricator-main-menu-view' => 'f47c276a',
     'phabricator-menu-item' => 'f2ad0683',
-    'phabricator-nav-view-css' => '1d64f8e9',
+    'phabricator-nav-view-css' => 'f47c276a',
     'phabricator-notification' => 'f2ad0683',
-    'phabricator-notification-css' => '1d64f8e9',
-    'phabricator-notification-menu-css' => '1d64f8e9',
-    'phabricator-object-item-list-view-css' => '1d64f8e9',
+    'phabricator-notification-css' => 'f47c276a',
+    'phabricator-notification-menu-css' => 'f47c276a',
+    'phabricator-object-item-list-view-css' => 'f47c276a',
     'phabricator-object-selector-css' => 'dd27a69b',
     'phabricator-phtize' => 'f2ad0683',
     'phabricator-prefab' => 'f2ad0683',
     'phabricator-project-tag-css' => 'a7ca34a9',
-    'phabricator-property-list-view-css' => '1d64f8e9',
-    'phabricator-remarkup-css' => '1d64f8e9',
+    'phabricator-property-list-view-css' => 'f47c276a',
+    'phabricator-remarkup-css' => 'f47c276a',
     'phabricator-shaped-request' => '9488bb69',
-    'phabricator-side-menu-view-css' => '1d64f8e9',
-    'phabricator-standard-page-view' => '1d64f8e9',
-    'phabricator-tag-view-css' => '1d64f8e9',
+    'phabricator-side-menu-view-css' => 'f47c276a',
+    'phabricator-standard-page-view' => 'f47c276a',
+    'phabricator-tag-view-css' => 'f47c276a',
     'phabricator-textareautils' => 'f2ad0683',
     'phabricator-tooltip' => 'f2ad0683',
-    'phabricator-transaction-view-css' => '1d64f8e9',
-    'phabricator-zindex-css' => '1d64f8e9',
-    'phui-form-css' => '1d64f8e9',
-    'phui-icon-view-css' => '1d64f8e9',
-    'spacing-css' => '1d64f8e9',
-    'sprite-apps-large-css' => '1d64f8e9',
-    'sprite-gradient-css' => '1d64f8e9',
-    'sprite-icons-css' => '1d64f8e9',
-    'sprite-menu-css' => '1d64f8e9',
-    'syntax-highlighting-css' => '1d64f8e9',
+    'phabricator-transaction-view-css' => 'f47c276a',
+    'phabricator-zindex-css' => 'f47c276a',
+    'phui-form-css' => 'f47c276a',
+    'phui-icon-view-css' => 'f47c276a',
+    'spacing-css' => 'f47c276a',
+    'sprite-apps-large-css' => 'f47c276a',
+    'sprite-gradient-css' => 'f47c276a',
+    'sprite-icons-css' => 'f47c276a',
+    'sprite-menu-css' => 'f47c276a',
+    'syntax-highlighting-css' => 'f47c276a',
   ),
 ));
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
index 99a0f5e03c..6068f35eea 100644
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -504,14 +504,14 @@ final class DifferentialRevisionViewController extends DifferentialController {
       if (!$viewer_is_owner && !$viewer_is_reviewer) {
         $action = $viewer_is_cc ? 'rem' : 'add';
         $links[] = array(
-          'icon'    => $viewer_is_cc ? 'subscribe-delete' : 'subscribe-add',
+          'icon'    => $viewer_is_cc ? 'disable' : 'check',
           'href'    => "/differential/subscribe/{$action}/{$revision_id}/",
           'name'    => $viewer_is_cc ? pht('Unsubscribe') : pht('Subscribe'),
           'instant' => true,
         );
       } else {
         $links[] = array(
-          'icon'     => 'subscribe-auto',
+          'icon'     => 'enable',
           'name'     => pht('Automatically Subscribed'),
           'disabled' => true,
         );
diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
index 1f018efaa5..0c09459829 100644
--- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php
+++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php
@@ -396,15 +396,15 @@ final class ManiphestTaskDetailController extends ManiphestController {
         id(new PhabricatorActionView())
           ->setName(pht('Automatically Subscribed'))
           ->setDisabled(true)
-          ->setIcon('subscribe-auto'));
+          ->setIcon('enable'));
     } else {
       $action = $viewer_is_cc ? 'rem' : 'add';
-      $name   = $viewer_is_cc ? 'Unsubscribe' : 'Subscribe';
-      $icon   = $viewer_is_cc ? 'subscribe-delete' : 'subscribe-add';
+      $name   = $viewer_is_cc ? pht('Unsubscribe') : pht('Subscribe');
+      $icon   = $viewer_is_cc ? 'disable' : 'check';
 
       $view->addAction(
         id(new PhabricatorActionView())
-          ->setName(pht($name))
+          ->setName($name)
           ->setHref("/maniphest/subscribe/{$action}/{$id}/")
           ->setRenderAsForm(true)
           ->setUser($viewer)
diff --git a/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php b/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
index 93e5144ae0..346a0fa35a 100644
--- a/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
+++ b/src/applications/subscriptions/events/PhabricatorSubscriptionsUIEventListener.php
@@ -36,8 +36,8 @@ final class PhabricatorSubscriptionsUIEventListener
         ->setDisabled(true)
         ->setRenderAsForm(true)
         ->setHref('/subscriptions/add/'.$object->getPHID().'/')
-        ->setName('Automatically Subscribed')
-        ->setIcon('subscribe-auto');
+        ->setName(pht('Automatically Subscribed'))
+        ->setIcon('enable');
     } else {
       $subscribed = false;
       if ($user->isLoggedIn()) {
@@ -59,16 +59,16 @@ final class PhabricatorSubscriptionsUIEventListener
           ->setWorkflow(true)
           ->setRenderAsForm(true)
           ->setHref('/subscriptions/delete/'.$object->getPHID().'/')
-          ->setName('Unsubscribe')
-          ->setIcon('subscribe-delete');
+          ->setName(pht('Unsubscribe'))
+          ->setIcon('disable');
       } else {
         $sub_action = id(new PhabricatorActionView())
           ->setUser($user)
           ->setWorkflow(true)
           ->setRenderAsForm(true)
           ->setHref('/subscriptions/add/'.$object->getPHID().'/')
-          ->setName('Subscribe')
-          ->setIcon('subscribe-add');
+          ->setName(pht('Subscribe'))
+          ->setIcon('check');
       }
 
       if (!$user->isLoggedIn()) {
diff --git a/src/applications/uiexample/examples/PHUIDocumentExample.php b/src/applications/uiexample/examples/PHUIDocumentExample.php
index 45be98ff2c..f44e5b94b1 100644
--- a/src/applications/uiexample/examples/PHUIDocumentExample.php
+++ b/src/applications/uiexample/examples/PHUIDocumentExample.php
@@ -45,7 +45,7 @@ final class PHUIDocumentExample extends PhabricatorUIExample {
     $action5 = id(new PHUIListItemView())
       ->setName('Subscribe')
       ->setHref('#')
-      ->setIcon('subscribe-add')
+      ->setIcon('check')
       ->setType(PHUIListItemView::TYPE_LINK);
 
     $divider = id(new PHUIListItemView)
diff --git a/src/applications/uiexample/examples/PHUIListExample.php b/src/applications/uiexample/examples/PHUIListExample.php
index 8a569b1511..811069af8e 100644
--- a/src/applications/uiexample/examples/PHUIListExample.php
+++ b/src/applications/uiexample/examples/PHUIListExample.php
@@ -42,7 +42,7 @@ final class PHUIListExample extends PhabricatorUIExample {
     $action5 = id(new PHUIListItemView())
       ->setName('Subscribe')
       ->setHref('#')
-      ->setIcon('subscribe-add')
+      ->setIcon('check')
       ->setType(PHUIListItemView::TYPE_LINK);
 
     $actionmenu = id(new PHUIListView())
diff --git a/webroot/rsrc/css/sprite-icons.css b/webroot/rsrc/css/sprite-icons.css
index c6afb071bd..ce45e7eac1 100644
--- a/webroot/rsrc/css/sprite-icons.css
+++ b/webroot/rsrc/css/sprite-icons.css
@@ -13,7 +13,7 @@ only screen and (min-device-pixel-ratio: 1.5),
 only screen and (-webkit-min-device-pixel-ratio: 1.5) {
   .sprite-icons {
     background-image: url(/rsrc/image/sprite-icons-X2.png);
-    background-size: 225px 225px;
+    background-size: 210px 225px;
   }
 }
 
@@ -75,789 +75,753 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) {
 }
 
 .icons-edit {
-  background-position: -210px 0px;
-}
-
-.icons-enable {
   background-position: 0px -15px;
 }
 
-.icons-file {
+.icons-enable {
   background-position: -15px -15px;
 }
 
-.icons-flag-0 {
+.icons-file {
   background-position: -30px -15px;
 }
 
-.icons-flag-1 {
+.icons-flag-0 {
   background-position: -45px -15px;
 }
 
-.icons-flag-2 {
+.icons-flag-1 {
   background-position: -60px -15px;
 }
 
-.icons-flag-3 {
+.icons-flag-2 {
   background-position: -75px -15px;
 }
 
-.icons-flag-4 {
+.icons-flag-3 {
   background-position: -90px -15px;
 }
 
-.icons-flag-5 {
+.icons-flag-4 {
   background-position: -105px -15px;
 }
 
-.icons-flag-6 {
+.icons-flag-5 {
   background-position: -120px -15px;
 }
 
-.icons-flag-7 {
+.icons-flag-6 {
   background-position: -135px -15px;
 }
 
-.icons-flag-ghost {
+.icons-flag-7 {
   background-position: -150px -15px;
 }
 
-.icons-flag {
+.icons-flag-ghost {
   background-position: -165px -15px;
 }
 
-.icons-folder-open {
+.icons-flag {
   background-position: -180px -15px;
 }
 
-.icons-fork {
+.icons-folder-open {
   background-position: -195px -15px;
 }
 
-.icons-herald {
+.icons-fork {
   background-position: 0px -30px;
 }
 
-.icons-highlight {
+.icons-herald {
   background-position: -15px -30px;
 }
 
-.icons-history {
+.icons-highlight {
   background-position: -30px -30px;
 }
 
-.icons-home {
+.icons-history {
   background-position: -45px -30px;
 }
 
-.icons-image {
+.icons-home {
   background-position: -60px -30px;
 }
 
-.icons-like {
+.icons-image {
   background-position: -75px -30px;
 }
 
-.icons-link {
+.icons-like {
   background-position: -90px -30px;
 }
 
-.icons-lint-info {
+.icons-link {
   background-position: -105px -30px;
 }
 
-.icons-lint-ok {
+.icons-lint-info {
   background-position: -120px -30px;
 }
 
-.icons-lint-warning {
+.icons-lint-ok {
   background-position: -135px -30px;
 }
 
-.icons-lock {
+.icons-lint-warning {
   background-position: -150px -30px;
 }
 
-.icons-love {
+.icons-lock {
   background-position: -165px -30px;
 }
 
-.icons-merge {
+.icons-love {
   background-position: -180px -30px;
 }
 
-.icons-message {
+.icons-merge {
   background-position: -195px -30px;
 }
 
-.icons-meta-mta {
+.icons-message {
   background-position: 0px -45px;
 }
 
-.icons-move {
+.icons-meta-mta {
   background-position: -15px -45px;
 }
 
-.icons-new {
+.icons-move {
   background-position: -30px -45px;
 }
 
-.icons-none {
+.icons-new {
   background-position: -45px -45px;
 }
 
-.icons-perflab {
+.icons-none {
   background-position: -60px -45px;
 }
 
-.icons-preview {
+.icons-perflab {
   background-position: -75px -45px;
 }
 
-.icons-refresh {
+.icons-preview {
   background-position: -90px -45px;
 }
 
-.icons-remove {
+.icons-refresh {
   background-position: -105px -45px;
 }
 
-.icons-search {
+.icons-remove {
   background-position: -120px -45px;
 }
 
-.icons-start-sandcastle {
+.icons-search {
   background-position: -135px -45px;
 }
 
-.icons-subscribe-add {
+.icons-start-sandcastle {
   background-position: -150px -45px;
 }
 
-.icons-subscribe-auto {
+.icons-tag {
   background-position: -165px -45px;
 }
 
-.icons-subscribe-delete {
+.icons-transcript {
   background-position: -180px -45px;
 }
 
-.icons-tag {
+.icons-undo {
   background-position: -195px -45px;
 }
 
-.icons-transcript {
+.icons-unlock {
   background-position: 0px -60px;
 }
 
-.icons-undo {
+.icons-unmerge {
   background-position: -15px -60px;
 }
 
-.icons-unlock {
+.icons-unpublish {
   background-position: -30px -60px;
 }
 
-.icons-unmerge {
+.icons-upload {
   background-position: -45px -60px;
 }
 
-.icons-unpublish {
+.icons-warning {
   background-position: -60px -60px;
 }
 
-.icons-upload {
+.icons-world {
   background-position: -75px -60px;
 }
 
-.icons-warning {
+.icons-action-menu-grey {
   background-position: -90px -60px;
 }
 
-.icons-world {
+.icons-arrow_left-grey {
   background-position: -105px -60px;
 }
 
-.icons-action-menu-grey {
+.icons-arrow_right-grey {
   background-position: -120px -60px;
 }
 
-.icons-arrow_left-grey {
+.icons-attach-grey {
   background-position: -135px -60px;
 }
 
-.icons-arrow_right-grey {
+.icons-blame-grey {
   background-position: -150px -60px;
 }
 
-.icons-attach-grey {
+.icons-check-grey {
   background-position: -165px -60px;
 }
 
-.icons-blame-grey {
+.icons-comment-grey {
   background-position: -180px -60px;
 }
 
-.icons-check-grey {
+.icons-computer-grey {
   background-position: -195px -60px;
 }
 
-.icons-comment-grey {
+.icons-create-grey {
   background-position: 0px -75px;
 }
 
-.icons-computer-grey {
+.icons-delete-grey {
   background-position: -15px -75px;
 }
 
-.icons-create-grey {
+.icons-disable-grey {
   background-position: -30px -75px;
 }
 
-.icons-delete-grey {
+.icons-dislike-grey {
   background-position: -45px -75px;
 }
 
-.icons-disable-grey {
+.icons-download-alt-grey {
   background-position: -60px -75px;
 }
 
-.icons-dislike-grey {
+.icons-download-grey {
   background-position: -75px -75px;
 }
 
-.icons-download-alt-grey {
+.icons-edit-grey {
   background-position: -90px -75px;
 }
 
-.icons-download-grey {
+.icons-enable-grey {
   background-position: -105px -75px;
 }
 
-.icons-edit-grey {
+.icons-file-grey {
   background-position: -120px -75px;
 }
 
-.icons-enable-grey {
+.icons-flag-0-grey {
   background-position: -135px -75px;
 }
 
-.icons-file-grey {
+.icons-flag-1-grey {
   background-position: -150px -75px;
 }
 
-.icons-flag-0-grey {
+.icons-flag-2-grey {
   background-position: -165px -75px;
 }
 
-.icons-flag-1-grey {
+.icons-flag-3-grey {
   background-position: -180px -75px;
 }
 
-.icons-flag-2-grey {
+.icons-flag-4-grey {
   background-position: -195px -75px;
 }
 
-.icons-flag-3-grey {
+.icons-flag-5-grey {
   background-position: 0px -90px;
 }
 
-.icons-flag-4-grey {
+.icons-flag-6-grey {
   background-position: -15px -90px;
 }
 
-.icons-flag-5-grey {
+.icons-flag-7-grey {
   background-position: -30px -90px;
 }
 
-.icons-flag-6-grey {
+.icons-flag-ghost-grey {
   background-position: -45px -90px;
 }
 
-.icons-flag-7-grey {
+.icons-flag-grey {
   background-position: -60px -90px;
 }
 
-.icons-flag-ghost-grey {
+.icons-folder-open-grey {
   background-position: -75px -90px;
 }
 
-.icons-flag-grey {
+.icons-fork-grey {
   background-position: -90px -90px;
 }
 
-.icons-folder-open-grey {
+.icons-herald-grey {
   background-position: -105px -90px;
 }
 
-.icons-fork-grey {
+.icons-highlight-grey {
   background-position: -120px -90px;
 }
 
-.icons-herald-grey {
+.icons-history-grey {
   background-position: -135px -90px;
 }
 
-.icons-highlight-grey {
+.icons-home-grey {
   background-position: -150px -90px;
 }
 
-.icons-history-grey {
+.icons-image-grey {
   background-position: -165px -90px;
 }
 
-.icons-home-grey {
+.icons-like-grey {
   background-position: -180px -90px;
 }
 
-.icons-image-grey {
+.icons-link-grey {
   background-position: -195px -90px;
 }
 
-.icons-like-grey {
+.icons-lint-info-grey {
   background-position: 0px -105px;
 }
 
-.icons-link-grey {
+.icons-lint-ok-grey {
   background-position: -15px -105px;
 }
 
-.icons-lint-info-grey {
+.icons-lint-warning-grey {
   background-position: -30px -105px;
 }
 
-.icons-lint-ok-grey {
+.icons-lock-grey {
   background-position: -45px -105px;
 }
 
-.icons-lint-warning-grey {
+.icons-love-grey {
   background-position: -60px -105px;
 }
 
-.icons-lock-grey {
+.icons-merge-grey {
   background-position: -75px -105px;
 }
 
-.icons-love-grey {
+.icons-message-grey {
   background-position: -90px -105px;
 }
 
-.icons-merge-grey {
+.icons-meta-mta-grey {
   background-position: -105px -105px;
 }
 
-.icons-message-grey {
+.icons-move-grey {
   background-position: -120px -105px;
 }
 
-.icons-meta-mta-grey {
+.icons-new-grey {
   background-position: -135px -105px;
 }
 
-.icons-move-grey {
+.icons-none-grey {
   background-position: -150px -105px;
 }
 
-.icons-new-grey {
+.icons-perflab-grey {
   background-position: -165px -105px;
 }
 
-.icons-none-grey {
+.icons-preview-grey {
   background-position: -180px -105px;
 }
 
-.icons-perflab-grey {
+.icons-refresh-grey {
   background-position: -195px -105px;
 }
 
-.icons-preview-grey {
+.icons-remove-grey {
   background-position: 0px -120px;
 }
 
-.icons-refresh-grey {
+.icons-search-grey {
   background-position: -15px -120px;
 }
 
-.icons-remove-grey {
+.icons-start-sandcastle-grey {
   background-position: -30px -120px;
 }
 
-.icons-search-grey {
+.icons-tag-grey {
   background-position: -45px -120px;
 }
 
-.icons-start-sandcastle-grey {
+.icons-transcript-grey {
   background-position: -60px -120px;
 }
 
-.icons-subscribe-add-grey {
+.icons-undo-grey {
   background-position: -75px -120px;
 }
 
-.icons-subscribe-auto-grey {
+.icons-unlock-grey {
   background-position: -90px -120px;
 }
 
-.icons-subscribe-delete-grey {
+.icons-unmerge-grey {
   background-position: -105px -120px;
 }
 
-.icons-tag-grey {
+.icons-unpublish-grey {
   background-position: -120px -120px;
 }
 
-.icons-transcript-grey {
+.icons-upload-grey {
   background-position: -135px -120px;
 }
 
-.icons-undo-grey {
+.icons-warning-grey {
   background-position: -150px -120px;
 }
 
-.icons-unlock-grey {
+.icons-world-grey {
   background-position: -165px -120px;
 }
 
-.icons-unmerge-grey {
+.icons-action-menu-white, .device-desktop .phabricator-action-view:hover .icons-action-menu, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-action-menu {
   background-position: -180px -120px;
 }
 
-.icons-unpublish-grey {
+.icons-arrow_left-white, .device-desktop .phabricator-action-view:hover .icons-arrow_left, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-arrow_left {
   background-position: -195px -120px;
 }
 
-.icons-upload-grey {
+.icons-arrow_right-white, .device-desktop .phabricator-action-view:hover .icons-arrow_right, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-arrow_right {
   background-position: 0px -135px;
 }
 
-.icons-warning-grey {
+.icons-attach-white, .device-desktop .phabricator-action-view:hover .icons-attach, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-attach {
   background-position: -15px -135px;
 }
 
-.icons-world-grey {
+.icons-blame-white, .device-desktop .phabricator-action-view:hover .icons-blame, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-blame {
   background-position: -30px -135px;
 }
 
-.icons-action-menu-white, .device-desktop .phabricator-action-view:hover .icons-action-menu, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-action-menu {
+.icons-check-white, .device-desktop .phabricator-action-view:hover .icons-check, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-check {
   background-position: -45px -135px;
 }
 
-.icons-arrow_left-white, .device-desktop .phabricator-action-view:hover .icons-arrow_left, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-arrow_left {
+.icons-comment-white, .device-desktop .phabricator-action-view:hover .icons-comment, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-comment {
   background-position: -60px -135px;
 }
 
-.icons-arrow_right-white, .device-desktop .phabricator-action-view:hover .icons-arrow_right, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-arrow_right {
+.icons-computer-white, .device-desktop .phabricator-action-view:hover .icons-computer, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-computer {
   background-position: -75px -135px;
 }
 
-.icons-attach-white, .device-desktop .phabricator-action-view:hover .icons-attach, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-attach {
+.icons-create-white, .device-desktop .phabricator-action-view:hover .icons-create, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-create {
   background-position: -90px -135px;
 }
 
-.icons-blame-white, .device-desktop .phabricator-action-view:hover .icons-blame, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-blame {
+.icons-delete-white, .device-desktop .phabricator-action-view:hover .icons-delete, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-delete {
   background-position: -105px -135px;
 }
 
-.icons-check-white, .device-desktop .phabricator-action-view:hover .icons-check, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-check {
+.icons-disable-white, .device-desktop .phabricator-action-view:hover .icons-disable, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-disable {
   background-position: -120px -135px;
 }
 
-.icons-comment-white, .device-desktop .phabricator-action-view:hover .icons-comment, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-comment {
+.icons-dislike-white, .device-desktop .phabricator-action-view:hover .icons-dislike, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-dislike {
   background-position: -135px -135px;
 }
 
-.icons-computer-white, .device-desktop .phabricator-action-view:hover .icons-computer, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-computer {
+.icons-download-alt-white, .device-desktop .phabricator-action-view:hover .icons-download-alt, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-download-alt {
   background-position: -150px -135px;
 }
 
-.icons-create-white, .device-desktop .phabricator-action-view:hover .icons-create, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-create {
+.icons-download-white, .device-desktop .phabricator-action-view:hover .icons-download, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-download {
   background-position: -165px -135px;
 }
 
-.icons-delete-white, .device-desktop .phabricator-action-view:hover .icons-delete, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-delete {
+.icons-edit-white, .device-desktop .phabricator-action-view:hover .icons-edit, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-edit {
   background-position: -180px -135px;
 }
 
-.icons-disable-white, .device-desktop .phabricator-action-view:hover .icons-disable, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-disable {
+.icons-enable-white, .device-desktop .phabricator-action-view:hover .icons-enable, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-enable {
   background-position: -195px -135px;
 }
 
-.icons-dislike-white, .device-desktop .phabricator-action-view:hover .icons-dislike, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-dislike {
+.icons-file-white, .device-desktop .phabricator-action-view:hover .icons-file, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-file {
   background-position: 0px -150px;
 }
 
-.icons-download-alt-white, .device-desktop .phabricator-action-view:hover .icons-download-alt, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-download-alt {
+.icons-flag-0-white, .device-desktop .phabricator-action-view:hover .icons-flag-0, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-0 {
   background-position: -15px -150px;
 }
 
-.icons-download-white, .device-desktop .phabricator-action-view:hover .icons-download, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-download {
+.icons-flag-1-white, .device-desktop .phabricator-action-view:hover .icons-flag-1, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-1 {
   background-position: -30px -150px;
 }
 
-.icons-edit-white, .device-desktop .phabricator-action-view:hover .icons-edit, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-edit {
+.icons-flag-2-white, .device-desktop .phabricator-action-view:hover .icons-flag-2, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-2 {
   background-position: -45px -150px;
 }
 
-.icons-enable-white, .device-desktop .phabricator-action-view:hover .icons-enable, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-enable {
+.icons-flag-3-white, .device-desktop .phabricator-action-view:hover .icons-flag-3, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-3 {
   background-position: -60px -150px;
 }
 
-.icons-file-white, .device-desktop .phabricator-action-view:hover .icons-file, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-file {
+.icons-flag-4-white, .device-desktop .phabricator-action-view:hover .icons-flag-4, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-4 {
   background-position: -75px -150px;
 }
 
-.icons-flag-0-white, .device-desktop .phabricator-action-view:hover .icons-flag-0, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-0 {
+.icons-flag-5-white, .device-desktop .phabricator-action-view:hover .icons-flag-5, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-5 {
   background-position: -90px -150px;
 }
 
-.icons-flag-1-white, .device-desktop .phabricator-action-view:hover .icons-flag-1, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-1 {
+.icons-flag-6-white, .device-desktop .phabricator-action-view:hover .icons-flag-6, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-6 {
   background-position: -105px -150px;
 }
 
-.icons-flag-2-white, .device-desktop .phabricator-action-view:hover .icons-flag-2, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-2 {
+.icons-flag-7-white, .device-desktop .phabricator-action-view:hover .icons-flag-7, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-7 {
   background-position: -120px -150px;
 }
 
-.icons-flag-3-white, .device-desktop .phabricator-action-view:hover .icons-flag-3, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-3 {
+.icons-flag-ghost-white, .device-desktop .phabricator-action-view:hover .icons-flag-ghost, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-ghost {
   background-position: -135px -150px;
 }
 
-.icons-flag-4-white, .device-desktop .phabricator-action-view:hover .icons-flag-4, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-4 {
+.icons-flag-white, .device-desktop .phabricator-action-view:hover .icons-flag, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag {
   background-position: -150px -150px;
 }
 
-.icons-flag-5-white, .device-desktop .phabricator-action-view:hover .icons-flag-5, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-5 {
+.icons-folder-open-white, .device-desktop .phabricator-action-view:hover .icons-folder-open, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-folder-open {
   background-position: -165px -150px;
 }
 
-.icons-flag-6-white, .device-desktop .phabricator-action-view:hover .icons-flag-6, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-6 {
+.icons-fork-white, .device-desktop .phabricator-action-view:hover .icons-fork, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-fork {
   background-position: -180px -150px;
 }
 
-.icons-flag-7-white, .device-desktop .phabricator-action-view:hover .icons-flag-7, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-7 {
+.icons-herald-white, .device-desktop .phabricator-action-view:hover .icons-herald, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-herald {
   background-position: -195px -150px;
 }
 
-.icons-flag-ghost-white, .device-desktop .phabricator-action-view:hover .icons-flag-ghost, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag-ghost {
+.icons-highlight-white, .device-desktop .phabricator-action-view:hover .icons-highlight, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-highlight {
   background-position: 0px -165px;
 }
 
-.icons-flag-white, .device-desktop .phabricator-action-view:hover .icons-flag, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-flag {
+.icons-history-white, .device-desktop .phabricator-action-view:hover .icons-history, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-history {
   background-position: -15px -165px;
 }
 
-.icons-folder-open-white, .device-desktop .phabricator-action-view:hover .icons-folder-open, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-folder-open {
+.icons-home-white, .device-desktop .phabricator-action-view:hover .icons-home, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-home {
   background-position: -30px -165px;
 }
 
-.icons-fork-white, .device-desktop .phabricator-action-view:hover .icons-fork, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-fork {
+.icons-image-white, .device-desktop .phabricator-action-view:hover .icons-image, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-image {
   background-position: -45px -165px;
 }
 
-.icons-herald-white, .device-desktop .phabricator-action-view:hover .icons-herald, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-herald {
+.icons-like-white, .device-desktop .phabricator-action-view:hover .icons-like, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-like {
   background-position: -60px -165px;
 }
 
-.icons-highlight-white, .device-desktop .phabricator-action-view:hover .icons-highlight, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-highlight {
+.icons-link-white, .device-desktop .phabricator-action-view:hover .icons-link, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-link {
   background-position: -75px -165px;
 }
 
-.icons-history-white, .device-desktop .phabricator-action-view:hover .icons-history, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-history {
+.icons-lint-info-white, .device-desktop .phabricator-action-view:hover .icons-lint-info, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-info {
   background-position: -90px -165px;
 }
 
-.icons-home-white, .device-desktop .phabricator-action-view:hover .icons-home, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-home {
+.icons-lint-ok-white, .device-desktop .phabricator-action-view:hover .icons-lint-ok, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-ok {
   background-position: -105px -165px;
 }
 
-.icons-image-white, .device-desktop .phabricator-action-view:hover .icons-image, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-image {
+.icons-lint-warning-white, .device-desktop .phabricator-action-view:hover .icons-lint-warning, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-warning {
   background-position: -120px -165px;
 }
 
-.icons-like-white, .device-desktop .phabricator-action-view:hover .icons-like, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-like {
+.icons-lock-white, .device-desktop .phabricator-action-view:hover .icons-lock, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lock {
   background-position: -135px -165px;
 }
 
-.icons-link-white, .device-desktop .phabricator-action-view:hover .icons-link, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-link {
+.icons-love-white, .device-desktop .phabricator-action-view:hover .icons-love, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-love {
   background-position: -150px -165px;
 }
 
-.icons-lint-info-white, .device-desktop .phabricator-action-view:hover .icons-lint-info, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-info {
+.icons-merge-white, .device-desktop .phabricator-action-view:hover .icons-merge, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-merge {
   background-position: -165px -165px;
 }
 
-.icons-lint-ok-white, .device-desktop .phabricator-action-view:hover .icons-lint-ok, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-ok {
+.icons-message-white, .device-desktop .phabricator-action-view:hover .icons-message, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-message {
   background-position: -180px -165px;
 }
 
-.icons-lint-warning-white, .device-desktop .phabricator-action-view:hover .icons-lint-warning, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lint-warning {
+.icons-meta-mta-white, .device-desktop .phabricator-action-view:hover .icons-meta-mta, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-meta-mta {
   background-position: -195px -165px;
 }
 
-.icons-lock-white, .device-desktop .phabricator-action-view:hover .icons-lock, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-lock {
+.icons-move-white, .device-desktop .phabricator-action-view:hover .icons-move, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-move {
   background-position: 0px -180px;
 }
 
-.icons-love-white, .device-desktop .phabricator-action-view:hover .icons-love, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-love {
+.icons-new-white, .device-desktop .phabricator-action-view:hover .icons-new, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-new, .phabricator-application-launch-create:hover .phabricator-application-create-icon.icons-new-grey {
   background-position: -15px -180px;
 }
 
-.icons-merge-white, .device-desktop .phabricator-action-view:hover .icons-merge, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-merge {
+.icons-none-white, .device-desktop .phabricator-action-view:hover .icons-none, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-none {
   background-position: -30px -180px;
 }
 
-.icons-message-white, .device-desktop .phabricator-action-view:hover .icons-message, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-message {
+.icons-perflab-white, .device-desktop .phabricator-action-view:hover .icons-perflab, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-perflab {
   background-position: -45px -180px;
 }
 
-.icons-meta-mta-white, .device-desktop .phabricator-action-view:hover .icons-meta-mta, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-meta-mta {
+.icons-preview-white, .device-desktop .phabricator-action-view:hover .icons-preview, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-preview {
   background-position: -60px -180px;
 }
 
-.icons-move-white, .device-desktop .phabricator-action-view:hover .icons-move, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-move {
+.icons-refresh-white, .device-desktop .phabricator-action-view:hover .icons-refresh, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-refresh {
   background-position: -75px -180px;
 }
 
-.icons-new-white, .device-desktop .phabricator-action-view:hover .icons-new, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-new, .phabricator-application-launch-create:hover .phabricator-application-create-icon.icons-new-grey {
+.icons-remove-white, .device-desktop .phabricator-action-view:hover .icons-remove, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-remove {
   background-position: -90px -180px;
 }
 
-.icons-none-white, .device-desktop .phabricator-action-view:hover .icons-none, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-none {
+.icons-search-white, .device-desktop .phabricator-action-view:hover .icons-search, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-search {
   background-position: -105px -180px;
 }
 
-.icons-perflab-white, .device-desktop .phabricator-action-view:hover .icons-perflab, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-perflab {
+.icons-start-sandcastle-white, .device-desktop .phabricator-action-view:hover .icons-start-sandcastle, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-start-sandcastle {
   background-position: -120px -180px;
 }
 
-.icons-preview-white, .device-desktop .phabricator-action-view:hover .icons-preview, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-preview {
+.icons-tag-white, .device-desktop .phabricator-action-view:hover .icons-tag, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-tag {
   background-position: -135px -180px;
 }
 
-.icons-refresh-white, .device-desktop .phabricator-action-view:hover .icons-refresh, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-refresh {
+.icons-transcript-white, .device-desktop .phabricator-action-view:hover .icons-transcript, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-transcript {
   background-position: -150px -180px;
 }
 
-.icons-remove-white, .device-desktop .phabricator-action-view:hover .icons-remove, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-remove {
+.icons-undo-white, .device-desktop .phabricator-action-view:hover .icons-undo, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-undo {
   background-position: -165px -180px;
 }
 
-.icons-search-white, .device-desktop .phabricator-action-view:hover .icons-search, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-search {
+.icons-unlock-white, .device-desktop .phabricator-action-view:hover .icons-unlock, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unlock {
   background-position: -180px -180px;
 }
 
-.icons-start-sandcastle-white, .device-desktop .phabricator-action-view:hover .icons-start-sandcastle, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-start-sandcastle {
+.icons-unmerge-white, .device-desktop .phabricator-action-view:hover .icons-unmerge, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unmerge {
   background-position: -195px -180px;
 }
 
-.icons-subscribe-add-white, .device-desktop .phabricator-action-view:hover .icons-subscribe-add, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-subscribe-add {
+.icons-unpublish-white, .device-desktop .phabricator-action-view:hover .icons-unpublish, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unpublish {
   background-position: 0px -195px;
 }
 
-.icons-subscribe-auto-white, .device-desktop .phabricator-action-view:hover .icons-subscribe-auto, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-subscribe-auto {
+.icons-upload-white, .device-desktop .phabricator-action-view:hover .icons-upload, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-upload {
   background-position: -15px -195px;
 }
 
-.icons-subscribe-delete-white, .device-desktop .phabricator-action-view:hover .icons-subscribe-delete, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-subscribe-delete {
+.icons-warning-white, .device-desktop .phabricator-action-view:hover .icons-warning, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-warning {
   background-position: -30px -195px;
 }
 
-.icons-tag-white, .device-desktop .phabricator-action-view:hover .icons-tag, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-tag {
+.icons-world-white, .device-desktop .phabricator-action-view:hover .icons-world, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-world {
   background-position: -45px -195px;
 }
 
-.icons-transcript-white, .device-desktop .phabricator-action-view:hover .icons-transcript, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-transcript {
+.remarkup-assist-b {
   background-position: -60px -195px;
 }
 
-.icons-undo-white, .device-desktop .phabricator-action-view:hover .icons-undo, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-undo {
+.remarkup-assist-chaos {
   background-position: -75px -195px;
 }
 
-.icons-unlock-white, .device-desktop .phabricator-action-view:hover .icons-unlock, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unlock {
+.remarkup-control-chaos-mode .remarkup-assist-chaos {
   background-position: -90px -195px;
 }
 
-.icons-unmerge-white, .device-desktop .phabricator-action-view:hover .icons-unmerge, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unmerge {
+.remarkup-assist-code {
   background-position: -105px -195px;
 }
 
-.icons-unpublish-white, .device-desktop .phabricator-action-view:hover .icons-unpublish, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-unpublish {
+.remarkup-assist-help {
   background-position: -120px -195px;
 }
 
-.icons-upload-white, .device-desktop .phabricator-action-view:hover .icons-upload, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-upload {
+.remarkup-assist-i {
   background-position: -135px -195px;
 }
 
-.icons-warning-white, .device-desktop .phabricator-action-view:hover .icons-warning, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-warning {
+.remarkup-assist-image {
   background-position: -150px -195px;
 }
 
-.icons-world-white, .device-desktop .phabricator-action-view:hover .icons-world, .device-desktop .phui-list-sidenav .phui-list-item-href:hover .icons-world {
+.remarkup-assist-larger {
   background-position: -165px -195px;
 }
 
-.remarkup-assist-b {
+.remarkup-assist-meme {
   background-position: -180px -195px;
 }
 
-.remarkup-assist-chaos {
+.remarkup-assist-ol {
   background-position: -195px -195px;
 }
 
-.remarkup-control-chaos-mode .remarkup-assist-chaos {
+.remarkup-assist-order {
   background-position: 0px -210px;
 }
 
-.remarkup-assist-code {
+.remarkup-control-order-mode .remarkup-assist-order {
   background-position: -15px -210px;
 }
 
-.remarkup-assist-help {
+.remarkup-assist-table {
   background-position: -30px -210px;
 }
 
-.remarkup-assist-i {
+.remarkup-assist-tag {
   background-position: -45px -210px;
 }
 
-.remarkup-assist-image {
+.remarkup-assist-tt {
   background-position: -60px -210px;
 }
 
-.remarkup-assist-larger {
+.remarkup-assist-ul {
   background-position: -75px -210px;
 }
-
-.remarkup-assist-meme {
-  background-position: -90px -210px;
-}
-
-.remarkup-assist-ol {
-  background-position: -105px -210px;
-}
-
-.remarkup-assist-order {
-  background-position: -120px -210px;
-}
-
-.remarkup-control-order-mode .remarkup-assist-order {
-  background-position: -135px -210px;
-}
-
-.remarkup-assist-table {
-  background-position: -150px -210px;
-}
-
-.remarkup-assist-tag {
-  background-position: -165px -210px;
-}
-
-.remarkup-assist-tt {
-  background-position: -180px -210px;
-}
-
-.remarkup-assist-ul {
-  background-position: -195px -210px;
-}
diff --git a/webroot/rsrc/image/sprite-icons-X2.png b/webroot/rsrc/image/sprite-icons-X2.png
index 7f3891a8bb..a5b18974a9 100644
Binary files a/webroot/rsrc/image/sprite-icons-X2.png and b/webroot/rsrc/image/sprite-icons-X2.png differ
diff --git a/webroot/rsrc/image/sprite-icons.png b/webroot/rsrc/image/sprite-icons.png
index 774f4e9f26..199da295a1 100644
Binary files a/webroot/rsrc/image/sprite-icons.png and b/webroot/rsrc/image/sprite-icons.png differ