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' => 'b2d6f4b8',
     'conpherence.pkg.js' => '020aebcf',
-    'core.pkg.css' => '8ee41b37',
+    'core.pkg.css' => '5fb9829e',
     'core.pkg.js' => '83c66b30',
     'dark-console.pkg.js' => '187792c2',
     'differential.pkg.css' => '0dac8831',
@@ -147,7 +147,7 @@
     'rsrc/css/phui/phui-document.css' => 'a9154763',
     'rsrc/css/phui/phui-feed-story.css' => '1dd2e4c0',
     'rsrc/css/phui/phui-fontkit.css' => '1ec937e5',
-    'rsrc/css/phui/phui-form-view.css' => '029b1ef9',
+    'rsrc/css/phui/phui-form-view.css' => '0febcbf6',
     'rsrc/css/phui/phui-form.css' => '0ce5b5b8',
     'rsrc/css/phui/phui-formation-view.css' => 'b172a0b3',
     'rsrc/css/phui/phui-head-thing.css' => 'd7f293df',
@@ -775,7 +775,7 @@
     'phui-font-icon-base-css' => 'b7608e58',
     'phui-fontkit-css' => '1ec937e5',
     'phui-form-css' => '0ce5b5b8',
-    'phui-form-view-css' => '029b1ef9',
+    'phui-form-view-css' => '0febcbf6',
     'phui-formation-view-css' => 'b172a0b3',
     'phui-head-thing-view-css' => 'd7f293df',
     'phui-header-view-css' => '521ef411',
diff --git a/src/applications/conduit/controller/PhabricatorConduitTokenEditController.php b/src/applications/conduit/controller/PhabricatorConduitTokenEditController.php
--- a/src/applications/conduit/controller/PhabricatorConduitTokenEditController.php
+++ b/src/applications/conduit/controller/PhabricatorConduitTokenEditController.php
@@ -96,6 +96,7 @@
               ->setLabel(pht('Token'))
               ->setReadOnly(true)
               ->setSigil('select-on-click')
+              ->setHasCopyButton(true)
               ->setValue($token->getToken()));
 
         $dialog->appendForm($form);
diff --git a/src/applications/differential/view/DifferentialChangesetDetailView.php b/src/applications/differential/view/DifferentialChangesetDetailView.php
--- a/src/applications/differential/view/DifferentialChangesetDetailView.php
+++ b/src/applications/differential/view/DifferentialChangesetDetailView.php
@@ -246,7 +246,7 @@
           'tip' => pht('Copy file path'),
           'text' => $display_filename,
           'successMessage' => pht('File path copied.'),
-          'errorMessage' => pht('Copy of file path failed.'),
+          'errorMessage' => pht('Copying failed.'),
         ));
 
     return javelin_tag(
diff --git a/src/applications/diffusion/view/DiffusionCloneURIView.php b/src/applications/diffusion/view/DiffusionCloneURIView.php
--- a/src/applications/diffusion/view/DiffusionCloneURIView.php
+++ b/src/applications/diffusion/view/DiffusionCloneURIView.php
@@ -100,7 +100,7 @@
           'tip' => pht('Copy repository URI'),
           'text' => $display,
           'successMessage' => pht('Repository URI copied.'),
-          'errorMessage' => pht('Copy of Repository URI failed.'),
+          'errorMessage' => pht('Copying failed.'),
         ));
 
     switch ($uri->getEffectiveIOType()) {
diff --git a/src/view/form/control/AphrontFormControl.php b/src/view/form/control/AphrontFormControl.php
--- a/src/view/form/control/AphrontFormControl.php
+++ b/src/view/form/control/AphrontFormControl.php
@@ -15,6 +15,7 @@
   private $required;
   private $hidden;
   private $classes;
+  private $hasCopyButton;
 
   public function setHidden($hidden) {
     $this->hidden = $hidden;
@@ -114,6 +115,33 @@
     return $this;
   }
 
+  /**
+   * Whether a button is displayed next to the control which allows the user to
+   * copy the value in the form control. Common use cases include <input>
+   * (AphrontFormTextControl) and <textarea> (AphrontFormTextAreaControl)
+   * elements displaying read-only data such as tokens or passphrases. This is
+   * only to get the CSS right; actual button implementation is in subclasses.
+   *
+   * @return bool
+   */
+  public function getHasCopyButton() {
+    return $this->hasCopyButton;
+  }
+
+  /**
+   * Whether to display a button next to the control which allows the user to
+   * copy the value in the form control. Common use cases include <input>
+   * (AphrontFormTextControl) and <textarea> (AphrontFormTextAreaControl)
+   * elements displaying read-only data such as tokens or passphrases. This is
+   * only to get the CSS right; actual button implementation is in subclasses.
+   *
+   * @param bool $has_copy_button
+   */
+  public function setHasCopyButton($has_copy_button) {
+    $this->hasCopyButton = $has_copy_button;
+    return $this;
+  }
+
   public function getValue() {
     return $this->value;
   }
@@ -192,9 +220,14 @@
       $this->setID(celerity_generate_unique_node_id());
     }
 
+    $class = 'aphront-form-input';
+    if ($this->getHasCopyButton()) {
+      $class = $class.' has-copy-button';
+    }
+
     $input = phutil_tag(
       'div',
-      array('class' => 'aphront-form-input'),
+      array('class' => $class),
       $this->renderInput());
 
     $error = null;
diff --git a/src/view/form/control/AphrontFormTextControl.php b/src/view/form/control/AphrontFormTextControl.php
--- a/src/view/form/control/AphrontFormTextControl.php
+++ b/src/view/form/control/AphrontFormTextControl.php
@@ -58,7 +58,8 @@
   }
 
   protected function renderInput() {
-    return javelin_tag(
+    $input = array();
+    $input[] = javelin_tag(
       'input',
       array(
         'type'         => 'text',
@@ -72,6 +73,38 @@
         'placeholder'  => $this->getPlaceholder(),
         'autofocus' => ($this->getAutofocus() ? 'autofocus' : null),
       ));
+
+    if ($this->getHasCopyButton()) {
+      Javelin::initBehavior('select-content');
+      Javelin::initBehavior('phabricator-clipboard-copy');
+      Javelin::initBehavior('phabricator-tooltips');
+
+      $field_label = $this->getLabel();
+      if (phutil_nonempty_string($field_label)) {
+        // TODO: 'Copy %s' is broken i18n as it ignores grammatical case
+        $tip_message = pht('Copy %s', $field_label);
+        $success_message = pht('%s copied.', $field_label);
+      } else {
+        $tip_message = pht('Copy text');
+        $success_message = pht('Text copied.');
+      }
+      $copy = id(new PHUIButtonView())
+        ->setTag('a')
+        ->setColor(PHUIButtonView::GREY)
+        ->setIcon('fa-clipboard')
+        ->setHref('#')
+        ->addSigil('clipboard-copy')
+        ->addSigil('has-tooltip')
+        ->setMetadata(
+          array(
+            'tip' => $tip_message,
+            'text' => $this->getValue(),
+            'successMessage' => $success_message,
+            'errorMessage' => pht('Copying failed.'),
+          ));
+      $input[] = $copy;
+    }
+    return $input;
   }
 
 }
diff --git a/webroot/rsrc/css/phui/phui-form-view.css b/webroot/rsrc/css/phui/phui-form-view.css
--- a/webroot/rsrc/css/phui/phui-form-view.css
+++ b/webroot/rsrc/css/phui/phui-form-view.css
@@ -104,6 +104,17 @@
   width: 100%;
 }
 
+/* Reduce from 100% to 85% to avoid linebreak when displaying a Copy button */
+.aphront-form-input.has-copy-button input[type="text"],
+.aphront-form-input.has-copy-button textarea {
+  width: 85%;
+}
+
+.aphront-form-input.has-copy-button .button {
+  vertical-align: middle;
+  margin-left: 4px;
+}
+
 .aphront-form-cvc-input input {
   width: 64px;
 }