diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 54832d23ae..feab818559 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'e68cf1fa',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => '0e4a68ad',
+    'core.pkg.css' => '038ad839',
     'core.pkg.js' => '5d80e0db',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '45951e9e',
@@ -183,7 +183,7 @@ return array(
     'rsrc/css/phui/workboards/phui-workboard.css' => '3bc85455',
     'rsrc/css/phui/workboards/phui-workcard.css' => 'cca5fa92',
     'rsrc/css/phui/workboards/phui-workpanel.css' => 'a3a63478',
-    'rsrc/css/sprite-login.css' => '587d92d7',
+    'rsrc/css/sprite-login.css' => '396f3c3a',
     'rsrc/css/sprite-tokens.css' => '9cdfd599',
     'rsrc/css/syntax/syntax-default.css' => '9923583c',
     'rsrc/externals/d3/d3.min.js' => 'a11a5ff2',
@@ -359,8 +359,8 @@ return array(
     'rsrc/image/phrequent_active.png' => 'a466a8ed',
     'rsrc/image/phrequent_inactive.png' => 'bfc15a69',
     'rsrc/image/resize.png' => 'fd476de4',
-    'rsrc/image/sprite-login-X2.png' => '4abee916',
-    'rsrc/image/sprite-login.png' => '2b9663fd',
+    'rsrc/image/sprite-login-X2.png' => '308c92c4',
+    'rsrc/image/sprite-login.png' => '9ec54245',
     'rsrc/image/sprite-tokens-X2.png' => '804a5232',
     'rsrc/image/sprite-tokens.png' => 'b41d03da',
     'rsrc/image/texture/card-gradient.png' => '815f26e8',
@@ -897,7 +897,7 @@ return array(
     'releeph-request-differential-create-dialog' => '8d8b92cd',
     'releeph-request-typeahead-css' => '667a48ae',
     'setup-issue-css' => 'f794cfc3',
-    'sprite-login-css' => '587d92d7',
+    'sprite-login-css' => '396f3c3a',
     'sprite-tokens-css' => '9cdfd599',
     'syntax-default-css' => '9923583c',
     'syntax-highlighting-css' => 'cae95e89',
diff --git a/resources/sprite/login_1x/Dropbox.png b/resources/sprite/login_1x/Dropbox.png
deleted file mode 100644
index 1d68eee5ca..0000000000
Binary files a/resources/sprite/login_1x/Dropbox.png and /dev/null differ
diff --git a/resources/sprite/login_1x/Linkedin.png b/resources/sprite/login_1x/Linkedin.png
deleted file mode 100644
index 2cf76885de..0000000000
Binary files a/resources/sprite/login_1x/Linkedin.png and /dev/null differ
diff --git a/resources/sprite/login_1x/Openid.png b/resources/sprite/login_1x/Openid.png
deleted file mode 100644
index 7259db47fd..0000000000
Binary files a/resources/sprite/login_1x/Openid.png and /dev/null differ
diff --git a/resources/sprite/login_1x/Phabricator.png b/resources/sprite/login_1x/Phabricator.png
index 5657d9c3c6..b998007a3c 100644
Binary files a/resources/sprite/login_1x/Phabricator.png and b/resources/sprite/login_1x/Phabricator.png differ
diff --git a/resources/sprite/login_1x/Yahoo.png b/resources/sprite/login_1x/Yahoo.png
deleted file mode 100644
index 47a01c53d7..0000000000
Binary files a/resources/sprite/login_1x/Yahoo.png and /dev/null differ
diff --git a/resources/sprite/login_2x/Dropbox.png b/resources/sprite/login_2x/Dropbox.png
deleted file mode 100644
index 953ed4eec4..0000000000
Binary files a/resources/sprite/login_2x/Dropbox.png and /dev/null differ
diff --git a/resources/sprite/login_2x/Linkedin.png b/resources/sprite/login_2x/Linkedin.png
deleted file mode 100644
index 9999d55c5c..0000000000
Binary files a/resources/sprite/login_2x/Linkedin.png and /dev/null differ
diff --git a/resources/sprite/login_2x/Openid.png b/resources/sprite/login_2x/Openid.png
deleted file mode 100644
index 360aa6e6ef..0000000000
Binary files a/resources/sprite/login_2x/Openid.png and /dev/null differ
diff --git a/resources/sprite/login_2x/Phabricator.png b/resources/sprite/login_2x/Phabricator.png
index 89c0372fbc..3792f723fc 100644
Binary files a/resources/sprite/login_2x/Phabricator.png and b/resources/sprite/login_2x/Phabricator.png differ
diff --git a/resources/sprite/login_2x/Yahoo.png b/resources/sprite/login_2x/Yahoo.png
deleted file mode 100644
index 5aa8c4fe74..0000000000
Binary files a/resources/sprite/login_2x/Yahoo.png and /dev/null differ
diff --git a/resources/sprite/manifest/login.json b/resources/sprite/manifest/login.json
index f5d15dd890..e9bbb9f2cb 100644
--- a/resources/sprite/manifest/login.json
+++ b/resources/sprite/manifest/login.json
@@ -21,11 +21,6 @@
       "rule": ".login-Disqus",
       "hash": "77b29d56329a3c30b79d6b6673b0e39b"
     },
-    "login-Dropbox": {
-      "name": "login-Dropbox",
-      "rule": ".login-Dropbox",
-      "hash": "5eaf07ae4598227fbbba3474675d18c7"
-    },
     "login-Facebook": {
       "name": "login-Facebook",
       "rule": ".login-Facebook",
@@ -61,21 +56,11 @@
       "rule": ".login-LDAP",
       "hash": "e31df2e9faf8ca0925ef93128a82fa7a"
     },
-    "login-Linkedin": {
-      "name": "login-Linkedin",
-      "rule": ".login-Linkedin",
-      "hash": "b7ee1e92c923462531f3a34093e57127"
-    },
     "login-MediaWiki": {
       "name": "login-MediaWiki",
       "rule": ".login-MediaWiki",
       "hash": "f1f0a9382434081a9a84e7584828c2dd"
     },
-    "login-Openid": {
-      "name": "login-Openid",
-      "rule": ".login-Openid",
-      "hash": "886f65ad44435344a1fa1c13e7758155"
-    },
     "login-PayPal": {
       "name": "login-PayPal",
       "rule": ".login-PayPal",
@@ -84,7 +69,7 @@
     "login-Phabricator": {
       "name": "login-Phabricator",
       "rule": ".login-Phabricator",
-      "hash": "d0f830803593bbcc025d7d5a29ee3ecd"
+      "hash": "54f5ddae4b9d138c438ec00ed42544d2"
     },
     "login-Slack": {
       "name": "login-Slack",
@@ -120,11 +105,6 @@
       "name": "login-WordPressCOM",
       "rule": ".login-WordPressCOM",
       "hash": "9eae4205dbed0c42a18ee4f8e0fa151b"
-    },
-    "login-Yahoo": {
-      "name": "login-Yahoo",
-      "rule": ".login-Yahoo",
-      "hash": "f37822c769f6b8ebd1dda6b3ac89b83b"
     }
   },
   "scales": [
diff --git a/webroot/rsrc/css/sprite-login.css b/webroot/rsrc/css/sprite-login.css
index 72638120f2..ec4e082031 100644
--- a/webroot/rsrc/css/sprite-login.css
+++ b/webroot/rsrc/css/sprite-login.css
@@ -14,7 +14,7 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5),
 only screen and (min-resolution: 1.5dppx) {
   .sprite-login {
     background-image: url(/rsrc/image/sprite-login-X2.png);
-    background-size: 145px 174px;
+    background-size: 145px 145px;
   }
 }
 
@@ -35,28 +35,24 @@ only screen and (min-resolution: 1.5dppx) {
   background-position: -87px 0px;
 }
 
-.login-Dropbox {
+.login-Facebook {
   background-position: -116px 0px;
 }
 
-.login-Facebook {
+.login-Generic {
   background-position: 0px -29px;
 }
 
-.login-Generic {
+.login-Github {
   background-position: -29px -29px;
 }
 
-.login-Github {
+.login-Google {
   background-position: -58px -29px;
 }
 
-.login-Google {
-  background-position: -87px -29px;
-}
-
 .login-HTTP {
-  background-position: -116px -29px;
+  background-position: -87px -29px;
 }
 
 .login-Jira {
@@ -67,54 +63,42 @@ only screen and (min-resolution: 1.5dppx) {
   background-position: -29px -58px;
 }
 
-.login-Linkedin {
+.login-MediaWiki {
   background-position: -58px -58px;
 }
 
-.login-MediaWiki {
+.login-PayPal {
   background-position: -87px -58px;
 }
 
-.login-Openid {
-  background-position: -116px -58px;
-}
-
-.login-PayPal {
+.login-Phabricator {
   background-position: 0px -87px;
 }
 
-.login-Phabricator {
-  background-position: -58px -87px;
-}
-
 .login-Slack {
-  background-position: -87px -87px;
+  background-position: -29px -87px;
 }
 
 .login-Stripe {
-  background-position: -116px -87px;
+  background-position: -58px -87px;
 }
 
 .login-TestPayment {
-  background-position: 0px -116px;
+  background-position: -87px -87px;
 }
 
 .login-TwitchTV {
-  background-position: -29px -116px;
+  background-position: 0px -116px;
 }
 
 .login-Twitter {
-  background-position: -58px -116px;
+  background-position: -29px -116px;
 }
 
 .login-WePay {
-  background-position: -87px -116px;
+  background-position: -58px -116px;
 }
 
 .login-WordPressCOM {
-  background-position: -116px -116px;
-}
-
-.login-Yahoo {
-  background-position: 0px -145px;
+  background-position: -87px -116px;
 }
diff --git a/webroot/rsrc/image/sprite-login-X2.png b/webroot/rsrc/image/sprite-login-X2.png
index 78a044ee72..2d3c118745 100644
Binary files a/webroot/rsrc/image/sprite-login-X2.png and b/webroot/rsrc/image/sprite-login-X2.png differ
diff --git a/webroot/rsrc/image/sprite-login.png b/webroot/rsrc/image/sprite-login.png
index a877ad3754..2f79e7ad8a 100644
Binary files a/webroot/rsrc/image/sprite-login.png and b/webroot/rsrc/image/sprite-login.png differ