diff --git a/scripts/celerity/generate_sprites.php b/scripts/celerity/generate_sprites.php
index ba815f9134..cd0566582d 100755
--- a/scripts/celerity/generate_sprites.php
+++ b/scripts/celerity/generate_sprites.php
@@ -61,7 +61,7 @@ $sheet->addCSSHeader(<<<EOCSS
  */
 
 .autosprite {
-  background-image: url(/rsrc/image/autosprite.png);
+  background-image: url(/rsrc/images/autosprite.png);
   background-repeat: no-repeat;
 }
 EOCSS
diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index a5d9796e7f..bc44bcb3c9 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -133,6 +133,13 @@ celerity_register_resource_map(array(
     'disk' => '/rsrc/image/appstatus_okay.png',
     'type' => 'png',
   ),
+  '/rsrc/image/autosprite.png' =>
+  array(
+    'hash' => 'd02cc399dc950cd70006ef2374a6da4a',
+    'uri' => '/res/d02cc399/rsrc/image/autosprite.png',
+    'disk' => '/rsrc/image/autosprite.png',
+    'type' => 'png',
+  ),
   '/rsrc/image/avatar.png' =>
   array(
     'hash' => '1c5f255071537f05406adee86717ff27',
@@ -518,153 +525,6 @@ celerity_register_resource_map(array(
     'disk' => '/rsrc/image/logo_grey.png',
     'type' => 'png',
   ),
-  '/rsrc/image/menu/icon_help.png' =>
-  array(
-    'hash' => '874d2355508e8eafa052a1051c640880',
-    'uri' => '/res/874d2355/rsrc/image/menu/icon_help.png',
-    'disk' => '/rsrc/image/menu/icon_help.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_help_hover.png' =>
-  array(
-    'hash' => 'cf247b654052ebce0af28f03fd22c3ee',
-    'uri' => '/res/cf247b65/rsrc/image/menu/icon_help_hover.png',
-    'disk' => '/rsrc/image/menu/icon_help_hover.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_help_selected.png' =>
-  array(
-    'hash' => '59d79d47d28b87ca9a411a6c9617b038',
-    'uri' => '/res/59d79d47/rsrc/image/menu/icon_help_selected.png',
-    'disk' => '/rsrc/image/menu/icon_help_selected.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_logout.png' =>
-  array(
-    'hash' => '084d2bda82d5b996698a538b5ccdb46a',
-    'uri' => '/res/084d2bda/rsrc/image/menu/icon_logout.png',
-    'disk' => '/rsrc/image/menu/icon_logout.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_logout2x.png' =>
-  array(
-    'hash' => '5d11a6d23ad61f55b5793432df5acb0a',
-    'uri' => '/res/5d11a6d2/rsrc/image/menu/icon_logout2x.png',
-    'disk' => '/rsrc/image/menu/icon_logout2x.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_logout2x_hover.png' =>
-  array(
-    'hash' => '80e306c4d8f501da839ce4c80996d9fc',
-    'uri' => '/res/80e306c4/rsrc/image/menu/icon_logout2x_hover.png',
-    'disk' => '/rsrc/image/menu/icon_logout2x_hover.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_logout2x_selected.png' =>
-  array(
-    'hash' => 'aa2e3c875fcad31348df5c9fdccf7159',
-    'uri' => '/res/aa2e3c87/rsrc/image/menu/icon_logout2x_selected.png',
-    'disk' => '/rsrc/image/menu/icon_logout2x_selected.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_logout_hover.png' =>
-  array(
-    'hash' => 'e10818e44bb80106f9d2865de9dc5502',
-    'uri' => '/res/e10818e4/rsrc/image/menu/icon_logout_hover.png',
-    'disk' => '/rsrc/image/menu/icon_logout_hover.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_logout_selected.png' =>
-  array(
-    'hash' => '71129452753f4b079b03c67eb11dabc2',
-    'uri' => '/res/71129452/rsrc/image/menu/icon_logout_selected.png',
-    'disk' => '/rsrc/image/menu/icon_logout_selected.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_settings.png' =>
-  array(
-    'hash' => '247b9e58e0ee2b0e3c2d85eec0fb56de',
-    'uri' => '/res/247b9e58/rsrc/image/menu/icon_settings.png',
-    'disk' => '/rsrc/image/menu/icon_settings.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_settings2x.png' =>
-  array(
-    'hash' => 'f2c6723a9fed69c760a8dbbb4a28878c',
-    'uri' => '/res/f2c6723a/rsrc/image/menu/icon_settings2x.png',
-    'disk' => '/rsrc/image/menu/icon_settings2x.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_settings2x_hover.png' =>
-  array(
-    'hash' => 'dcd473539fe94fb79335c895a7dbe873',
-    'uri' => '/res/dcd47353/rsrc/image/menu/icon_settings2x_hover.png',
-    'disk' => '/rsrc/image/menu/icon_settings2x_hover.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_settings2x_selected.png' =>
-  array(
-    'hash' => '5fac19e4b0c18426c264a5915ba36ce7',
-    'uri' => '/res/5fac19e4/rsrc/image/menu/icon_settings2x_selected.png',
-    'disk' => '/rsrc/image/menu/icon_settings2x_selected.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_settings_hover.png' =>
-  array(
-    'hash' => '1ba90f62880d57ef04b6c3bc3450f9e1',
-    'uri' => '/res/1ba90f62/rsrc/image/menu/icon_settings_hover.png',
-    'disk' => '/rsrc/image/menu/icon_settings_hover.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_settings_selected.png' =>
-  array(
-    'hash' => '52274d9a722786b1110afef9e6055c79',
-    'uri' => '/res/52274d9a/rsrc/image/menu/icon_settings_selected.png',
-    'disk' => '/rsrc/image/menu/icon_settings_selected.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_task.png' =>
-  array(
-    'hash' => 'cb6706766e6587c98fe68431e2d6653c',
-    'uri' => '/res/cb670676/rsrc/image/menu/icon_task.png',
-    'disk' => '/rsrc/image/menu/icon_task.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_task2x.png' =>
-  array(
-    'hash' => '884c90a8d97eebf34457a1d0f68d53b5',
-    'uri' => '/res/884c90a8/rsrc/image/menu/icon_task2x.png',
-    'disk' => '/rsrc/image/menu/icon_task2x.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_task2x_hover.png' =>
-  array(
-    'hash' => 'a9875f3572c50cafe048b95608b5c63e',
-    'uri' => '/res/a9875f35/rsrc/image/menu/icon_task2x_hover.png',
-    'disk' => '/rsrc/image/menu/icon_task2x_hover.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_task2x_selected.png' =>
-  array(
-    'hash' => 'ea8a192e3396468079564bcdeeeae434',
-    'uri' => '/res/ea8a192e/rsrc/image/menu/icon_task2x_selected.png',
-    'disk' => '/rsrc/image/menu/icon_task2x_selected.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_task_hover.png' =>
-  array(
-    'hash' => '97af34be5cfd65a58040ad123e12b596',
-    'uri' => '/res/97af34be/rsrc/image/menu/icon_task_hover.png',
-    'disk' => '/rsrc/image/menu/icon_task_hover.png',
-    'type' => 'png',
-  ),
-  '/rsrc/image/menu/icon_task_selected.png' =>
-  array(
-    'hash' => '9d3dfdb15fd43ec784271758c5bc10bc',
-    'uri' => '/res/9d3dfdb1/rsrc/image/menu/icon_task_selected.png',
-    'disk' => '/rsrc/image/menu/icon_task_selected.png',
-    'type' => 'png',
-  ),
   '/rsrc/image/search.png' =>
   array(
     'hash' => 'ff7da044e6f923b8f569dec11f97e5e5',
@@ -858,6 +718,15 @@ celerity_register_resource_map(array(
     ),
     'disk' => '/rsrc/css/aphront/typeahead.css',
   ),
+  'autosprite-css' =>
+  array(
+    'uri' => '/res/ef26301d/rsrc/css/autosprite.css',
+    'type' => 'css',
+    'requires' =>
+    array(
+    ),
+    'disk' => '/rsrc/css/autosprite.css',
+  ),
   'differential-changeset-view-css' =>
   array(
     'uri' => '/res/28449eff/rsrc/css/application/differential/changeset-view.css',
@@ -2579,7 +2448,7 @@ celerity_register_resource_map(array(
   ),
   'phabricator-main-menu-view' =>
   array(
-    'uri' => '/res/a768260e/rsrc/css/application/base/main-menu-view.css',
+    'uri' => '/res/a51c5f64/rsrc/css/application/base/main-menu-view.css',
     'type' => 'css',
     'requires' =>
     array(
diff --git a/src/applications/auth/application/PhabricatorApplicationAuth.php b/src/applications/auth/application/PhabricatorApplicationAuth.php
index 73a48934ce..a66a21ba55 100644
--- a/src/applications/auth/application/PhabricatorApplicationAuth.php
+++ b/src/applications/auth/application/PhabricatorApplicationAuth.php
@@ -37,7 +37,7 @@ final class PhabricatorApplicationAuth extends PhabricatorApplication {
     if ($user->isLoggedIn()) {
       $item = new PhabricatorMainMenuIconView();
       $item->setName(pht('Log Out'));
-      $item->addClass('main-menu-item-icon '.$class);
+      $item->addClass('autosprite main-menu-item-icon '.$class);
       $item->setWorkflow(true);
       $item->setHref('/logout/');
       $item->setSortOrder(1.0);
diff --git a/src/applications/diviner/application/PhabricatorApplicationDiviner.php b/src/applications/diviner/application/PhabricatorApplicationDiviner.php
index 0fc0aa3fb7..204b4a9270 100644
--- a/src/applications/diviner/application/PhabricatorApplicationDiviner.php
+++ b/src/applications/diviner/application/PhabricatorApplicationDiviner.php
@@ -37,7 +37,7 @@ final class PhabricatorApplicationDiviner extends PhabricatorApplication {
       $class = 'main-menu-item-icon-help';
       $item = new PhabricatorMainMenuIconView();
       $item->setName(pht('%s Help', $application->getName()));
-      $item->addClass('main-menu-item-icon '.$class);
+      $item->addClass('autosprite main-menu-item-icon '.$class);
       $item->setHref($application->getHelpURI());
       $item->setSortOrder(0.1);
       $items[] = $item;
diff --git a/src/applications/settings/application/PhabricatorApplicationSettings.php b/src/applications/settings/application/PhabricatorApplicationSettings.php
index c3b3c92e5a..b297e3238a 100644
--- a/src/applications/settings/application/PhabricatorApplicationSettings.php
+++ b/src/applications/settings/application/PhabricatorApplicationSettings.php
@@ -45,7 +45,7 @@ final class PhabricatorApplicationSettings extends PhabricatorApplication {
 
     $items = array();
 
-    if ($controller instanceof PhabricatorUserSettingsController) {
+    if ($controller instanceof PhabricatorSettingsMainController) {
       $class = 'main-menu-item-icon-settings-selected';
     } else {
       $class = 'main-menu-item-icon-settings';
@@ -54,7 +54,7 @@ final class PhabricatorApplicationSettings extends PhabricatorApplication {
     if ($user->isLoggedIn()) {
       $item = new PhabricatorMainMenuIconView();
       $item->setName(pht('Settings'));
-      $item->addClass('main-menu-item-icon '.$class);
+      $item->addClass('autosprite main-menu-item-icon '.$class);
       $item->setHref('/settings/');
       $item->setSortOrder(0.90);
       $items[] = $item;
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index a88f2e0b92..b48ce0a34c 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -138,6 +138,7 @@ final class PhabricatorStandardPageView extends AphrontPageView {
     $console = $this->getConsole();
 
     require_celerity_resource('phabricator-core-css');
+    require_celerity_resource('autosprite-css');
     require_celerity_resource('phabricator-core-buttons-css');
     require_celerity_resource('phabricator-standard-page-view');
 
diff --git a/src/view/page/menu/PhabricatorMainMenuView.php b/src/view/page/menu/PhabricatorMainMenuView.php
index a0da68dff1..f798217106 100644
--- a/src/view/page/menu/PhabricatorMainMenuView.php
+++ b/src/view/page/menu/PhabricatorMainMenuView.php
@@ -108,6 +108,8 @@ final class PhabricatorMainMenuView extends AphrontView {
     $classes = array();
     $classes[] = 'phabricator-main-menu-alert-item';
     $classes[] = 'phabricator-main-menu-alert-item-notification';
+    $classes[] = 'autosprite';
+    $classes[] = 'main-menu-item-icon-notifications';
 
     $notification_icon = javelin_render_tag(
       'a',
diff --git a/webroot/rsrc/css/application/base/main-menu-view.css b/webroot/rsrc/css/application/base/main-menu-view.css
index 377f9318c3..cf43d25a98 100644
--- a/webroot/rsrc/css/application/base/main-menu-view.css
+++ b/webroot/rsrc/css/application/base/main-menu-view.css
@@ -148,7 +148,6 @@
   height: 26px;
   margin: 9px 6px;
   display: inline-block;
-  background-repeat: no-repeat;
 }
 
 .device-desktop .phabricator-main-menu-icon-label {
@@ -173,47 +172,6 @@
   position: absolute;
 }
 
-.main-menu-item-icon {
-  background-repeat: no-repeat;
-  background-size: 26px 26px;
-}
-
-.main-menu-item-icon-settings {
-  background-image: url(/rsrc/image/menu/icon_settings.png);
-}
-
-.main-menu-item-icon-settings:hover {
-  background-image: url(/rsrc/image/menu/icon_settings_hover.png);
-}
-
-.main-menu-item-icon-settings-selected {
-  background-image: url(/rsrc/image/menu/icon_settings_selected.png);
-}
-
-.main-menu-item-icon-logout {
-  background-image: url(/rsrc/image/menu/icon_logout.png);
-}
-
-.main-menu-item-icon-logout:hover {
-  background-image: url(/rsrc/image/menu/icon_logout_hover.png);
-}
-
-.main-menu-item-icon-logout-selected {
-  background-image: url(/rsrc/image/menu/icon_logout_selected.png);
-}
-
-.main-menu-item-icon-help {
-  background-image: url(/rsrc/image/menu/icon_help.png);
-}
-
-.main-menu-item-icon-help:hover {
-  background-image: url(/rsrc/image/menu/icon_help_hover.png);
-}
-
-.main-menu-item-icon-help-selected {
-  background-image: url(/rsrc/image/menu/icon_help_selected.png);
-}
-
 .main-menu-item-icon-profile {
   background-repeat: no-repeat;
   background-size: 26px 26px;
@@ -426,7 +384,3 @@ a:hover .phabricator-main-search-typeahead-result .result-type {
   font-weight: bold;
   color: #ffffff;
 }
-
-.phabricator-main-menu-alert-item-notification {
-  background: url(/rsrc/image/bolt.png) no-repeat;
-}
diff --git a/webroot/rsrc/image/bolt.png b/webroot/rsrc/image/bolt.png
deleted file mode 100644
index 1657e6cccb..0000000000
Binary files a/webroot/rsrc/image/bolt.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_help.png b/webroot/rsrc/image/menu/icon_help.png
deleted file mode 100644
index 8889d9d5e1..0000000000
Binary files a/webroot/rsrc/image/menu/icon_help.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_help_hover.png b/webroot/rsrc/image/menu/icon_help_hover.png
deleted file mode 100644
index 18c3c98518..0000000000
Binary files a/webroot/rsrc/image/menu/icon_help_hover.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_help_selected.png b/webroot/rsrc/image/menu/icon_help_selected.png
deleted file mode 100644
index 9a2fbf95bf..0000000000
Binary files a/webroot/rsrc/image/menu/icon_help_selected.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_logout.png b/webroot/rsrc/image/menu/icon_logout.png
deleted file mode 100644
index a484cba5d6..0000000000
Binary files a/webroot/rsrc/image/menu/icon_logout.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_logout2x.png b/webroot/rsrc/image/menu/icon_logout2x.png
deleted file mode 100644
index 9d63e6ed78..0000000000
Binary files a/webroot/rsrc/image/menu/icon_logout2x.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_logout2x_hover.png b/webroot/rsrc/image/menu/icon_logout2x_hover.png
deleted file mode 100644
index efb9348a2b..0000000000
Binary files a/webroot/rsrc/image/menu/icon_logout2x_hover.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_logout2x_selected.png b/webroot/rsrc/image/menu/icon_logout2x_selected.png
deleted file mode 100644
index 1e6532f801..0000000000
Binary files a/webroot/rsrc/image/menu/icon_logout2x_selected.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_logout_hover.png b/webroot/rsrc/image/menu/icon_logout_hover.png
deleted file mode 100644
index c9cca1ccaf..0000000000
Binary files a/webroot/rsrc/image/menu/icon_logout_hover.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_logout_selected.png b/webroot/rsrc/image/menu/icon_logout_selected.png
deleted file mode 100644
index 93767459c0..0000000000
Binary files a/webroot/rsrc/image/menu/icon_logout_selected.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_settings.png b/webroot/rsrc/image/menu/icon_settings.png
deleted file mode 100644
index 489cbcbdff..0000000000
Binary files a/webroot/rsrc/image/menu/icon_settings.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_settings2x.png b/webroot/rsrc/image/menu/icon_settings2x.png
deleted file mode 100644
index 429b5ccdb3..0000000000
Binary files a/webroot/rsrc/image/menu/icon_settings2x.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_settings2x_hover.png b/webroot/rsrc/image/menu/icon_settings2x_hover.png
deleted file mode 100644
index 4d508ad0ba..0000000000
Binary files a/webroot/rsrc/image/menu/icon_settings2x_hover.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_settings2x_selected.png b/webroot/rsrc/image/menu/icon_settings2x_selected.png
deleted file mode 100644
index ed359a04f4..0000000000
Binary files a/webroot/rsrc/image/menu/icon_settings2x_selected.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_settings_hover.png b/webroot/rsrc/image/menu/icon_settings_hover.png
deleted file mode 100644
index 69606c5e36..0000000000
Binary files a/webroot/rsrc/image/menu/icon_settings_hover.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_settings_selected.png b/webroot/rsrc/image/menu/icon_settings_selected.png
deleted file mode 100644
index adbaf0f904..0000000000
Binary files a/webroot/rsrc/image/menu/icon_settings_selected.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_task.png b/webroot/rsrc/image/menu/icon_task.png
deleted file mode 100644
index 6b91a6f99d..0000000000
Binary files a/webroot/rsrc/image/menu/icon_task.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_task2x.png b/webroot/rsrc/image/menu/icon_task2x.png
deleted file mode 100644
index d25bdd64a3..0000000000
Binary files a/webroot/rsrc/image/menu/icon_task2x.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_task2x_hover.png b/webroot/rsrc/image/menu/icon_task2x_hover.png
deleted file mode 100644
index 9c4e2661e7..0000000000
Binary files a/webroot/rsrc/image/menu/icon_task2x_hover.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_task2x_selected.png b/webroot/rsrc/image/menu/icon_task2x_selected.png
deleted file mode 100644
index 84a123d7bb..0000000000
Binary files a/webroot/rsrc/image/menu/icon_task2x_selected.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_task_hover.png b/webroot/rsrc/image/menu/icon_task_hover.png
deleted file mode 100644
index 6bcb6fff04..0000000000
Binary files a/webroot/rsrc/image/menu/icon_task_hover.png and /dev/null differ
diff --git a/webroot/rsrc/image/menu/icon_task_selected.png b/webroot/rsrc/image/menu/icon_task_selected.png
deleted file mode 100644
index d37127dd89..0000000000
Binary files a/webroot/rsrc/image/menu/icon_task_selected.png and /dev/null differ