diff --git a/resources/sprite/manifest/status.json b/resources/sprite/manifest/status.json
index b7a4161718..c0481f1726 100644
--- a/resources/sprite/manifest/status.json
+++ b/resources/sprite/manifest/status.json
@@ -1,382 +1,427 @@
 {
   "version" : 1,
   "sprites" : {
-    "status-accept-blue"    : {
+    "status-accept-blue"          : {
       "name" : "status-accept-blue",
       "rule" : ".status-accept-blue",
       "hash" : "c3bde2e1361bcd7259825ecaf2d4b2ff"
     },
-    "status-accept-dark"    : {
+    "status-accept-dark"          : {
       "name" : "status-accept-dark",
       "rule" : ".status-accept-dark",
       "hash" : "a2ec73e144ea598be15b8acb63f3c096"
     },
-    "status-accept-green"   : {
+    "status-accept-green"         : {
       "name" : "status-accept-green",
       "rule" : ".status-accept-green",
       "hash" : "cf0c2339a111f54adfdcc0de5c18be22"
     },
-    "status-accept-red"     : {
+    "status-accept-red"           : {
       "name" : "status-accept-red",
       "rule" : ".status-accept-red",
       "hash" : "1466a3ed72f63971e38e669715cf5b98"
     },
-    "status-accept-white"   : {
+    "status-accept-white"         : {
       "name" : "status-accept-white",
       "rule" : ".status-accept-white",
       "hash" : "8ecccf5e2ce6658d8a1e963e4be6f6e9"
     },
-    "status-add-blue"       : {
+    "status-add-blue"             : {
       "name" : "status-add-blue",
       "rule" : ".status-add-blue",
       "hash" : "8860efdd8f90eed700ae48595ace6b38"
     },
-    "status-add-dark"       : {
+    "status-add-dark"             : {
       "name" : "status-add-dark",
       "rule" : ".status-add-dark",
       "hash" : "38dc8634ccfe6fa30f467e97436e1a30"
     },
-    "status-add-green"      : {
+    "status-add-green"            : {
       "name" : "status-add-green",
       "rule" : ".status-add-green",
       "hash" : "5610cd9924ad6b3461a20dd050ef4866"
     },
-    "status-add-red"        : {
+    "status-add-red"              : {
       "name" : "status-add-red",
       "rule" : ".status-add-red",
       "hash" : "9e0abe2b6e37ef5a1a2522ad01002704"
     },
-    "status-add-white"      : {
+    "status-add-white"            : {
       "name" : "status-add-white",
       "rule" : ".status-add-white",
       "hash" : "1a8ab412f40c569acdc709fb281fefde"
     },
-    "status-down-blue"      : {
+    "status-down-blue"            : {
       "name" : "status-down-blue",
       "rule" : ".status-down-blue",
       "hash" : "25baf216cd311f321656a5f3a327c38c"
     },
-    "status-down-dark"      : {
+    "status-down-dark"            : {
       "name" : "status-down-dark",
       "rule" : ".status-down-dark",
       "hash" : "bb82d18b729ac30956200b655eafeeb8"
     },
-    "status-down-green"     : {
+    "status-down-green"           : {
       "name" : "status-down-green",
       "rule" : ".status-down-green",
       "hash" : "c29ad19910664ecc94e0d1fa99a0a6c0"
     },
-    "status-down-red"       : {
+    "status-down-red"             : {
       "name" : "status-down-red",
       "rule" : ".status-down-red",
       "hash" : "644f0d38cad5cc6797fe81ed30b9bc6a"
     },
-    "status-down-white"     : {
+    "status-down-white"           : {
       "name" : "status-down-white",
       "rule" : ".status-down-white",
       "hash" : "5bc0af6641ef545218ecced2d25e9a10"
     },
-    "status-info-blue"      : {
+    "status-info-blue"            : {
       "name" : "status-info-blue",
       "rule" : ".status-info-blue",
       "hash" : "2acc8c62d8963bec9ce632de60a4da41"
     },
-    "status-info-dark"      : {
+    "status-info-dark"            : {
       "name" : "status-info-dark",
       "rule" : ".status-info-dark",
       "hash" : "d96f44c17e67d7c0c10a400e6ff294f1"
     },
-    "status-info-green"     : {
+    "status-info-green"           : {
       "name" : "status-info-green",
       "rule" : ".status-info-green",
       "hash" : "28fc83a1f5bee4ac39a0dcd52e180818"
     },
-    "status-info-red"       : {
+    "status-info-red"             : {
       "name" : "status-info-red",
       "rule" : ".status-info-red",
       "hash" : "fc26e5509140d8e9a3305a39c44773f0"
     },
-    "status-info-white"     : {
+    "status-info-white"           : {
       "name" : "status-info-white",
       "rule" : ".status-info-white",
       "hash" : "b70025f459685371f8397b61944bef7d"
     },
-    "status-left-blue"      : {
+    "status-left-blue"            : {
       "name" : "status-left-blue",
       "rule" : ".status-left-blue",
       "hash" : "cdec5d2617cb7fcfbfea336881d267f0"
     },
-    "status-left-dark"      : {
+    "status-left-dark"            : {
       "name" : "status-left-dark",
       "rule" : ".status-left-dark",
       "hash" : "83b58d1cde130deb01971888ad0bcfc1"
     },
-    "status-left-green"     : {
+    "status-left-green"           : {
       "name" : "status-left-green",
       "rule" : ".status-left-green",
       "hash" : "6b34445f1a034e71432a5823bed1c4d7"
     },
-    "status-left-red"       : {
+    "status-left-red"             : {
       "name" : "status-left-red",
       "rule" : ".status-left-red",
       "hash" : "38ebb75c0fbcf6fe96def6c2ab70b343"
     },
-    "status-left-white"     : {
+    "status-left-white"           : {
       "name" : "status-left-white",
       "rule" : ".status-left-white",
       "hash" : "9e89400271b55590e610188d93671934"
     },
-    "status-minus-blue"     : {
+    "status-minus-blue"           : {
       "name" : "status-minus-blue",
       "rule" : ".status-minus-blue",
       "hash" : "61ef81a9b78b4de4bf6303f8d51c86ef"
     },
-    "status-minus-dark"     : {
+    "status-minus-dark"           : {
       "name" : "status-minus-dark",
       "rule" : ".status-minus-dark",
       "hash" : "db4ddb69a22c7f6f09669fe3c488c4f0"
     },
-    "status-minus-green"    : {
+    "status-minus-green"          : {
       "name" : "status-minus-green",
       "rule" : ".status-minus-green",
       "hash" : "9e5402f65601ced38a967d4e17b80f1c"
     },
-    "status-minus-red"      : {
+    "status-minus-red"            : {
       "name" : "status-minus-red",
       "rule" : ".status-minus-red",
       "hash" : "bcaf148bc842e398f08d8c01506bd5b6"
     },
-    "status-minus-white"    : {
+    "status-minus-white"          : {
       "name" : "status-minus-white",
       "rule" : ".status-minus-white",
       "hash" : "c5a3771452dda603fbaee87371044f5a"
     },
-    "status-oh-closed"      : {
+    "status-oh-closed"            : {
       "name" : "status-oh-closed",
       "rule" : ".status-oh-closed",
-      "hash" : "cbc6a0959ebad3e88cc3ac67743a7f3a"
+      "hash" : "fa5f2ef65de3e55c9251aebbed662f7a"
     },
-    "status-oh-closed-dark" : {
+    "status-oh-closed-dark"       : {
       "name" : "status-oh-closed-dark",
       "rule" : ".status-oh-closed-dark",
-      "hash" : "fbe32ade82b9b23352bd81c1735371a5"
+      "hash" : "926d6a4e9530a20cd9cd655b334e4f89"
     },
-    "status-oh-open"        : {
+    "status-oh-ok"                : {
+      "name" : "status-oh-ok",
+      "rule" : ".status-oh-ok",
+      "hash" : "0d1a2962da8fa12dd41a11316ba7f2eb"
+    },
+    "status-oh-ok-dark"           : {
+      "name" : "status-oh-ok-dark",
+      "rule" : ".status-oh-ok-dark",
+      "hash" : "2daa23d9b1b6c66daac93625dbd26dbc"
+    },
+    "status-oh-open"              : {
       "name" : "status-oh-open",
       "rule" : ".status-oh-open",
-      "hash" : "e86f83bc40e77664c91c834b27816576"
+      "hash" : "8d759391597ad3925abf2b4b4aaed537"
     },
-    "status-oh-open-green"  : {
+    "status-oh-open-green"        : {
       "name" : "status-oh-open-green",
       "rule" : ".status-oh-open-green",
-      "hash" : "01215f7ed2b6802049ac5c259231bbe7"
+      "hash" : "18fbeb777a9c5a7d46e0ba0760d3a557"
     },
-    "status-oh-open-red"    : {
+    "status-oh-open-red"          : {
       "name" : "status-oh-open-red",
       "rule" : ".status-oh-open-red",
-      "hash" : "fbac435cfbf49d05e7734fd6c786b0b7"
+      "hash" : "982610ba3d0bad1aaa11dcd3b593adbf"
     },
-    "status-open-blue"      : {
+    "status-open-blue"            : {
       "name" : "status-open-blue",
       "rule" : ".status-open-blue",
       "hash" : "9632bb52d5f24941202848c2e3d4488a"
     },
-    "status-open-dark"      : {
+    "status-open-dark"            : {
       "name" : "status-open-dark",
       "rule" : ".status-open-dark",
       "hash" : "ca38ff5fc8a327d96cd1bbc23043fbb4"
     },
-    "status-open-green"     : {
+    "status-open-green"           : {
       "name" : "status-open-green",
       "rule" : ".status-open-green",
       "hash" : "b4a2c17594a5301e2bd52a9df71819d3"
     },
-    "status-open-red"       : {
+    "status-open-red"             : {
       "name" : "status-open-red",
       "rule" : ".status-open-red",
       "hash" : "f92b1544978d691da6912f937df54273"
     },
-    "status-open-white"     : {
+    "status-open-white"           : {
       "name" : "status-open-white",
       "rule" : ".status-open-white",
       "hash" : "169dc0e8f36444ea30163181f9c88dc2"
     },
-    "status-policy-admin"   : {
+    "status-policy-admin"         : {
       "name" : "status-policy-admin",
       "rule" : ".status-policy-admin",
-      "hash" : "1df35b15bd20880a5d20c0a2da446472"
+      "hash" : "16c86a605a15a7a87f4d706c2122834c"
     },
-    "status-policy-all"     : {
+    "status-policy-admin-white"   : {
+      "name" : "status-policy-admin-white",
+      "rule" : ".status-policy-admin-white",
+      "hash" : "4b16ec5170bc30fb688f7e086e61a7f1"
+    },
+    "status-policy-all"           : {
       "name" : "status-policy-all",
       "rule" : ".status-policy-all",
-      "hash" : "ef0c0594968b04ed90ca8dc629a39e54"
+      "hash" : "7e8f9e8019ad7f668e51a097f0554ace"
     },
-    "status-policy-custom"  : {
+    "status-policy-all-white"     : {
+      "name" : "status-policy-all-white",
+      "rule" : ".status-policy-all-white",
+      "hash" : "24ed12bf6f58c21a82be125ace2ff0d0"
+    },
+    "status-policy-custom"        : {
       "name" : "status-policy-custom",
       "rule" : ".status-policy-custom",
-      "hash" : "a432adf61806705c54ad7e110e063829"
+      "hash" : "3cf516b1e50412ec95594b9866ab1c39"
     },
-    "status-policy-noone"   : {
+    "status-policy-custom-white"  : {
+      "name" : "status-policy-custom-white",
+      "rule" : ".status-policy-custom-white",
+      "hash" : "ff8b4cbe21f3b4254f343fffc170ef4b"
+    },
+    "status-policy-noone"         : {
       "name" : "status-policy-noone",
       "rule" : ".status-policy-noone",
-      "hash" : "23b4a85b15930c46fa409e95d26be2c4"
+      "hash" : "e3403fb78718660105d86029518cf43c"
     },
-    "status-policy-project" : {
+    "status-policy-noone-white"   : {
+      "name" : "status-policy-noone-white",
+      "rule" : ".status-policy-noone-white",
+      "hash" : "80fb9b153fec4d8136242c5ddc2d8e77"
+    },
+    "status-policy-project"       : {
       "name" : "status-policy-project",
       "rule" : ".status-policy-project",
-      "hash" : "bbc9e90f3353a357c5a39e703825504e"
+      "hash" : "2b77235f7057f3b29075d153345eacc6"
     },
-    "status-policy-public"  : {
+    "status-policy-project-white" : {
+      "name" : "status-policy-project-white",
+      "rule" : ".status-policy-project-white",
+      "hash" : "ac2b6f19edb8d6c40f0bcb3fd477a067"
+    },
+    "status-policy-public"        : {
       "name" : "status-policy-public",
       "rule" : ".status-policy-public",
-      "hash" : "4e6e9763dbb87dca73847e64ef0b87e6"
+      "hash" : "e7959890117091fb185816dbc888dfd2"
     },
-    "status-policy-unknown" : {
+    "status-policy-public-white"  : {
+      "name" : "status-policy-public-white",
+      "rule" : ".status-policy-public-white",
+      "hash" : "cf809ca49eefed5375c2ea081e721971"
+    },
+    "status-policy-unknown"       : {
       "name" : "status-policy-unknown",
       "rule" : ".status-policy-unknown",
-      "hash" : "f32c8a68221f735e443cb8b18b41ee0e"
+      "hash" : "0235fd879547c98ad658fa0375c386b6"
     },
-    "status-question-blue"  : {
+    "status-policy-unknown-white" : {
+      "name" : "status-policy-unknown-white",
+      "rule" : ".status-policy-unknown-white",
+      "hash" : "98985bfa005672c4b88feaf88cfa72bc"
+    },
+    "status-question-blue"        : {
       "name" : "status-question-blue",
       "rule" : ".status-question-blue",
       "hash" : "44ebbdbe059ca77ae4dc6a6b98de1ccf"
     },
-    "status-question-dark"  : {
+    "status-question-dark"        : {
       "name" : "status-question-dark",
       "rule" : ".status-question-dark",
       "hash" : "5fdd5f2b089f4481a39760a50224d8b2"
     },
-    "status-question-green" : {
+    "status-question-green"       : {
       "name" : "status-question-green",
       "rule" : ".status-question-green",
       "hash" : "326dfc6c1841410ce0f22d702c872c01"
     },
-    "status-question-red"   : {
+    "status-question-red"         : {
       "name" : "status-question-red",
       "rule" : ".status-question-red",
       "hash" : "18dbec41627f8c047c4e736f84dacb33"
     },
-    "status-question-white" : {
+    "status-question-white"       : {
       "name" : "status-question-white",
       "rule" : ".status-question-white",
       "hash" : "5e7f546f978d1d0545cad127ea3bcf80"
     },
-    "status-reject-blue"    : {
+    "status-reject-blue"          : {
       "name" : "status-reject-blue",
       "rule" : ".status-reject-blue",
       "hash" : "b0f51db6aa6ee85a24a1f4c13812d7ef"
     },
-    "status-reject-dark"    : {
+    "status-reject-dark"          : {
       "name" : "status-reject-dark",
       "rule" : ".status-reject-dark",
       "hash" : "9b28c36f6cbd6d5d5731b971193a151e"
     },
-    "status-reject-green"   : {
+    "status-reject-green"         : {
       "name" : "status-reject-green",
       "rule" : ".status-reject-green",
       "hash" : "fc171843df97bcdc6e4679682b3b31e4"
     },
-    "status-reject-red"     : {
+    "status-reject-red"           : {
       "name" : "status-reject-red",
       "rule" : ".status-reject-red",
       "hash" : "6de0dd95a92d33bda228aaa9ba6deee5"
     },
-    "status-reject-white"   : {
+    "status-reject-white"         : {
       "name" : "status-reject-white",
       "rule" : ".status-reject-white",
       "hash" : "e709a3fb3081a395900deaef0591066c"
     },
-    "status-right-blue"     : {
+    "status-right-blue"           : {
       "name" : "status-right-blue",
       "rule" : ".status-right-blue",
       "hash" : "ca1cae1d93486785ec50458ba3b19082"
     },
-    "status-right-dark"     : {
+    "status-right-dark"           : {
       "name" : "status-right-dark",
       "rule" : ".status-right-dark",
       "hash" : "fb6600fd1775a8a4fb85709dc4f6c28c"
     },
-    "status-right-green"    : {
+    "status-right-green"          : {
       "name" : "status-right-green",
       "rule" : ".status-right-green",
       "hash" : "9a52218e6c6d3968a05eb51865ed3cba"
     },
-    "status-right-red"      : {
+    "status-right-red"            : {
       "name" : "status-right-red",
       "rule" : ".status-right-red",
       "hash" : "06bd9747ce4cc87282b2fb207c525f0c"
     },
-    "status-right-white"    : {
+    "status-right-white"          : {
       "name" : "status-right-white",
       "rule" : ".status-right-white",
       "hash" : "be2ffb65a7799cd9a5e00c2334e378b2"
     },
-    "status-time-green"     : {
+    "status-time-green"           : {
       "name" : "status-time-green",
       "rule" : ".status-time-green",
       "hash" : "5cb4771e10aaf79ac490bc93bd029d8f"
     },
-    "status-time-orange"    : {
+    "status-time-orange"          : {
       "name" : "status-time-orange",
       "rule" : ".status-time-orange",
       "hash" : "aa48043beff2c8576402dbccbe4ad3e2"
     },
-    "status-time-red"       : {
+    "status-time-red"             : {
       "name" : "status-time-red",
       "rule" : ".status-time-red",
       "hash" : "e4dbf14f1ac16338b5e01aa04f2e267e"
     },
-    "status-time-yellow"    : {
+    "status-time-yellow"          : {
       "name" : "status-time-yellow",
       "rule" : ".status-time-yellow",
       "hash" : "79756bcf7f2401d7e3a97ff03b981dcb"
     },
-    "status-up-blue"        : {
+    "status-up-blue"              : {
       "name" : "status-up-blue",
       "rule" : ".status-up-blue",
       "hash" : "44fc24b3646e29c949b639157c315140"
     },
-    "status-up-dark"        : {
+    "status-up-dark"              : {
       "name" : "status-up-dark",
       "rule" : ".status-up-dark",
       "hash" : "459ed916291bfa905676ae0818bb2e1b"
     },
-    "status-up-green"       : {
+    "status-up-green"             : {
       "name" : "status-up-green",
       "rule" : ".status-up-green",
       "hash" : "6a682e48fc2f240b19bd175be52c9256"
     },
-    "status-up-red"         : {
+    "status-up-red"               : {
       "name" : "status-up-red",
       "rule" : ".status-up-red",
       "hash" : "0e38f6282e542470ecb68e55fad7eb76"
     },
-    "status-up-white"       : {
+    "status-up-white"             : {
       "name" : "status-up-white",
       "rule" : ".status-up-white",
       "hash" : "ce80e291bc905b2692ad9f3ece7cf206"
     },
-    "status-warning-blue"   : {
+    "status-warning-blue"         : {
       "name" : "status-warning-blue",
       "rule" : ".status-warning-blue",
       "hash" : "93f5e066a01a874adc2c120cca4bd1fc"
     },
-    "status-warning-dark"   : {
+    "status-warning-dark"         : {
       "name" : "status-warning-dark",
       "rule" : ".status-warning-dark",
       "hash" : "273a519299d7063710452d21c0bc6406"
     },
-    "status-warning-green"  : {
+    "status-warning-green"        : {
       "name" : "status-warning-green",
       "rule" : ".status-warning-green",
       "hash" : "991514e5b75509b27fd68d21755b9fa6"
     },
-    "status-warning-red"    : {
+    "status-warning-red"          : {
       "name" : "status-warning-red",
       "rule" : ".status-warning-red",
       "hash" : "b15f61f314cbda5486d3aa21990153ae"
     },
-    "status-warning-white"  : {
+    "status-warning-white"        : {
       "name" : "status-warning-white",
       "rule" : ".status-warning-white",
       "hash" : "62ff8f6bf696e58f71eb4e1c6fe9b2e1"
diff --git a/resources/sprite/status_1x/oh-closed-dark.png b/resources/sprite/status_1x/oh-closed-dark.png
index 2e2f77e06d..a0c94e1ccc 100644
Binary files a/resources/sprite/status_1x/oh-closed-dark.png and b/resources/sprite/status_1x/oh-closed-dark.png differ
diff --git a/resources/sprite/status_1x/oh-closed.png b/resources/sprite/status_1x/oh-closed.png
index 184aad95ea..830c8c354b 100644
Binary files a/resources/sprite/status_1x/oh-closed.png and b/resources/sprite/status_1x/oh-closed.png differ
diff --git a/resources/sprite/status_1x/oh-ok-dark.png b/resources/sprite/status_1x/oh-ok-dark.png
new file mode 100644
index 0000000000..ec25388c21
Binary files /dev/null and b/resources/sprite/status_1x/oh-ok-dark.png differ
diff --git a/resources/sprite/status_1x/oh-ok.png b/resources/sprite/status_1x/oh-ok.png
new file mode 100644
index 0000000000..d2ff96e2b6
Binary files /dev/null and b/resources/sprite/status_1x/oh-ok.png differ
diff --git a/resources/sprite/status_1x/oh-open-green.png b/resources/sprite/status_1x/oh-open-green.png
index 3e08ce4928..7b7c57a9fb 100644
Binary files a/resources/sprite/status_1x/oh-open-green.png and b/resources/sprite/status_1x/oh-open-green.png differ
diff --git a/resources/sprite/status_1x/oh-open-red.png b/resources/sprite/status_1x/oh-open-red.png
index f7b5443f8c..7bfa8ea0bb 100644
Binary files a/resources/sprite/status_1x/oh-open-red.png and b/resources/sprite/status_1x/oh-open-red.png differ
diff --git a/resources/sprite/status_1x/oh-open.png b/resources/sprite/status_1x/oh-open.png
index 9f1fc4b07b..8422beb768 100644
Binary files a/resources/sprite/status_1x/oh-open.png and b/resources/sprite/status_1x/oh-open.png differ
diff --git a/resources/sprite/status_1x/policy-admin-white.png b/resources/sprite/status_1x/policy-admin-white.png
new file mode 100644
index 0000000000..48b9624c0d
Binary files /dev/null and b/resources/sprite/status_1x/policy-admin-white.png differ
diff --git a/resources/sprite/status_1x/policy-admin.png b/resources/sprite/status_1x/policy-admin.png
index 888947e99b..fed46ed926 100644
Binary files a/resources/sprite/status_1x/policy-admin.png and b/resources/sprite/status_1x/policy-admin.png differ
diff --git a/resources/sprite/status_1x/policy-all-white.png b/resources/sprite/status_1x/policy-all-white.png
new file mode 100644
index 0000000000..e84b9efebc
Binary files /dev/null and b/resources/sprite/status_1x/policy-all-white.png differ
diff --git a/resources/sprite/status_1x/policy-all.png b/resources/sprite/status_1x/policy-all.png
index abbee8a84a..6a569525b7 100644
Binary files a/resources/sprite/status_1x/policy-all.png and b/resources/sprite/status_1x/policy-all.png differ
diff --git a/resources/sprite/status_1x/policy-custom-white.png b/resources/sprite/status_1x/policy-custom-white.png
new file mode 100644
index 0000000000..909c69ce86
Binary files /dev/null and b/resources/sprite/status_1x/policy-custom-white.png differ
diff --git a/resources/sprite/status_1x/policy-custom.png b/resources/sprite/status_1x/policy-custom.png
index 8831b81bb6..bc707edafe 100644
Binary files a/resources/sprite/status_1x/policy-custom.png and b/resources/sprite/status_1x/policy-custom.png differ
diff --git a/resources/sprite/status_1x/policy-noone-white.png b/resources/sprite/status_1x/policy-noone-white.png
new file mode 100644
index 0000000000..8e89ad3c46
Binary files /dev/null and b/resources/sprite/status_1x/policy-noone-white.png differ
diff --git a/resources/sprite/status_1x/policy-noone.png b/resources/sprite/status_1x/policy-noone.png
index bdfeb18685..e018714976 100644
Binary files a/resources/sprite/status_1x/policy-noone.png and b/resources/sprite/status_1x/policy-noone.png differ
diff --git a/resources/sprite/status_1x/policy-project-white.png b/resources/sprite/status_1x/policy-project-white.png
new file mode 100644
index 0000000000..4e39cc3ab5
Binary files /dev/null and b/resources/sprite/status_1x/policy-project-white.png differ
diff --git a/resources/sprite/status_1x/policy-project.png b/resources/sprite/status_1x/policy-project.png
index c8bd8a26b9..8d9582d3d0 100644
Binary files a/resources/sprite/status_1x/policy-project.png and b/resources/sprite/status_1x/policy-project.png differ
diff --git a/resources/sprite/status_1x/policy-public-white.png b/resources/sprite/status_1x/policy-public-white.png
new file mode 100644
index 0000000000..5bc2f31947
Binary files /dev/null and b/resources/sprite/status_1x/policy-public-white.png differ
diff --git a/resources/sprite/status_1x/policy-public.png b/resources/sprite/status_1x/policy-public.png
index 0abd52cef8..c54f47a7cd 100644
Binary files a/resources/sprite/status_1x/policy-public.png and b/resources/sprite/status_1x/policy-public.png differ
diff --git a/resources/sprite/status_1x/policy-unknown-white.png b/resources/sprite/status_1x/policy-unknown-white.png
new file mode 100644
index 0000000000..28398a7b47
Binary files /dev/null and b/resources/sprite/status_1x/policy-unknown-white.png differ
diff --git a/resources/sprite/status_1x/policy-unknown.png b/resources/sprite/status_1x/policy-unknown.png
index 91c035c46d..b415a2466f 100644
Binary files a/resources/sprite/status_1x/policy-unknown.png and b/resources/sprite/status_1x/policy-unknown.png differ
diff --git a/resources/sprite/status_2x/oh-closed-dark.png b/resources/sprite/status_2x/oh-closed-dark.png
index 151a010150..a88885ccff 100644
Binary files a/resources/sprite/status_2x/oh-closed-dark.png and b/resources/sprite/status_2x/oh-closed-dark.png differ
diff --git a/resources/sprite/status_2x/oh-closed.png b/resources/sprite/status_2x/oh-closed.png
index e4489b2ebf..7c57c4d1e8 100644
Binary files a/resources/sprite/status_2x/oh-closed.png and b/resources/sprite/status_2x/oh-closed.png differ
diff --git a/resources/sprite/status_2x/oh-ok-dark.png b/resources/sprite/status_2x/oh-ok-dark.png
new file mode 100644
index 0000000000..f7437a7e53
Binary files /dev/null and b/resources/sprite/status_2x/oh-ok-dark.png differ
diff --git a/resources/sprite/status_2x/oh-ok.png b/resources/sprite/status_2x/oh-ok.png
new file mode 100644
index 0000000000..01d3a24747
Binary files /dev/null and b/resources/sprite/status_2x/oh-ok.png differ
diff --git a/resources/sprite/status_2x/oh-open-green.png b/resources/sprite/status_2x/oh-open-green.png
index 74dd00735b..2eb2b250a2 100644
Binary files a/resources/sprite/status_2x/oh-open-green.png and b/resources/sprite/status_2x/oh-open-green.png differ
diff --git a/resources/sprite/status_2x/oh-open-red.png b/resources/sprite/status_2x/oh-open-red.png
index a060dc0c88..198a3ff18a 100644
Binary files a/resources/sprite/status_2x/oh-open-red.png and b/resources/sprite/status_2x/oh-open-red.png differ
diff --git a/resources/sprite/status_2x/oh-open.png b/resources/sprite/status_2x/oh-open.png
index 5a90b94ca3..50786bcd21 100644
Binary files a/resources/sprite/status_2x/oh-open.png and b/resources/sprite/status_2x/oh-open.png differ
diff --git a/resources/sprite/status_2x/policy-admin-white.png b/resources/sprite/status_2x/policy-admin-white.png
new file mode 100644
index 0000000000..c09d9c305f
Binary files /dev/null and b/resources/sprite/status_2x/policy-admin-white.png differ
diff --git a/resources/sprite/status_2x/policy-admin.png b/resources/sprite/status_2x/policy-admin.png
index 3e877ed56c..8421b277dc 100644
Binary files a/resources/sprite/status_2x/policy-admin.png and b/resources/sprite/status_2x/policy-admin.png differ
diff --git a/resources/sprite/status_2x/policy-all-white.png b/resources/sprite/status_2x/policy-all-white.png
new file mode 100644
index 0000000000..fe00c57c2a
Binary files /dev/null and b/resources/sprite/status_2x/policy-all-white.png differ
diff --git a/resources/sprite/status_2x/policy-all.png b/resources/sprite/status_2x/policy-all.png
index 6fb4a12178..42053e8528 100644
Binary files a/resources/sprite/status_2x/policy-all.png and b/resources/sprite/status_2x/policy-all.png differ
diff --git a/resources/sprite/status_2x/policy-custom-white.png b/resources/sprite/status_2x/policy-custom-white.png
new file mode 100644
index 0000000000..450137cb61
Binary files /dev/null and b/resources/sprite/status_2x/policy-custom-white.png differ
diff --git a/resources/sprite/status_2x/policy-custom.png b/resources/sprite/status_2x/policy-custom.png
index 8379d7f708..64a67fe0a8 100644
Binary files a/resources/sprite/status_2x/policy-custom.png and b/resources/sprite/status_2x/policy-custom.png differ
diff --git a/resources/sprite/status_2x/policy-noone-white.png b/resources/sprite/status_2x/policy-noone-white.png
new file mode 100644
index 0000000000..219a67bbd3
Binary files /dev/null and b/resources/sprite/status_2x/policy-noone-white.png differ
diff --git a/resources/sprite/status_2x/policy-project-white.png b/resources/sprite/status_2x/policy-project-white.png
new file mode 100644
index 0000000000..8289755fdb
Binary files /dev/null and b/resources/sprite/status_2x/policy-project-white.png differ
diff --git a/resources/sprite/status_2x/policy-public-white.png b/resources/sprite/status_2x/policy-public-white.png
new file mode 100644
index 0000000000..719c0fd44f
Binary files /dev/null and b/resources/sprite/status_2x/policy-public-white.png differ
diff --git a/resources/sprite/status_2x/policy-unknown-white.png b/resources/sprite/status_2x/policy-unknown-white.png
new file mode 100644
index 0000000000..a3f73a38d1
Binary files /dev/null and b/resources/sprite/status_2x/policy-unknown-white.png differ
diff --git a/resources/sprite/status_2x/policy-unknown.png b/resources/sprite/status_2x/policy-unknown.png
index 349d5a5f5b..d6df5f1a1a 100644
Binary files a/resources/sprite/status_2x/policy-unknown.png and b/resources/sprite/status_2x/policy-unknown.png differ
diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 97d50ffc7d..18caa1c6ad 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -716,15 +716,15 @@ celerity_register_resource_map(array(
   ),
   '/rsrc/image/sprite-status-X2.png' =>
   array(
-    'hash' => 'ba4921c45c4de3e624e549bef9465fd9',
-    'uri' => '/res/ba4921c4/rsrc/image/sprite-status-X2.png',
+    'hash' => '25c79d119ef91268d9d85f5515fd1b5a',
+    'uri' => '/res/25c79d11/rsrc/image/sprite-status-X2.png',
     'disk' => '/rsrc/image/sprite-status-X2.png',
     'type' => 'png',
   ),
   '/rsrc/image/sprite-status.png' =>
   array(
-    'hash' => '438db33426faa98f938b1ebabd196763',
-    'uri' => '/res/438db334/rsrc/image/sprite-status.png',
+    'hash' => '0c5c2ec1d96f7c9720971919a934e0b8',
+    'uri' => '/res/0c5c2ec1/rsrc/image/sprite-status.png',
     'disk' => '/rsrc/image/sprite-status.png',
     'type' => 'png',
   ),
@@ -4236,7 +4236,7 @@ celerity_register_resource_map(array(
   ),
   'sprite-status-css' =>
   array(
-    'uri' => '/res/f8d8766d/rsrc/css/sprite-status.css',
+    'uri' => '/res/8e710031/rsrc/css/sprite-status.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -4273,7 +4273,7 @@ celerity_register_resource_map(array(
 ), array(
   'packages' =>
   array(
-    '30de5267' =>
+    'deb31815' =>
     array(
       'name' => 'core.pkg.css',
       'symbols' =>
@@ -4322,7 +4322,7 @@ celerity_register_resource_map(array(
         41 => 'phabricator-tag-view-css',
         42 => 'phui-list-view-css',
       ),
-      'uri' => '/res/pkg/30de5267/core.pkg.css',
+      'uri' => '/res/pkg/deb31815/core.pkg.css',
       'type' => 'css',
     ),
     '6041c6c8' =>
@@ -4514,15 +4514,15 @@ celerity_register_resource_map(array(
   ),
   'reverse' =>
   array(
-    'aphront-dialog-view-css' => '30de5267',
-    'aphront-error-view-css' => '30de5267',
-    'aphront-list-filter-view-css' => '30de5267',
-    'aphront-pager-view-css' => '30de5267',
-    'aphront-panel-view-css' => '30de5267',
-    'aphront-table-view-css' => '30de5267',
-    'aphront-tokenizer-control-css' => '30de5267',
-    'aphront-tooltip-css' => '30de5267',
-    'aphront-typeahead-control-css' => '30de5267',
+    'aphront-dialog-view-css' => 'deb31815',
+    'aphront-error-view-css' => 'deb31815',
+    'aphront-list-filter-view-css' => 'deb31815',
+    'aphront-pager-view-css' => 'deb31815',
+    'aphront-panel-view-css' => 'deb31815',
+    'aphront-table-view-css' => 'deb31815',
+    'aphront-tokenizer-control-css' => 'deb31815',
+    'aphront-tooltip-css' => 'deb31815',
+    'aphront-typeahead-control-css' => 'deb31815',
     'differential-changeset-view-css' => '7cd7e387',
     'differential-core-view-css' => '7cd7e387',
     'differential-inline-comment-editor' => '5e9e5c4e',
@@ -4536,7 +4536,7 @@ celerity_register_resource_map(array(
     'differential-table-of-contents-css' => '7cd7e387',
     'diffusion-commit-view-css' => '270f4eb4',
     'diffusion-icons-css' => '270f4eb4',
-    'global-drag-and-drop-css' => '30de5267',
+    'global-drag-and-drop-css' => 'deb31815',
     'inline-comment-summary-css' => '7cd7e387',
     'javelin-aphlict' => '6041c6c8',
     'javelin-behavior' => '3e3be199',
@@ -4611,56 +4611,56 @@ celerity_register_resource_map(array(
     'javelin-util' => '3e3be199',
     'javelin-vector' => '3e3be199',
     'javelin-workflow' => '3e3be199',
-    'lightbox-attachment-css' => '30de5267',
+    'lightbox-attachment-css' => 'deb31815',
     'maniphest-task-summary-css' => '49898640',
-    'phabricator-action-list-view-css' => '30de5267',
-    'phabricator-application-launch-view-css' => '30de5267',
+    'phabricator-action-list-view-css' => 'deb31815',
+    'phabricator-application-launch-view-css' => 'deb31815',
     'phabricator-busy' => '6041c6c8',
     'phabricator-content-source-view-css' => '7cd7e387',
-    'phabricator-core-css' => '30de5267',
-    'phabricator-crumbs-view-css' => '30de5267',
+    'phabricator-core-css' => 'deb31815',
+    'phabricator-crumbs-view-css' => 'deb31815',
     'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
     'phabricator-dropdown-menu' => '6041c6c8',
     'phabricator-file-upload' => '6041c6c8',
-    'phabricator-filetree-view-css' => '30de5267',
-    'phabricator-flag-css' => '30de5267',
+    'phabricator-filetree-view-css' => 'deb31815',
+    'phabricator-flag-css' => 'deb31815',
     'phabricator-hovercard' => '6041c6c8',
-    'phabricator-jump-nav' => '30de5267',
+    'phabricator-jump-nav' => 'deb31815',
     'phabricator-keyboard-shortcut' => '6041c6c8',
     'phabricator-keyboard-shortcut-manager' => '6041c6c8',
-    'phabricator-main-menu-view' => '30de5267',
+    'phabricator-main-menu-view' => 'deb31815',
     'phabricator-menu-item' => '6041c6c8',
-    'phabricator-nav-view-css' => '30de5267',
+    'phabricator-nav-view-css' => 'deb31815',
     'phabricator-notification' => '6041c6c8',
-    'phabricator-notification-css' => '30de5267',
-    'phabricator-notification-menu-css' => '30de5267',
+    'phabricator-notification-css' => 'deb31815',
+    'phabricator-notification-menu-css' => 'deb31815',
     'phabricator-object-selector-css' => '7cd7e387',
     'phabricator-phtize' => '6041c6c8',
     'phabricator-prefab' => '6041c6c8',
     'phabricator-project-tag-css' => '49898640',
-    'phabricator-remarkup-css' => '30de5267',
+    'phabricator-remarkup-css' => 'deb31815',
     'phabricator-shaped-request' => '5e9e5c4e',
-    'phabricator-side-menu-view-css' => '30de5267',
-    'phabricator-standard-page-view' => '30de5267',
-    'phabricator-tag-view-css' => '30de5267',
+    'phabricator-side-menu-view-css' => 'deb31815',
+    'phabricator-standard-page-view' => 'deb31815',
+    'phabricator-tag-view-css' => 'deb31815',
     'phabricator-textareautils' => '6041c6c8',
     'phabricator-tooltip' => '6041c6c8',
-    'phabricator-transaction-view-css' => '30de5267',
-    'phabricator-zindex-css' => '30de5267',
-    'phui-button-css' => '30de5267',
-    'phui-form-css' => '30de5267',
-    'phui-form-view-css' => '30de5267',
-    'phui-header-view-css' => '30de5267',
-    'phui-icon-view-css' => '30de5267',
-    'phui-list-view-css' => '30de5267',
-    'phui-object-item-list-view-css' => '30de5267',
-    'phui-property-list-view-css' => '30de5267',
-    'phui-spacing-css' => '30de5267',
-    'sprite-apps-large-css' => '30de5267',
-    'sprite-gradient-css' => '30de5267',
-    'sprite-icons-css' => '30de5267',
-    'sprite-menu-css' => '30de5267',
-    'sprite-status-css' => '30de5267',
-    'syntax-highlighting-css' => '30de5267',
+    'phabricator-transaction-view-css' => 'deb31815',
+    'phabricator-zindex-css' => 'deb31815',
+    'phui-button-css' => 'deb31815',
+    'phui-form-css' => 'deb31815',
+    'phui-form-view-css' => 'deb31815',
+    'phui-header-view-css' => 'deb31815',
+    'phui-icon-view-css' => 'deb31815',
+    'phui-list-view-css' => 'deb31815',
+    'phui-object-item-list-view-css' => 'deb31815',
+    'phui-property-list-view-css' => 'deb31815',
+    'phui-spacing-css' => 'deb31815',
+    'sprite-apps-large-css' => 'deb31815',
+    'sprite-gradient-css' => 'deb31815',
+    'sprite-icons-css' => 'deb31815',
+    'sprite-menu-css' => 'deb31815',
+    'sprite-status-css' => 'deb31815',
+    'syntax-highlighting-css' => 'deb31815',
   ),
 ));
diff --git a/webroot/rsrc/css/sprite-status.css b/webroot/rsrc/css/sprite-status.css
index 9d2098aa63..d203ac261d 100644
--- a/webroot/rsrc/css/sprite-status.css
+++ b/webroot/rsrc/css/sprite-status.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-status {
     background-image: url(/rsrc/image/sprite-status-X2.png);
-    background-size: 135px 135px;
+    background-size: 135px 150px;
   }
 }
 
@@ -146,178 +146,214 @@ only screen and (-webkit-min-device-pixel-ratio: 1.5) {
   background-position: -60px -45px;
 }
 
-.status-oh-open-green {
+.status-oh-ok-dark {
   background-position: -75px -45px;
 }
 
-.status-oh-open-red {
+.status-oh-ok {
   background-position: -90px -45px;
 }
 
-.status-oh-open {
+.status-oh-open-green {
   background-position: -105px -45px;
 }
 
-.status-open-blue {
+.status-oh-open-red {
   background-position: -120px -45px;
 }
 
-.status-open-dark {
+.status-oh-open {
   background-position: 0px -60px;
 }
 
-.status-open-green {
+.status-open-blue {
   background-position: -15px -60px;
 }
 
-.status-open-red {
+.status-open-dark {
   background-position: -30px -60px;
 }
 
-.status-open-white {
+.status-open-green {
   background-position: -45px -60px;
 }
 
-.status-policy-admin {
+.status-open-red {
   background-position: -60px -60px;
 }
 
-.status-policy-all {
+.status-open-white {
   background-position: -75px -60px;
 }
 
-.status-policy-custom {
+.status-policy-admin-white {
   background-position: -90px -60px;
 }
 
-.status-policy-noone {
+.status-policy-admin {
   background-position: -105px -60px;
 }
 
-.status-policy-project {
+.status-policy-all-white {
+  background-position: -120px -60px;
+}
+
+.status-policy-all {
   background-position: 0px -75px;
 }
 
-.status-policy-public {
+.status-policy-custom-white {
   background-position: -15px -75px;
 }
 
-.status-policy-unknown {
+.status-policy-custom {
   background-position: -30px -75px;
 }
 
-.status-question-blue {
+.status-policy-noone-white {
   background-position: -45px -75px;
 }
 
-.status-question-dark {
+.status-policy-noone {
   background-position: -60px -75px;
 }
 
-.status-question-green {
+.status-policy-project-white {
   background-position: -75px -75px;
 }
 
-.status-question-red {
+.status-policy-project {
   background-position: -90px -75px;
 }
 
-.status-question-white {
+.status-policy-public-white {
   background-position: -105px -75px;
 }
 
-.status-reject-blue {
+.status-policy-public {
+  background-position: -120px -75px;
+}
+
+.status-policy-unknown-white {
   background-position: 0px -90px;
 }
 
-.status-reject-dark {
+.status-policy-unknown {
   background-position: -15px -90px;
 }
 
-.status-reject-green {
+.status-question-blue {
   background-position: -30px -90px;
 }
 
-.status-reject-red {
+.status-question-dark {
   background-position: -45px -90px;
 }
 
-.status-reject-white {
+.status-question-green {
   background-position: -60px -90px;
 }
 
-.status-right-blue {
+.status-question-red {
   background-position: -75px -90px;
 }
 
-.status-right-dark {
+.status-question-white {
   background-position: -90px -90px;
 }
 
-.status-right-green {
+.status-reject-blue {
   background-position: -105px -90px;
 }
 
-.status-right-red {
+.status-reject-dark {
+  background-position: -120px -90px;
+}
+
+.status-reject-green {
   background-position: 0px -105px;
 }
 
-.status-right-white {
+.status-reject-red {
   background-position: -15px -105px;
 }
 
-.status-time-green {
+.status-reject-white {
   background-position: -30px -105px;
 }
 
-.status-time-orange {
+.status-right-blue {
   background-position: -45px -105px;
 }
 
-.status-time-red {
+.status-right-dark {
   background-position: -60px -105px;
 }
 
-.status-time-yellow {
+.status-right-green {
   background-position: -75px -105px;
 }
 
-.status-up-blue {
+.status-right-red {
   background-position: -90px -105px;
 }
 
-.status-up-dark {
+.status-right-white {
   background-position: -105px -105px;
 }
 
-.status-up-green {
+.status-time-green {
+  background-position: -120px -105px;
+}
+
+.status-time-orange {
   background-position: 0px -120px;
 }
 
-.status-up-red {
+.status-time-red {
   background-position: -15px -120px;
 }
 
-.status-up-white {
+.status-time-yellow {
   background-position: -30px -120px;
 }
 
-.status-warning-blue {
+.status-up-blue {
   background-position: -45px -120px;
 }
 
-.status-warning-dark {
+.status-up-dark {
   background-position: -60px -120px;
 }
 
-.status-warning-green {
+.status-up-green {
   background-position: -75px -120px;
 }
 
-.status-warning-red {
+.status-up-red {
   background-position: -90px -120px;
 }
 
-.status-warning-white {
+.status-up-white {
   background-position: -105px -120px;
 }
+
+.status-warning-blue {
+  background-position: -120px -120px;
+}
+
+.status-warning-dark {
+  background-position: 0px -135px;
+}
+
+.status-warning-green {
+  background-position: -15px -135px;
+}
+
+.status-warning-red {
+  background-position: -30px -135px;
+}
+
+.status-warning-white {
+  background-position: -45px -135px;
+}
diff --git a/webroot/rsrc/image/sprite-status-X2.png b/webroot/rsrc/image/sprite-status-X2.png
index dccec5a16e..dc96aa6259 100644
Binary files a/webroot/rsrc/image/sprite-status-X2.png and b/webroot/rsrc/image/sprite-status-X2.png differ
diff --git a/webroot/rsrc/image/sprite-status.png b/webroot/rsrc/image/sprite-status.png
index 235cc77e64..b89864ffc1 100644
Binary files a/webroot/rsrc/image/sprite-status.png and b/webroot/rsrc/image/sprite-status.png differ