diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -9,7 +9,7 @@
   'names' => array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
-    'core.pkg.css' => '5284a0e0',
+    'core.pkg.css' => '1a935531',
     'core.pkg.js' => '1475bd91',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => '1ccbf3a9',
@@ -125,8 +125,8 @@
     'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
     'rsrc/css/layout/phabricator-source-code-view.css' => '4383192f',
     'rsrc/css/phui/button/phui-button-bar.css' => '39fe680c',
-    'rsrc/css/phui/button/phui-button-simple.css' => '081cfeea',
-    'rsrc/css/phui/button/phui-button.css' => '9f13ddcc',
+    'rsrc/css/phui/button/phui-button-simple.css' => '8e1baf68',
+    'rsrc/css/phui/button/phui-button.css' => '022581b4',
     'rsrc/css/phui/calendar/phui-calendar-day.css' => '572b1893',
     'rsrc/css/phui/calendar/phui-calendar-list.css' => '576be600',
     'rsrc/css/phui/calendar/phui-calendar-month.css' => '8e10e92c',
@@ -526,7 +526,7 @@
     'rsrc/js/phuix/PHUIXActionListView.js' => 'b5c256b8',
     'rsrc/js/phuix/PHUIXActionView.js' => 'b3465b9b',
     'rsrc/js/phuix/PHUIXAutocomplete.js' => 'f6699267',
-    'rsrc/js/phuix/PHUIXButtonView.js' => 'b3c515be',
+    'rsrc/js/phuix/PHUIXButtonView.js' => 'a37126bd',
     'rsrc/js/phuix/PHUIXDropdownMenu.js' => '8018ee50',
     'rsrc/js/phuix/PHUIXExample.js' => '68af71ca',
     'rsrc/js/phuix/PHUIXFormControl.js' => '83e03671',
@@ -820,8 +820,8 @@
     'phui-big-info-view-css' => 'bd903741',
     'phui-box-css' => '269cbc99',
     'phui-button-bar-css' => '39fe680c',
-    'phui-button-css' => '9f13ddcc',
-    'phui-button-simple-css' => '081cfeea',
+    'phui-button-css' => '022581b4',
+    'phui-button-simple-css' => '8e1baf68',
     'phui-calendar-css' => '477acfaa',
     'phui-calendar-day-css' => '572b1893',
     'phui-calendar-list-css' => '576be600',
@@ -878,7 +878,7 @@
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => 'b3465b9b',
     'phuix-autocomplete' => 'f6699267',
-    'phuix-button-view' => 'b3c515be',
+    'phuix-button-view' => 'a37126bd',
     'phuix-dropdown-menu' => '8018ee50',
     'phuix-form-control-view' => '83e03671',
     'phuix-icon-view' => 'bff6884b',
@@ -936,9 +936,6 @@
       'javelin-stratcom',
       'javelin-workflow',
     ),
-    '081cfeea' => array(
-      'phui-button-css',
-    ),
     '0825c27a' => array(
       'javelin-behavior',
       'javelin-dom',
@@ -1561,6 +1558,9 @@
       'javelin-stratcom',
       'javelin-install',
     ),
+    '8e1baf68' => array(
+      'phui-button-css',
+    ),
     '8ff5e24c' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1651,6 +1651,10 @@
       'javelin-util',
       'phabricator-keyboard-shortcut',
     ),
+    'a37126bd' => array(
+      'javelin-install',
+      'javelin-dom',
+    ),
     'a3a63478' => array(
       'phui-workcard-view-css',
     ),
@@ -1768,10 +1772,6 @@
       'javelin-behavior',
       'phabricator-prefab',
     ),
-    'b3c515be' => array(
-      'javelin-install',
-      'javelin-dom',
-    ),
     'b3e7d692' => array(
       'javelin-install',
     ),
diff --git a/src/applications/almanac/controller/AlmanacController.php b/src/applications/almanac/controller/AlmanacController.php
--- a/src/applications/almanac/controller/AlmanacController.php
+++ b/src/applications/almanac/controller/AlmanacController.php
@@ -84,8 +84,8 @@
         'a',
         array(
           'class' => ($can_edit
-            ? 'button grey small'
-            : 'button grey small disabled'),
+            ? 'button button-grey small'
+            : 'button button-grey small disabled'),
           'sigil' => 'workflow',
           'href' => $delete_uri,
         ),
diff --git a/src/applications/almanac/view/AlmanacBindingTableView.php b/src/applications/almanac/view/AlmanacBindingTableView.php
--- a/src/applications/almanac/view/AlmanacBindingTableView.php
+++ b/src/applications/almanac/view/AlmanacBindingTableView.php
@@ -77,7 +77,7 @@
         phutil_tag(
           'a',
           array(
-            'class' => 'small grey button',
+            'class' => 'small button button-grey',
             'href' => '/almanac/binding/'.$binding->getID().'/',
           ),
           pht('Details')),
diff --git a/src/applications/almanac/view/AlmanacInterfaceTableView.php b/src/applications/almanac/view/AlmanacInterfaceTableView.php
--- a/src/applications/almanac/view/AlmanacInterfaceTableView.php
+++ b/src/applications/almanac/view/AlmanacInterfaceTableView.php
@@ -30,9 +30,9 @@
     $can_edit = $this->getCanEdit();
 
     if ($can_edit) {
-      $button_class = 'small grey button';
+      $button_class = 'small button button-grey';
     } else {
-      $button_class = 'small grey button disabled';
+      $button_class = 'small button button-grey disabled';
     }
 
     $handles = $viewer->loadHandles(mpull($interfaces, 'getNetworkPHID'));
diff --git a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
--- a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
+++ b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
@@ -60,7 +60,7 @@
         javelin_tag(
           'a',
           array(
-            'class' => 'button small grey',
+            'class' => 'button small button-grey',
             'href' => '/conduit/token/terminate/'.$token->getID().'/',
             'sigil' => 'workflow',
           ),
diff --git a/src/applications/config/view/PhabricatorSetupIssueView.php b/src/applications/config/view/PhabricatorSetupIssueView.php
--- a/src/applications/config/view/PhabricatorSetupIssueView.php
+++ b/src/applications/config/view/PhabricatorSetupIssueView.php
@@ -129,7 +129,7 @@
           array(
             'href' => '/config/unignore/'.$issue->getIssueKey().'/',
             'sigil' => 'workflow',
-            'class' => 'button grey',
+            'class' => 'button button-grey',
           ),
           pht('Unignore Setup Issue'));
       } else {
@@ -138,7 +138,7 @@
           array(
             'href' => '/config/ignore/'.$issue->getIssueKey().'/',
             'sigil' => 'workflow',
-            'class' => 'button grey',
+            'class' => 'button button-grey',
           ),
           pht('Ignore Setup Issue'));
       }
@@ -147,7 +147,7 @@
         'a',
         array(
           'href' => '/config/issue/'.$issue->getIssueKey().'/',
-          'class' => 'button grey',
+          'class' => 'button button-grey',
           'style' => 'float: right',
         ),
         pht('Reload Page'));
diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -140,7 +140,7 @@
           'button',
           array(
             'type' => 'SUBMIT',
-            'class' => 'button green mlr',
+            'class' => 'button button-green mlr',
           ),
           pht('Join Room'));
 
diff --git a/src/applications/conpherence/view/ConpherenceDurableColumnView.php b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
--- a/src/applications/conpherence/view/ConpherenceDurableColumnView.php
+++ b/src/applications/conpherence/view/ConpherenceDurableColumnView.php
@@ -404,7 +404,7 @@
           'a',
           array(
             'href' => '/conpherence/search/',
-            'class' => 'button grey',
+            'class' => 'button button-grey',
           ),
           pht('Find Rooms')),
       );
diff --git a/src/applications/console/plugin/DarkConsoleServicesPlugin.php b/src/applications/console/plugin/DarkConsoleServicesPlugin.php
--- a/src/applications/console/plugin/DarkConsoleServicesPlugin.php
+++ b/src/applications/console/plugin/DarkConsoleServicesPlugin.php
@@ -170,7 +170,8 @@
           'a',
           array(
             'href'  => $data['analyzeURI'],
-            'class' => $data['didAnalyze'] ? 'disabled button' : 'green button',
+            'class' => $data['didAnalyze'] ?
+              'disabled button' : 'button button-green',
           ),
           pht('Analyze Query Plans')),
         phutil_tag('h1', array(), pht('Calls to External Services')),
diff --git a/src/applications/console/plugin/DarkConsoleXHProfPlugin.php b/src/applications/console/plugin/DarkConsoleXHProfPlugin.php
--- a/src/applications/console/plugin/DarkConsoleXHProfPlugin.php
+++ b/src/applications/console/plugin/DarkConsoleXHProfPlugin.php
@@ -67,7 +67,7 @@
           'a',
           array(
             'href'  => $profile_uri,
-            'class' => $run ? 'disabled button' : 'green button',
+            'class' => $run ? 'disabled button' : 'button button-green',
           ),
           pht('Profile Page')),
         phutil_tag('h1', array(), pht('XHProf Profiler')),
diff --git a/src/applications/daemon/view/PhabricatorDaemonTasksTableView.php b/src/applications/daemon/view/PhabricatorDaemonTasksTableView.php
--- a/src/applications/daemon/view/PhabricatorDaemonTasksTableView.php
+++ b/src/applications/daemon/view/PhabricatorDaemonTasksTableView.php
@@ -41,7 +41,7 @@
           'a',
           array(
             'href' => '/daemon/task/'.$task->getID().'/',
-            'class' => 'button small grey',
+            'class' => 'button small button-grey',
           ),
           pht('View Task')),
       );
diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
@@ -156,7 +156,7 @@
         phutil_tag(
           'a',
           array(
-            'class' => 'button grey',
+            'class' => 'button button-grey',
             'href' => $request_uri
               ->alter('large', 'true')
               ->setFragment('toc'),
diff --git a/src/applications/differential/view/DifferentialChangesetListView.php b/src/applications/differential/view/DifferentialChangesetListView.php
--- a/src/applications/differential/view/DifferentialChangesetListView.php
+++ b/src/applications/differential/view/DifferentialChangesetListView.php
@@ -174,7 +174,7 @@
           $load = javelin_tag(
             'a',
             array(
-              'class' => 'button grey',
+              'class' => 'button button-grey',
               'href' => '#'.$uniq_id,
               'sigil' => 'differential-load',
               'meta' => array(
diff --git a/src/applications/files/controller/PhabricatorFileTransformListController.php b/src/applications/files/controller/PhabricatorFileTransformListController.php
--- a/src/applications/files/controller/PhabricatorFileTransformListController.php
+++ b/src/applications/files/controller/PhabricatorFileTransformListController.php
@@ -68,7 +68,7 @@
         $view_link = phutil_tag(
           'a',
           array(
-            'class' => 'small grey button',
+            'class' => 'small button button-grey',
             'href' => $view_href,
           ),
           $view_text);
diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -191,7 +191,7 @@
             'a',
             array(
               'href' => '#',
-              'class' => 'button green',
+              'class' => 'button button-green',
               'sigil' => 'create-condition',
               'mustcapture' => true,
             ),
@@ -212,7 +212,7 @@
             'a',
             array(
               'href' => '#',
-              'class' => 'button green',
+              'class' => 'button button-green',
               'sigil' => 'create-action',
               'mustcapture' => true,
             ),
diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php
--- a/src/applications/maniphest/controller/ManiphestBatchEditController.php
+++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php
@@ -173,7 +173,7 @@
             'a',
             array(
               'href' => '#',
-              'class' => 'button green',
+              'class' => 'button button-green',
               'sigil' => 'add-action',
               'mustcapture' => true,
             ),
diff --git a/src/applications/maniphest/view/ManiphestTaskResultListView.php b/src/applications/maniphest/view/ManiphestTaskResultListView.php
--- a/src/applications/maniphest/view/ManiphestTaskResultListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskResultListView.php
@@ -196,7 +196,7 @@
       array(
         'href'        => '#',
         'mustcapture' => true,
-        'class'       => 'grey button',
+        'class'       => 'button button-grey',
         'id'          => 'batch-select-all',
       ),
       pht('Select All'));
@@ -206,7 +206,7 @@
       array(
         'href'        => '#',
         'mustcapture' => true,
-        'class'       => 'grey button',
+        'class'       => 'button button-grey',
         'id'          => 'batch-select-none',
       ),
       pht('Clear Selection'));
@@ -224,7 +224,7 @@
       'a',
       array(
         'href' => '/maniphest/export/'.$saved_query->getQueryKey().'/',
-        'class' => 'grey button',
+        'class' => 'button button-grey',
       ),
       pht('Export to Excel'));
 
diff --git a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
--- a/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
+++ b/src/applications/metamta/applicationpanel/PhabricatorMetaMTAApplicationEmailPanel.php
@@ -341,7 +341,7 @@
       $button_edit = javelin_tag(
         'a',
         array(
-          'class' => 'button small grey',
+          'class' => 'button small button-grey',
           'href'  => $uri->alter('edit', $email->getID()),
           'sigil' => 'workflow',
         ),
@@ -350,7 +350,7 @@
       $button_remove = javelin_tag(
         'a',
         array(
-          'class'   => 'button small grey',
+          'class'   => 'button small button-grey',
           'href'    => $uri->alter('delete', $email->getID()),
           'sigil'   => 'workflow',
         ),
diff --git a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
--- a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
+++ b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
@@ -87,7 +87,7 @@
         'a',
         array(
           'href' => $this->getPanelURI('?revoke='.$authorization->getID()),
-          'class' => 'small grey button',
+          'class' => 'small button button-grey',
           'sigil' => 'workflow',
         ),
         pht('Revoke'));
diff --git a/src/applications/owners/controller/PhabricatorOwnersPathsController.php b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
--- a/src/applications/owners/controller/PhabricatorOwnersPathsController.php
+++ b/src/applications/owners/controller/PhabricatorOwnersPathsController.php
@@ -124,7 +124,7 @@
               'a',
               array(
                 'href' => '#',
-                'class' => 'button green',
+                'class' => 'button button-green',
                 'sigil' => 'addpath',
                 'mustcapture' => true,
               ),
diff --git a/src/applications/passphrase/view/PassphraseCredentialControl.php b/src/applications/passphrase/view/PassphraseCredentialControl.php
--- a/src/applications/passphrase/view/PassphraseCredentialControl.php
+++ b/src/applications/passphrase/view/PassphraseCredentialControl.php
@@ -113,7 +113,7 @@
         'a',
         array(
           'href' => '#',
-          'class' => 'button grey',
+          'class' => 'button button-grey',
           'sigil' => 'passphrase-credential-add',
           'mustcapture' => true,
         ),
diff --git a/src/applications/pholio/view/PholioUploadedImageView.php b/src/applications/pholio/view/PholioUploadedImageView.php
--- a/src/applications/pholio/view/PholioUploadedImageView.php
+++ b/src/applications/pholio/view/PholioUploadedImageView.php
@@ -120,7 +120,7 @@
     return javelin_tag(
       'a',
       array(
-        'class' => 'button grey',
+        'class' => 'button button-grey',
         'sigil' => 'pholio-drop-remove',
       ),
       'X');
diff --git a/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
--- a/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
+++ b/src/applications/phortune/controller/cart/PhortuneCartCheckoutController.php
@@ -152,7 +152,7 @@
       $new_method = javelin_tag(
         'a',
         array(
-          'class' => 'button grey',
+          'class' => 'button button-grey',
           'href'  => $payment_method_uri,
         ),
         pht('Add New Payment Method'));
diff --git a/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php b/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
--- a/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
+++ b/src/applications/phortune/controller/subscription/PhortuneSubscriptionEditController.php
@@ -123,7 +123,7 @@
       'a',
       array(
         'href' => $uri,
-        'class' => 'button grey',
+        'class' => 'button button-grey',
       ),
       pht('Add Payment Method...'));
 
diff --git a/src/applications/phortune/view/PhortuneOrderTableView.php b/src/applications/phortune/view/PhortuneOrderTableView.php
--- a/src/applications/phortune/view/PhortuneOrderTableView.php
+++ b/src/applications/phortune/view/PhortuneOrderTableView.php
@@ -101,7 +101,7 @@
           'a',
           array(
             'href' => $cart->getCheckoutURI(),
-            'class' => 'small green button',
+            'class' => 'small button button-green',
           ),
           pht('Pay Now')),
       );
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -103,7 +103,7 @@
           'a',
           array(
             'href' => $uri->alter('l', $l - 1)->alter('r', $r - 1),
-            'class' => 'button grey',
+            'class' => 'button button-grey',
           ),
           pht("\xC2\xAB Previous Change"));
       } else {
@@ -111,7 +111,7 @@
           'a',
           array(
             'href' => '#',
-            'class' => 'button grey disabled',
+            'class' => 'button button-grey disabled',
           ),
           pht('Original Change'));
       }
@@ -122,7 +122,7 @@
           'a',
           array(
             'href' => $uri->alter('l', $l + 1)->alter('r', $r + 1),
-            'class' => 'button grey',
+            'class' => 'button button-grey',
           ),
           pht("Next Change \xC2\xBB"));
       } else {
@@ -130,7 +130,7 @@
           'a',
           array(
             'href' => '#',
-            'class' => 'button grey disabled',
+            'class' => 'button button-grey disabled',
           ),
           pht('Most Recent Change'));
       }
@@ -200,7 +200,7 @@
         'a',
         array(
           'href'  => '/phriction/edit/'.$document_id.'/',
-          'class' => 'button grey',
+          'class' => 'button button-grey',
         ),
         pht('Edit Current Version'));
     }
@@ -210,7 +210,7 @@
       'a',
       array(
         'href'  => '/phriction/edit/'.$document_id.'/?revert='.$version,
-        'class' => 'button grey',
+        'class' => 'button button-grey',
       ),
       pht('Revert to Version %s...', $version));
   }
diff --git a/src/applications/policy/controller/PhabricatorPolicyEditController.php b/src/applications/policy/controller/PhabricatorPolicyEditController.php
--- a/src/applications/policy/controller/PhabricatorPolicyEditController.php
+++ b/src/applications/policy/controller/PhabricatorPolicyEditController.php
@@ -199,7 +199,7 @@
               'a',
               array(
                 'href' => '#',
-                'class' => 'button green',
+                'class' => 'button button-green',
                 'sigil' => 'create-rule',
                 'mustcapture' => true,
               ),
diff --git a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
@@ -63,7 +63,7 @@
       $button_verify = javelin_tag(
         'a',
         array(
-          'class' => 'button small grey',
+          'class' => 'button small button-grey',
           'href'  => $uri->alter('verify', $email->getID()),
           'sigil' => 'workflow',
         ),
@@ -72,7 +72,7 @@
       $button_make_primary = javelin_tag(
         'a',
         array(
-          'class' => 'button small grey',
+          'class' => 'button small button-grey',
           'href'  => $uri->alter('primary', $email->getID()),
           'sigil' => 'workflow',
         ),
@@ -81,7 +81,7 @@
       $button_remove = javelin_tag(
         'a',
         array(
-          'class'   => 'button small grey',
+          'class'   => 'button small button-grey',
           'href'    => $uri->alter('delete', $email->getID()),
           'sigil'   => 'workflow',
         ),
diff --git a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
@@ -69,7 +69,7 @@
           array(
             'href' => $this->getPanelURI('?delete='.$factor->getID()),
             'sigil' => 'workflow',
-            'class' => 'small grey button',
+            'class' => 'small button button-grey',
           ),
           pht('Remove')),
       );
diff --git a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
@@ -58,7 +58,7 @@
         $button = phutil_tag(
           'a',
           array(
-            'class' => 'small grey button disabled',
+            'class' => 'small button button-grey disabled',
           ),
           pht('Current'));
       } else {
@@ -67,7 +67,7 @@
           'a',
           array(
             'href' => '/auth/session/terminate/'.$session->getID().'/',
-            'class' => 'small grey button',
+            'class' => 'small button button-grey',
             'sigil' => 'workflow',
           ),
           pht('Terminate'));
diff --git a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
@@ -30,7 +30,7 @@
           'a',
           array(
             'href' => '/auth/token/revoke/'.$token->getID().'/',
-            'class' => 'small grey button',
+            'class' => 'small button button-grey',
             'sigil' => 'workflow',
           ),
           pht('Revoke'));
@@ -38,7 +38,7 @@
         $button = javelin_tag(
           'a',
           array(
-            'class' => 'small grey button disabled',
+            'class' => 'small button button-grey disabled',
           ),
           pht('Revoke'));
       }
diff --git a/src/applications/uiexample/examples/PHUIButtonExample.php b/src/applications/uiexample/examples/PHUIButtonExample.php
--- a/src/applications/uiexample/examples/PHUIButtonExample.php
+++ b/src/applications/uiexample/examples/PHUIButtonExample.php
@@ -16,63 +16,11 @@
     $request = $this->getRequest();
     $user = $request->getUser();
 
-    $colors = array('', 'green', 'grey', 'disabled');
-    $sizes = array('', 'small');
-    $tags = array('a', 'button');
-
-    // phutil_tag
-
-    $column = array();
-    foreach ($tags as $tag) {
-      foreach ($colors as $color) {
-        foreach ($sizes as $key => $size) {
-          $class = implode(' ', array($color, $size));
-
-          if ($tag == 'a') {
-            $class .= ' button';
-          }
-
-          $column[$key][] = phutil_tag(
-            $tag,
-            array(
-              'class' => $class,
-            ),
-            phutil_utf8_ucwords($size.' '.$color.' '.$tag));
-
-          $column[$key][] = hsprintf('<br /><br />');
-        }
-      }
-    }
-
-    $column3 = array();
-    foreach ($colors as $color) {
-      $caret = phutil_tag('span', array('class' => 'caret'), '');
-      $column3[] = phutil_tag(
-          'a',
-            array(
-              'class' => $color.' button dropdown',
-            ),
-          array(
-            phutil_utf8_ucwords($color.' Dropdown'),
-            $caret,
-          ));
-        $column3[] = hsprintf('<br /><br />');
-    }
-
-    $layout1 = id(new AphrontMultiColumnView())
-      ->addColumn($column[0])
-      ->addColumn($column[1])
-      ->addColumn($column3)
-      ->setFluidLayout(true)
-      ->setGutter(AphrontMultiColumnView::GUTTER_MEDIUM);
-
    // PHUIButtonView
-
    $colors = array(
      null,
      PHUIButtonView::GREEN,
      PHUIButtonView::GREY,
-     PHUIButtonView::DISABLED,
     );
    $sizes = array(null, PHUIButtonView::SMALL);
    $column = array();
@@ -223,24 +171,21 @@
 
     // Set it and forget it
 
-    $head1 = id(new PHUIHeaderView())
-      ->setHeader('phutil_tag');
-
     $head2 = id(new PHUIHeaderView())
-      ->setHeader('PHUIButtonView');
+      ->setHeader('PHUIButtonView')
+      ->addClass('ml');
 
     $head3 = id(new PHUIHeaderView())
-      ->setHeader(pht('Icon Buttons'));
+      ->setHeader(pht('Icon Buttons'))
+      ->addClass('ml');
 
     $head4 = id(new PHUIHeaderView())
-      ->setHeader(pht('Simple Buttons'));
+      ->setHeader(pht('Simple Buttons'))
+      ->addClass('ml');
 
     $head5 = id(new PHUIHeaderView())
-      ->setHeader(pht('Big Icon Buttons'));
-
-    $wrap1 = id(new PHUIBoxView())
-      ->appendChild($layout1)
-      ->addMargin(PHUI::MARGIN_LARGE);
+      ->setHeader(pht('Big Icon Buttons'))
+      ->addClass('ml');
 
     $wrap2 = id(new PHUIBoxView())
       ->appendChild($layout2)
@@ -259,8 +204,6 @@
       ->addMargin(PHUI::MARGIN_LARGE);
 
     return array(
-      $head1,
-      $wrap1,
       $head2,
       $wrap2,
       $head3,
diff --git a/src/applications/uiexample/examples/PHUIColorPalletteExample.php b/src/applications/uiexample/examples/PHUIColorPalletteExample.php
--- a/src/applications/uiexample/examples/PHUIColorPalletteExample.php
+++ b/src/applications/uiexample/examples/PHUIColorPalletteExample.php
@@ -101,7 +101,7 @@
       'a',
       array(
         'href' => 'http://color.hailpixel.com/#'.implode(',', $url),
-        'class' => 'button grey mlb',
+        'class' => 'button button-grey mlb',
       ),
       pht('Color Palette'));
 
diff --git a/src/applications/uiexample/examples/PhabricatorNotificationUIExample.php b/src/applications/uiexample/examples/PhabricatorNotificationUIExample.php
--- a/src/applications/uiexample/examples/PhabricatorNotificationUIExample.php
+++ b/src/applications/uiexample/examples/PhabricatorNotificationUIExample.php
@@ -24,7 +24,7 @@
       'a',
       array(
         'sigil' => 'notification-example',
-        'class' => 'button green',
+        'class' => 'button button-green',
       ),
       pht('Show Notification'));
 
diff --git a/src/view/AphrontDialogView.php b/src/view/AphrontDialogView.php
--- a/src/view/AphrontDialogView.php
+++ b/src/view/AphrontDialogView.php
@@ -248,7 +248,7 @@
         'a',
         array(
           'href'  => $this->cancelURI,
-          'class' => 'button grey',
+          'class' => 'button button-grey',
           'name'  => '__cancel__',
           'sigil' => 'jx-workflow-button',
           'meta' => $meta,
diff --git a/src/view/form/control/AphrontFormPolicyControl.php b/src/view/form/control/AphrontFormPolicyControl.php
--- a/src/view/form/control/AphrontFormPolicyControl.php
+++ b/src/view/form/control/AphrontFormPolicyControl.php
@@ -324,7 +324,8 @@
         javelin_tag(
           'a',
           array(
-            'class' => 'grey button dropdown has-icon has-text policy-control',
+            'class' => 'button button-grey dropdown has-icon has-text '.
+              'policy-control',
             'href' => '#',
             'mustcapture' => true,
             'sigil' => 'policy-control',
diff --git a/src/view/form/control/PHUIFormIconSetControl.php b/src/view/form/control/PHUIFormIconSetControl.php
--- a/src/view/form/control/PHUIFormIconSetControl.php
+++ b/src/view/form/control/PHUIFormIconSetControl.php
@@ -30,7 +30,7 @@
 
     $classes = array();
     $classes[] = 'button';
-    $classes[] = 'grey';
+    $classes[] = 'button-grey';
 
     if ($is_disabled) {
       $classes[] = 'disabled';
diff --git a/src/view/layout/AphrontListFilterView.php b/src/view/layout/AphrontListFilterView.php
--- a/src/view/layout/AphrontListFilterView.php
+++ b/src/view/layout/AphrontListFilterView.php
@@ -44,7 +44,7 @@
       $hide_action = javelin_tag(
         'a',
         array(
-          'class' => 'button grey',
+          'class' => 'button button-grey',
           'sigil' => 'reveal-content',
           'id' => $hide_action_id,
           'href' => $this->showHideHref,
@@ -65,7 +65,7 @@
       $show_action = javelin_tag(
         'a',
         array(
-          'class' => 'button grey',
+          'class' => 'button button-grey',
           'sigil' => 'reveal-content',
           'style' => 'display: none;',
           'href' => '#',
diff --git a/src/view/phui/PHUIButtonView.php b/src/view/phui/PHUIButtonView.php
--- a/src/view/phui/PHUIButtonView.php
+++ b/src/view/phui/PHUIButtonView.php
@@ -4,6 +4,7 @@
 
   const GREEN = 'green';
   const GREY = 'grey';
+  const BLUE = 'blue';
   const DISABLED = 'disabled';
 
   const SMALL = 'small';
@@ -159,7 +160,7 @@
     $classes[] = 'button';
 
     if ($this->color) {
-      $classes[] = $this->color;
+      $classes[] = 'button-'.$this->color;
     }
 
     if ($this->size) {
@@ -188,10 +189,10 @@
 
     switch ($this->getButtonType()) {
       case self::BUTTONTYPE_DEFAULT:
-        // Nothing special for default buttons.
+        $classes[] = 'phui-button-default';
         break;
       case self::BUTTONTYPE_SIMPLE:
-        $classes[] = 'simple';
+        $classes[] = 'phui-button-simple';
         break;
     }
 
diff --git a/src/view/phui/PHUIHovercardView.php b/src/view/phui/PHUIHovercardView.php
--- a/src/view/phui/PHUIHovercardView.php
+++ b/src/view/phui/PHUIHovercardView.php
@@ -173,7 +173,7 @@
 
     foreach ($this->actions as $action) {
       $options = array(
-        'class' => 'button grey',
+        'class' => 'button button-grey',
         'href'  => $action['uri'],
       );
 
diff --git a/webroot/rsrc/css/phui/button/phui-button-simple.css b/webroot/rsrc/css/phui/button/phui-button-simple.css
--- a/webroot/rsrc/css/phui/button/phui-button-simple.css
+++ b/webroot/rsrc/css/phui/button/phui-button-simple.css
@@ -6,55 +6,55 @@
 
 /* - Basic -------------------------------------------------------------------*/
 
-button.simple,
-input[type="submit"].simple,
-a.simple,
-a.simple:visited {
+button.phui-button-simple,
+input[type="submit"].phui-button-simple,
+a.phui-button-simple,
+a.phui-button-simple:visited {
   background: #fff;
   color: {$bluetext};
   border: 1px solid {$lightblueborder};
 }
 
-button.simple .phui-icon-view,
-input[type="submit"].simple .phui-icon-view,
-a.simple .phui-icon-view,
-a.simple:visited .phui-icon-view {
+button.phui-button-simple .phui-icon-view,
+input[type="submit"].phui-button-simple .phui-icon-view,
+a.phui-button-simple .phui-icon-view,
+a.phui-button-simple:visited .phui-icon-view {
   color: {$lightbluetext};
 }
 
-a.button.simple:hover,
-button.simple:hover {
+a.button.phui-button-simple:hover,
+button.phui-button-simple:hover {
   border-color: {$blueborder};
   background-image: none;
   background-color: #fff;
   transition: 0s;
 }
 
-a.simple.current {
+a.phui-button-simple.current {
   background: {$lightblue};
 }
 
 
 /* - Red  --------------------------------------------------------------------*/
 
-button.simple.red,
-input[type="submit"].simple.red,
-a.simple.red,
-a.simple.red:visited {
+button.phui-button-simple.button-red,
+input[type="submit"].phui-button-simple.button-red,
+a.phui-button-simple.button-red,
+a.phui-button-simple.button-red:visited {
   background: {$sh-redbackground};
   color: {$redtext};
   border: 1px solid {$sh-redborder};
 }
 
-button.simple.red .phui-icon-view,
-input[type="submit"].simple.red .phui-icon-view,
-a.simple.red .phui-icon-view,
-a.simple.red:visited .phui-icon-view {
+button.phui-button-simple.button-red .phui-icon-view,
+input[type="submit"].phui-button-simple.button-red .phui-icon-view,
+a.phui-button-simple.button-red .phui-icon-view,
+a.phui-button-simple.button-red:visited .phui-icon-view {
   color: {$redtext};
 }
 
-a.button.simple.red:hover,
-button.simple.red:hover {
+a.button.phui-button-simple.button-red:hover,
+button.phui-button-simple.button-red:hover {
   border-color: {$sh-redtext};
   background-image: none;
   background-color: {$sh-redbackground};
@@ -63,24 +63,24 @@
 
 /* - Green  ------------------------------------------------------------------*/
 
-button.simple.green,
-input[type="submit"].simple.green,
-a.simple.green,
-a.simple.green:visited {
+button.phui-button-simple.button-green,
+input[type="submit"].phui-button-simple.button-green,
+a.phui-button-simple.button-green,
+a.phui-button-simple.button-green:visited {
   background: {$sh-greenbackground};
   color: {$greentext};
   border: 1px solid {$sh-greenborder};
 }
 
-button.simple.green .phui-icon-view,
-input[type="submit"].simple.green .phui-icon-view,
-a.simple.green .phui-icon-view,
-a.simple.green:visited .phui-icon-view {
+button.phui-button-simple.button-green .phui-icon-view,
+input[type="submit"].phui-button-simple.button-green .phui-icon-view,
+a.phui-button-simple.button-green .phui-icon-view,
+a.phui-button-simple.button-green:visited .phui-icon-view {
   color: {$greentext};
 }
 
-a.button.simple.green:hover,
-button.simple.green:hover {
+a.button.phui-button-simple.button-green:hover,
+button.phui-button-simple.button-green:hover {
   border-color: {$sh-greentext};
   background-image: none;
   background-color: {$sh-greenbackground};
@@ -89,24 +89,24 @@
 
 /* - Yellow  -----------------------------------------------------------------*/
 
-button.simple.yellow,
-input[type="submit"].simple.yellow,
-a.simple.yellow,
-a.simple.yellow:visited {
+button.phui-button-simple.button-yellow,
+input[type="submit"].phui-button-simple.button-yellow,
+a.phui-button-simple.button-yellow,
+a.phui-button-simple.button-yellow:visited {
   background-color: {$sh-yellowbackground};
   color: {$sh-yellowtext};
   border: 1px solid {$sh-yellowborder};
 }
 
-button.simple.yellow .phui-icon-view,
-input[type="submit"].simple.yellow .phui-icon-view,
-a.simple.yellow .phui-icon-view,
-a.simple.yellow:visited .phui-icon-view {
+button.phui-button-simple.button-yellow .phui-icon-view,
+input[type="submit"].phui-button-simple.button-yellow .phui-icon-view,
+a.phui-button-simple.button-yellow .phui-icon-view,
+a.phui-button-simple.button-yellow:visited .phui-icon-view {
   color: {$sh-yellowicon};
 }
 
-a.button.simple.yellow:hover,
-button.simple.yellow:hover {
+a.button.phui-button-simple.button-yellow:hover,
+button.phui-button-simple.button-yellow:hover {
   border-color: {$sh-yellowtext};
   background-image: none;
   background-color: {$sh-yellowbackground};
@@ -116,16 +116,16 @@
 
 /* - Misc  -------------------------------------------------------------------*/
 
-a.button.simple .phui-icon-view {
+a.button.phui-button-simple .phui-icon-view {
   border: none;
 }
 
-a.button.simple.phuix-dropdown-open {
+a.button.phui-button-simple.phuix-dropdown-open {
   background-color: #fff;
   color: {$blue};
   box-shadow: none;
 }
 
-a.button.simple.phuix-dropdown-open:hover .phui-icon-view {
+a.button.phui-button-simple.phuix-dropdown-open:hover .phui-icon-view {
   color: {$blue};
 }
diff --git a/webroot/rsrc/css/phui/button/phui-button.css b/webroot/rsrc/css/phui/button/phui-button.css
--- a/webroot/rsrc/css/phui/button/phui-button.css
+++ b/webroot/rsrc/css/phui/button/phui-button.css
@@ -49,13 +49,13 @@
 
 button .phui-icon-view,
 a.button .phui-icon-view,
-button.green .phui-icon-view,
-a.button.green .phui-icon-view {
+button.button-green .phui-icon-view,
+a.button.button-green .phui-icon-view {
   color: white;
 }
 
-button.grey .phui-icon-view,
-a.button.grey .phui-icon-view {
+button.button-grey .phui-icon-view,
+a.button.button-grey .phui-icon-view {
   color: {$darkbluetext};
 }
 
@@ -68,18 +68,18 @@
   text-indent: 29px;
 }
 
-button.green,
-a.green.button,
-a.green.button:visited {
+button.button-green,
+a.button-green.button,
+a.button-green.button:visited {
   background-color: {$green};
   border-color: {$green};
   background-image: linear-gradient(to bottom, #23BB5B, #139543);
 }
 
-button.grey,
-input[type="submit"].grey,
-a.grey,
-a.grey:visited {
+button.button-grey,
+input[type="submit"].button-grey,
+a.button-grey,
+a.button-grey:visited {
   background-color: #F7F7F9;
   background-image: linear-gradient(to bottom, #ffffff, #f1f0f1);
   border: 1px solid rgba({$alphablue}, 0.3);
@@ -108,15 +108,15 @@
   transition: 0.1s;
 }
 
-a.button.grey:hover,
-button.grey:hover {
+a.button.button-grey:hover,
+button.button-grey:hover {
   background-image: linear-gradient(to bottom, #ffffff, #eeebec);
   border-color: rgba({$alphablue}, 0.4);
   transition: 0.1s;
 }
 
-a.button.green:hover,
-button.green:hover {
+a.button.button-green:hover,
+button.button-green:hover {
   border-color: #127336;
   background-color: #0DAD48;
   background-image: linear-gradient(to bottom, #23BB5B, #178841);
@@ -244,7 +244,7 @@
   margin-top: 6px;
 }
 
-.grey.dropdown .caret {
+.button-grey.dropdown .caret {
   border-top-color: #000;
 }
 
diff --git a/webroot/rsrc/js/phuix/PHUIXButtonView.js b/webroot/rsrc/js/phuix/PHUIXButtonView.js
--- a/webroot/rsrc/js/phuix/PHUIXButtonView.js
+++ b/webroot/rsrc/js/phuix/PHUIXButtonView.js
@@ -35,10 +35,10 @@
       var node = this.getNode();
 
       if (this._color) {
-        JX.DOM.alterClass(node, this._color, false);
+        JX.DOM.alterClass(node, 'button-' + this._color, false);
       }
       this._color = color;
-      JX.DOM.alterClass(node, this._color, true);
+      JX.DOM.alterClass(node, 'button-' + this._color, true);
 
       return this;
     },
@@ -50,7 +50,7 @@
       var node = this.getNode();
 
       var is_simple = (this._buttonType == self.BUTTONTYPE_SIMPLE);
-      JX.DOM.alterClass(node, 'simple', is_simple);
+      JX.DOM.alterClass(node, 'phui-button-simple', is_simple);
 
       return this;
     },