diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index bcfae6b7e6..1497f7ce7f 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@ return array(
   'names' => array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => 'd556e3e2',
+    'core.pkg.css' => '2c6a5ba4',
     'core.pkg.js' => '21d34805',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '7d4cfa59',
@@ -140,14 +140,14 @@ return array(
     'rsrc/css/phui/phui-basic-nav-view.css' => 'a0705f53',
     'rsrc/css/phui/phui-big-info-view.css' => 'bd903741',
     'rsrc/css/phui/phui-box.css' => '269cbc99',
-    'rsrc/css/phui/phui-button.css' => '8d23596a',
+    'rsrc/css/phui/phui-button.css' => 'ccd8c6c5',
     'rsrc/css/phui/phui-chart.css' => '6bf6f78e',
     'rsrc/css/phui/phui-cms.css' => '504b4b23',
     'rsrc/css/phui/phui-comment-form.css' => '57af2e14',
     'rsrc/css/phui/phui-comment-panel.css' => 'f50152ad',
     'rsrc/css/phui/phui-crumbs-view.css' => '6ece3bbb',
     'rsrc/css/phui/phui-curtain-view.css' => '55dd0e59',
-    'rsrc/css/phui/phui-document-pro.css' => '62c4dcbf',
+    'rsrc/css/phui/phui-document-pro.css' => '58199f99',
     'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf',
     'rsrc/css/phui/phui-document.css' => 'c32e8dec',
     'rsrc/css/phui/phui-feed-story.css' => '44a9c8e9',
@@ -838,7 +838,7 @@ return array(
     'phui-basic-nav-view-css' => 'a0705f53',
     'phui-big-info-view-css' => 'bd903741',
     'phui-box-css' => '269cbc99',
-    'phui-button-css' => '8d23596a',
+    'phui-button-css' => 'ccd8c6c5',
     'phui-calendar-css' => '477acfaa',
     'phui-calendar-day-css' => '572b1893',
     'phui-calendar-list-css' => '576be600',
@@ -851,7 +851,7 @@ return array(
     'phui-curtain-view-css' => '55dd0e59',
     'phui-document-summary-view-css' => '9ca48bdf',
     'phui-document-view-css' => 'c32e8dec',
-    'phui-document-view-pro-css' => '62c4dcbf',
+    'phui-document-view-pro-css' => '58199f99',
     'phui-feed-story-css' => '44a9c8e9',
     'phui-font-icon-base-css' => '870a7360',
     'phui-fontkit-css' => '1320ed01',
diff --git a/src/applications/uiexample/examples/PHUIButtonExample.php b/src/applications/uiexample/examples/PHUIButtonExample.php
index ae699eb7a3..900125cbc2 100644
--- a/src/applications/uiexample/examples/PHUIButtonExample.php
+++ b/src/applications/uiexample/examples/PHUIButtonExample.php
@@ -131,9 +131,6 @@ final class PHUIButtonExample extends PhabricatorUIExample {
     );
     $colors = array(
       PHUIButtonView::SIMPLE,
-      PHUIButtonView::SIMPLE_YELLOW,
-      PHUIButtonView::SIMPLE_GREY,
-      PHUIButtonView::SIMPLE_BLUE,
     );
     $column = array();
     foreach ($colors as $color) {
diff --git a/src/view/phui/PHUIButtonView.php b/src/view/phui/PHUIButtonView.php
index ee6975357c..ac3f8aabe0 100644
--- a/src/view/phui/PHUIButtonView.php
+++ b/src/view/phui/PHUIButtonView.php
@@ -5,11 +5,7 @@ final class PHUIButtonView extends AphrontTagView {
   const GREEN = 'green';
   const GREY = 'grey';
   const DISABLED = 'disabled';
-
   const SIMPLE = 'simple';
-  const SIMPLE_YELLOW = 'simple simple-yellow';
-  const SIMPLE_GREY = 'simple simple-grey';
-  const SIMPLE_BLUE = 'simple simple-blue';
 
   const SMALL = 'small';
   const BIG = 'big';
diff --git a/webroot/rsrc/css/phui/phui-button.css b/webroot/rsrc/css/phui/phui-button.css
index 09f2233a6c..e9d446a0ac 100644
--- a/webroot/rsrc/css/phui/phui-button.css
+++ b/webroot/rsrc/css/phui/phui-button.css
@@ -91,8 +91,8 @@ input[type="submit"].simple,
 a.simple,
 a.simple:visited {
   background: #fff;
-  color: {$blue};
-  border: 1px solid {$blue};
+  color: {$bluetext};
+  border: 1px solid {$lightblueborder};
 }
 
 a.simple.current {
@@ -103,7 +103,7 @@ button.simple .phui-icon-view,
 input[type="submit"].simple .phui-icon-view,
 a.simple .phui-icon-view,
 a.simple:visited .phui-icon-view {
-  color: {$blue};
+  color: {$lightbluetext};
 }
 
 a.disabled,
@@ -145,10 +145,10 @@ button.green:hover {
 
 a.button.simple:hover,
 button.simple:hover {
-  background-color: {$blue};
+  background-color: {$lightblue};
   background-image: linear-gradient(to bottom, {$blue}, {$blue});
   color: #fff;
-  transition: 0.1s;
+  transition: 0s;
 }
 
 a.button.simple:hover .phui-icon-view,
diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css
index 0aef43ed90..8ece71db64 100644
--- a/webroot/rsrc/css/phui/phui-document-pro.css
+++ b/webroot/rsrc/css/phui/phui-document-pro.css
@@ -75,7 +75,8 @@ a.button.phui-document-toc {
   display: inline-block;
   height: 16px;
   width: 20px;
-  padding: 3px 8px 4px 8px;
+  padding-left: 8px;
+  padding-right: 8px;
 }
 
 .phui-document-view-pro .phui-document-toc-list {
@@ -105,6 +106,7 @@ a.button.phui-document-toc {
 
 .phui-document-toc-open .phui-document-toc {
   background-color: {$blue};
+  border-color: {$blue};
 }
 
 .phui-document-toc-open .phui-document-toc .phui-icon-view {