Index: resources/sprite/manifest/icons.json
===================================================================
--- resources/sprite/manifest/icons.json
+++ resources/sprite/manifest/icons.json
@@ -1098,7 +1098,7 @@
     },
     "remarkup-assist-link"                : {
       "name" : "remarkup-assist-link",
-      "rule" : ".remarkup-assist-link",
+      "rule" : ".remarkup-assist-",
       "hash" : "14fd38c00e80b6f4823ac543a96e63c2"
     },
     "remarkup-assist-text_b"              : {
Index: resources/sprite/manifest/status.json
===================================================================
--- resources/sprite/manifest/status.json
+++ resources/sprite/manifest/status.json
@@ -218,7 +218,7 @@
     },
     "status-policy-admin-white"   : {
       "name" : "status-policy-admin-white",
-      "rule" : ".status-policy-admin-white",
+      "rule" : ".status-policy-admin-white, .dropdown-menu-item:hover .status-policy-admin",
       "hash" : "4b16ec5170bc30fb688f7e086e61a7f1"
     },
     "status-policy-all"           : {
@@ -228,7 +228,7 @@
     },
     "status-policy-all-white"     : {
       "name" : "status-policy-all-white",
-      "rule" : ".status-policy-all-white",
+      "rule" : ".status-policy-all-white, .dropdown-menu-item:hover .status-policy-all",
       "hash" : "24ed12bf6f58c21a82be125ace2ff0d0"
     },
     "status-policy-custom"        : {
@@ -238,7 +238,7 @@
     },
     "status-policy-custom-white"  : {
       "name" : "status-policy-custom-white",
-      "rule" : ".status-policy-custom-white",
+      "rule" : ".status-policy-custom-white, .dropdown-menu-item:hover .status-policy-custom",
       "hash" : "ff8b4cbe21f3b4254f343fffc170ef4b"
     },
     "status-policy-noone"         : {
@@ -248,7 +248,7 @@
     },
     "status-policy-noone-white"   : {
       "name" : "status-policy-noone-white",
-      "rule" : ".status-policy-noone-white",
+      "rule" : ".status-policy-noone-white, .dropdown-menu-item:hover .status-policy-noone",
       "hash" : "80fb9b153fec4d8136242c5ddc2d8e77"
     },
     "status-policy-project"       : {
@@ -258,7 +258,7 @@
     },
     "status-policy-project-white" : {
       "name" : "status-policy-project-white",
-      "rule" : ".status-policy-project-white",
+      "rule" : ".status-policy-project-white, .dropdown-menu-item:hover .status-policy-project",
       "hash" : "ac2b6f19edb8d6c40f0bcb3fd477a067"
     },
     "status-policy-public"        : {
@@ -268,7 +268,7 @@
     },
     "status-policy-public-white"  : {
       "name" : "status-policy-public-white",
-      "rule" : ".status-policy-public-white",
+      "rule" : ".status-policy-public-white, .dropdown-menu-item:hover .status-policy-public",
       "hash" : "cf809ca49eefed5375c2ea081e721971"
     },
     "status-policy-unknown"       : {
@@ -278,7 +278,7 @@
     },
     "status-policy-unknown-white" : {
       "name" : "status-policy-unknown-white",
-      "rule" : ".status-policy-unknown-white",
+      "rule" : ".status-policy-unknown-white, .dropdown-menu-item:hover .status-policy-unknown",
       "hash" : "98985bfa005672c4b88feaf88cfa72bc"
     },
     "status-question-blue"        : {
Index: src/__celerity_resource_map__.php
===================================================================
--- src/__celerity_resource_map__.php
+++ src/__celerity_resource_map__.php
@@ -3822,7 +3822,7 @@
   ),
   'phui-button-css' =>
   array(
-    'uri' => '/res/3b21ca84/rsrc/css/phui/phui-button.css',
+    'uri' => '/res/abf52ae9/rsrc/css/phui/phui-button.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -4218,7 +4218,7 @@
   ),
   'sprite-icons-css' =>
   array(
-    'uri' => '/res/b195fb94/rsrc/css/sprite-icons.css',
+    'uri' => '/res/612d8282/rsrc/css/sprite-icons.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -4272,7 +4272,7 @@
   ),
   'sprite-status-css' =>
   array(
-    'uri' => '/res/8e710031/rsrc/css/sprite-status.css',
+    'uri' => '/res/c74fedbc/rsrc/css/sprite-status.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -4309,7 +4309,7 @@
 ), array(
   'packages' =>
   array(
-    'e7bcbe65' =>
+    '5f2b66f1' =>
     array(
       'name' => 'core.pkg.css',
       'symbols' =>
@@ -4358,7 +4358,7 @@
         41 => 'phabricator-tag-view-css',
         42 => 'phui-list-view-css',
       ),
-      'uri' => '/res/pkg/e7bcbe65/core.pkg.css',
+      'uri' => '/res/pkg/5f2b66f1/core.pkg.css',
       'type' => 'css',
     ),
     '2c1dba03' =>
@@ -4550,15 +4550,15 @@
   ),
   'reverse' =>
   array(
-    'aphront-dialog-view-css' => 'e7bcbe65',
-    'aphront-error-view-css' => 'e7bcbe65',
-    'aphront-list-filter-view-css' => 'e7bcbe65',
-    'aphront-pager-view-css' => 'e7bcbe65',
-    'aphront-panel-view-css' => 'e7bcbe65',
-    'aphront-table-view-css' => 'e7bcbe65',
-    'aphront-tokenizer-control-css' => 'e7bcbe65',
-    'aphront-tooltip-css' => 'e7bcbe65',
-    'aphront-typeahead-control-css' => 'e7bcbe65',
+    'aphront-dialog-view-css' => '5f2b66f1',
+    'aphront-error-view-css' => '5f2b66f1',
+    'aphront-list-filter-view-css' => '5f2b66f1',
+    'aphront-pager-view-css' => '5f2b66f1',
+    'aphront-panel-view-css' => '5f2b66f1',
+    'aphront-table-view-css' => '5f2b66f1',
+    'aphront-tokenizer-control-css' => '5f2b66f1',
+    'aphront-tooltip-css' => '5f2b66f1',
+    'aphront-typeahead-control-css' => '5f2b66f1',
     'differential-changeset-view-css' => '0fe5af56',
     'differential-core-view-css' => '0fe5af56',
     'differential-inline-comment-editor' => '5e9e5c4e',
@@ -4572,7 +4572,7 @@
     'differential-table-of-contents-css' => '0fe5af56',
     'diffusion-commit-view-css' => '270f4eb4',
     'diffusion-icons-css' => '270f4eb4',
-    'global-drag-and-drop-css' => 'e7bcbe65',
+    'global-drag-and-drop-css' => '5f2b66f1',
     'inline-comment-summary-css' => '0fe5af56',
     'javelin-aphlict' => '2c1dba03',
     'javelin-behavior' => '3e3be199',
@@ -4647,56 +4647,56 @@
     'javelin-util' => '3e3be199',
     'javelin-vector' => '3e3be199',
     'javelin-workflow' => '3e3be199',
-    'lightbox-attachment-css' => 'e7bcbe65',
+    'lightbox-attachment-css' => '5f2b66f1',
     'maniphest-task-summary-css' => '49898640',
-    'phabricator-action-list-view-css' => 'e7bcbe65',
-    'phabricator-application-launch-view-css' => 'e7bcbe65',
+    'phabricator-action-list-view-css' => '5f2b66f1',
+    'phabricator-application-launch-view-css' => '5f2b66f1',
     'phabricator-busy' => '2c1dba03',
     'phabricator-content-source-view-css' => '0fe5af56',
-    'phabricator-core-css' => 'e7bcbe65',
-    'phabricator-crumbs-view-css' => 'e7bcbe65',
+    'phabricator-core-css' => '5f2b66f1',
+    'phabricator-crumbs-view-css' => '5f2b66f1',
     'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
     'phabricator-dropdown-menu' => '2c1dba03',
     'phabricator-file-upload' => '2c1dba03',
-    'phabricator-filetree-view-css' => 'e7bcbe65',
-    'phabricator-flag-css' => 'e7bcbe65',
+    'phabricator-filetree-view-css' => '5f2b66f1',
+    'phabricator-flag-css' => '5f2b66f1',
     'phabricator-hovercard' => '2c1dba03',
-    'phabricator-jump-nav' => 'e7bcbe65',
+    'phabricator-jump-nav' => '5f2b66f1',
     'phabricator-keyboard-shortcut' => '2c1dba03',
     'phabricator-keyboard-shortcut-manager' => '2c1dba03',
-    'phabricator-main-menu-view' => 'e7bcbe65',
+    'phabricator-main-menu-view' => '5f2b66f1',
     'phabricator-menu-item' => '2c1dba03',
-    'phabricator-nav-view-css' => 'e7bcbe65',
+    'phabricator-nav-view-css' => '5f2b66f1',
     'phabricator-notification' => '2c1dba03',
-    'phabricator-notification-css' => 'e7bcbe65',
-    'phabricator-notification-menu-css' => 'e7bcbe65',
+    'phabricator-notification-css' => '5f2b66f1',
+    'phabricator-notification-menu-css' => '5f2b66f1',
     'phabricator-object-selector-css' => '0fe5af56',
     'phabricator-phtize' => '2c1dba03',
     'phabricator-prefab' => '2c1dba03',
     'phabricator-project-tag-css' => '49898640',
-    'phabricator-remarkup-css' => 'e7bcbe65',
+    'phabricator-remarkup-css' => '5f2b66f1',
     'phabricator-shaped-request' => '5e9e5c4e',
-    'phabricator-side-menu-view-css' => 'e7bcbe65',
-    'phabricator-standard-page-view' => 'e7bcbe65',
-    'phabricator-tag-view-css' => 'e7bcbe65',
+    'phabricator-side-menu-view-css' => '5f2b66f1',
+    'phabricator-standard-page-view' => '5f2b66f1',
+    'phabricator-tag-view-css' => '5f2b66f1',
     'phabricator-textareautils' => '2c1dba03',
     'phabricator-tooltip' => '2c1dba03',
-    'phabricator-transaction-view-css' => 'e7bcbe65',
-    'phabricator-zindex-css' => 'e7bcbe65',
-    'phui-button-css' => 'e7bcbe65',
-    'phui-form-css' => 'e7bcbe65',
-    'phui-form-view-css' => 'e7bcbe65',
-    'phui-header-view-css' => 'e7bcbe65',
-    'phui-icon-view-css' => 'e7bcbe65',
-    'phui-list-view-css' => 'e7bcbe65',
-    'phui-object-item-list-view-css' => 'e7bcbe65',
-    'phui-property-list-view-css' => 'e7bcbe65',
-    'phui-spacing-css' => 'e7bcbe65',
-    'sprite-apps-large-css' => 'e7bcbe65',
-    'sprite-gradient-css' => 'e7bcbe65',
-    'sprite-icons-css' => 'e7bcbe65',
-    'sprite-menu-css' => 'e7bcbe65',
-    'sprite-status-css' => 'e7bcbe65',
-    'syntax-highlighting-css' => 'e7bcbe65',
+    'phabricator-transaction-view-css' => '5f2b66f1',
+    'phabricator-zindex-css' => '5f2b66f1',
+    'phui-button-css' => '5f2b66f1',
+    'phui-form-css' => '5f2b66f1',
+    'phui-form-view-css' => '5f2b66f1',
+    'phui-header-view-css' => '5f2b66f1',
+    'phui-icon-view-css' => '5f2b66f1',
+    'phui-list-view-css' => '5f2b66f1',
+    'phui-object-item-list-view-css' => '5f2b66f1',
+    'phui-property-list-view-css' => '5f2b66f1',
+    'phui-spacing-css' => '5f2b66f1',
+    'sprite-apps-large-css' => '5f2b66f1',
+    'sprite-gradient-css' => '5f2b66f1',
+    'sprite-icons-css' => '5f2b66f1',
+    'sprite-menu-css' => '5f2b66f1',
+    'sprite-status-css' => '5f2b66f1',
+    'syntax-highlighting-css' => '5f2b66f1',
   ),
 ));
Index: src/infrastructure/celerity/CeleritySpriteGenerator.php
===================================================================
--- src/infrastructure/celerity/CeleritySpriteGenerator.php
+++ src/infrastructure/celerity/CeleritySpriteGenerator.php
@@ -520,10 +520,27 @@
 
     $sprites = array();
     $prefix = 'status_';
+    $extra_css = array(
+      'policy-custom-white' =>
+        ', .dropdown-menu-item:hover .status-policy-custom',
+      'policy-all-white' =>
+        ', .dropdown-menu-item:hover .status-policy-all',
+      'policy-unknown-white' =>
+        ', .dropdown-menu-item:hover .status-policy-unknown',
+      'policy-admin-white' =>
+        ', .dropdown-menu-item:hover .status-policy-admin',
+      'policy-public-white' =>
+        ', .dropdown-menu-item:hover .status-policy-public',
+      'policy-project-white' =>
+        ', .dropdown-menu-item:hover .status-policy-project',
+      'policy-noone-white' =>
+        ', .dropdown-menu-item:hover .status-policy-noone',
+    );
+
     foreach ($icons as $icon) {
       $sprite = id(clone $template)
         ->setName('status-'.$icon)
-        ->setTargetCSS('.status-'.$icon);
+        ->setTargetCSS('.status-'.$icon.idx($extra_css, $icon));
 
       foreach ($scales as $scale_key => $scale) {
         $path = $this->getPath($prefix.$scale_key.'/'.$icon.'.png');
Index: webroot/rsrc/css/phui/phui-button.css
===================================================================
--- webroot/rsrc/css/phui/phui-button.css
+++ webroot/rsrc/css/phui/phui-button.css
@@ -135,7 +135,7 @@
   border-bottom: none;
   text-decoration: none;
   text-shadow: none;
-  color: #3b5998;
+  color: #19558D;
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
   box-shadow: none;
@@ -172,7 +172,7 @@
 .dropdown-menu-frame .phui-icon-view {
   display: inline-block;
   padding: 0;
-  margin: 2px 8px -2px 4px;
+  margin: 2px 6px -2px 4px;
 }
 
 a.policy-control {
Index: webroot/rsrc/css/sprite-icons.css
===================================================================
--- webroot/rsrc/css/sprite-icons.css
+++ webroot/rsrc/css/sprite-icons.css
@@ -894,7 +894,7 @@
   background-position: -120px -210px;
 }
 
-.remarkup-assist-link {
+.remarkup-assist- {
   background-position: -135px -210px;
 }
 
Index: webroot/rsrc/css/sprite-status.css
===================================================================
--- webroot/rsrc/css/sprite-status.css
+++ webroot/rsrc/css/sprite-status.css
@@ -186,7 +186,7 @@
   background-position: -75px -60px;
 }
 
-.status-policy-admin-white {
+.status-policy-admin-white, .dropdown-menu-item:hover .status-policy-admin {
   background-position: -90px -60px;
 }
 
@@ -194,7 +194,7 @@
   background-position: -105px -60px;
 }
 
-.status-policy-all-white {
+.status-policy-all-white, .dropdown-menu-item:hover .status-policy-all {
   background-position: -120px -60px;
 }
 
@@ -202,7 +202,7 @@
   background-position: 0px -75px;
 }
 
-.status-policy-custom-white {
+.status-policy-custom-white, .dropdown-menu-item:hover .status-policy-custom {
   background-position: -15px -75px;
 }
 
@@ -210,7 +210,7 @@
   background-position: -30px -75px;
 }
 
-.status-policy-noone-white {
+.status-policy-noone-white, .dropdown-menu-item:hover .status-policy-noone {
   background-position: -45px -75px;
 }
 
@@ -218,7 +218,7 @@
   background-position: -60px -75px;
 }
 
-.status-policy-project-white {
+.status-policy-project-white, .dropdown-menu-item:hover .status-policy-project {
   background-position: -75px -75px;
 }
 
@@ -226,7 +226,7 @@
   background-position: -90px -75px;
 }
 
-.status-policy-public-white {
+.status-policy-public-white, .dropdown-menu-item:hover .status-policy-public {
   background-position: -105px -75px;
 }
 
@@ -234,7 +234,7 @@
   background-position: -120px -75px;
 }
 
-.status-policy-unknown-white {
+.status-policy-unknown-white, .dropdown-menu-item:hover .status-policy-unknown {
   background-position: 0px -90px;
 }