diff --git a/resources/builtin/project.png b/resources/builtin/project.png
index 1e16790ea8..c6abf5ed42 100644
Binary files a/resources/builtin/project.png and b/resources/builtin/project.png differ
diff --git a/resources/builtin/projects/v3/briefcase.png b/resources/builtin/projects/v3/briefcase.png
new file mode 100644
index 0000000000..c6abf5ed42
Binary files /dev/null and b/resources/builtin/projects/v3/briefcase.png differ
diff --git a/resources/builtin/projects/v3/bug.png b/resources/builtin/projects/v3/bug.png
new file mode 100644
index 0000000000..bb2948a93a
Binary files /dev/null and b/resources/builtin/projects/v3/bug.png differ
diff --git a/resources/builtin/projects/v3/calendar.png b/resources/builtin/projects/v3/calendar.png
new file mode 100644
index 0000000000..6ebdc2e08c
Binary files /dev/null and b/resources/builtin/projects/v3/calendar.png differ
diff --git a/resources/builtin/projects/v3/cloud.png b/resources/builtin/projects/v3/cloud.png
new file mode 100644
index 0000000000..efb644001f
Binary files /dev/null and b/resources/builtin/projects/v3/cloud.png differ
diff --git a/resources/builtin/projects/v3/creditcard.png b/resources/builtin/projects/v3/creditcard.png
new file mode 100644
index 0000000000..d231c9437d
Binary files /dev/null and b/resources/builtin/projects/v3/creditcard.png differ
diff --git a/resources/builtin/projects/v3/database.png b/resources/builtin/projects/v3/database.png
new file mode 100644
index 0000000000..9e44c0ec58
Binary files /dev/null and b/resources/builtin/projects/v3/database.png differ
diff --git a/resources/builtin/projects/v3/desktop.png b/resources/builtin/projects/v3/desktop.png
new file mode 100644
index 0000000000..cf6f80eeaf
Binary files /dev/null and b/resources/builtin/projects/v3/desktop.png differ
diff --git a/resources/builtin/projects/v3/experimental.png b/resources/builtin/projects/v3/experimental.png
new file mode 100644
index 0000000000..5bb05ac100
Binary files /dev/null and b/resources/builtin/projects/v3/experimental.png differ
diff --git a/resources/builtin/projects/v3/flag.png b/resources/builtin/projects/v3/flag.png
new file mode 100644
index 0000000000..c7d2563115
Binary files /dev/null and b/resources/builtin/projects/v3/flag.png differ
diff --git a/resources/builtin/projects/v3/folder.png b/resources/builtin/projects/v3/folder.png
new file mode 100644
index 0000000000..cac0f9fbfa
Binary files /dev/null and b/resources/builtin/projects/v3/folder.png differ
diff --git a/resources/builtin/projects/v3/lock.png b/resources/builtin/projects/v3/lock.png
new file mode 100644
index 0000000000..839cb1e5bf
Binary files /dev/null and b/resources/builtin/projects/v3/lock.png differ
diff --git a/resources/builtin/projects/v3/mail.png b/resources/builtin/projects/v3/mail.png
new file mode 100644
index 0000000000..17f91ea881
Binary files /dev/null and b/resources/builtin/projects/v3/mail.png differ
diff --git a/resources/builtin/projects/v3/mobile.png b/resources/builtin/projects/v3/mobile.png
new file mode 100644
index 0000000000..fbb1985015
Binary files /dev/null and b/resources/builtin/projects/v3/mobile.png differ
diff --git a/resources/builtin/projects/v3/organization.png b/resources/builtin/projects/v3/organization.png
new file mode 100644
index 0000000000..1957dd8e68
Binary files /dev/null and b/resources/builtin/projects/v3/organization.png differ
diff --git a/resources/builtin/projects/v3/people.png b/resources/builtin/projects/v3/people.png
new file mode 100644
index 0000000000..b9118c2cfa
Binary files /dev/null and b/resources/builtin/projects/v3/people.png differ
diff --git a/resources/builtin/projects/v3/servers.png b/resources/builtin/projects/v3/servers.png
new file mode 100644
index 0000000000..df20dd6492
Binary files /dev/null and b/resources/builtin/projects/v3/servers.png differ
diff --git a/resources/builtin/projects/v3/tag.png b/resources/builtin/projects/v3/tag.png
new file mode 100644
index 0000000000..c91bac473a
Binary files /dev/null and b/resources/builtin/projects/v3/tag.png differ
diff --git a/resources/builtin/projects/v3/trash.png b/resources/builtin/projects/v3/trash.png
new file mode 100644
index 0000000000..ce3f557d44
Binary files /dev/null and b/resources/builtin/projects/v3/trash.png differ
diff --git a/resources/builtin/projects/v3/truck.png b/resources/builtin/projects/v3/truck.png
new file mode 100644
index 0000000000..3c903ea58b
Binary files /dev/null and b/resources/builtin/projects/v3/truck.png differ
diff --git a/resources/builtin/projects/v3/umbrella.png b/resources/builtin/projects/v3/umbrella.png
new file mode 100644
index 0000000000..98c7c12365
Binary files /dev/null and b/resources/builtin/projects/v3/umbrella.png differ
diff --git a/src/applications/project/controller/PhabricatorProjectEditPictureController.php b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
index 5060d0a203..d6b8a73896 100644
--- a/src/applications/project/controller/PhabricatorProjectEditPictureController.php
+++ b/src/applications/project/controller/PhabricatorProjectEditPictureController.php
@@ -1,334 +1,364 @@
 <?php
 
 final class PhabricatorProjectEditPictureController
   extends PhabricatorProjectController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $request->getViewer();
     $id = $request->getURIData('id');
 
     $project = id(new PhabricatorProjectQuery())
       ->setViewer($viewer)
       ->withIDs(array($id))
       ->needImages(true)
       ->requireCapabilities(
         array(
           PhabricatorPolicyCapability::CAN_VIEW,
           PhabricatorPolicyCapability::CAN_EDIT,
         ))
       ->executeOne();
     if (!$project) {
       return new Aphront404Response();
     }
 
     $this->setProject($project);
 
     $manage_uri = $this->getApplicationURI('manage/'.$project->getID().'/');
 
     $supported_formats = PhabricatorFile::getTransformableImageFormats();
     $e_file = true;
     $errors = array();
 
     if ($request->isFormPost()) {
       $phid = $request->getStr('phid');
       $is_default = false;
       if ($phid == PhabricatorPHIDConstants::PHID_VOID) {
         $phid = null;
         $is_default = true;
       } else if ($phid) {
         $file = id(new PhabricatorFileQuery())
           ->setViewer($viewer)
           ->withPHIDs(array($phid))
           ->executeOne();
       } else {
         if ($request->getFileExists('picture')) {
           $file = PhabricatorFile::newFromPHPUpload(
             $_FILES['picture'],
             array(
               'authorPHID' => $viewer->getPHID(),
               'canCDN' => true,
             ));
         } else {
           $e_file = pht('Required');
           $errors[] = pht(
             'You must choose a file when uploading a new project picture.');
         }
       }
 
       if (!$errors && !$is_default) {
         if (!$file->isTransformableImage()) {
           $e_file = pht('Not Supported');
           $errors[] = pht(
             'This server only supports these image formats: %s.',
             implode(', ', $supported_formats));
         } else {
           $xform = PhabricatorFileTransform::getTransformByKey(
             PhabricatorFileThumbnailTransform::TRANSFORM_PROFILE);
           $xformed = $xform->executeTransform($file);
         }
       }
 
       if (!$errors) {
         if ($is_default) {
           $new_value = null;
         } else {
           $new_value = $xformed->getPHID();
         }
 
         $xactions = array();
         $xactions[] = id(new PhabricatorProjectTransaction())
           ->setTransactionType(
               PhabricatorProjectImageTransaction::TRANSACTIONTYPE)
           ->setNewValue($new_value);
 
         $editor = id(new PhabricatorProjectTransactionEditor())
           ->setActor($viewer)
           ->setContentSourceFromRequest($request)
           ->setContinueOnMissingFields(true)
           ->setContinueOnNoEffect(true);
 
         $editor->applyTransactions($project, $xactions);
 
         return id(new AphrontRedirectResponse())->setURI($manage_uri);
       }
     }
 
     $title = pht('Edit Project Picture');
 
     $form = id(new PHUIFormLayoutView())
       ->setUser($viewer);
 
     $default_image = PhabricatorFile::loadBuiltin($viewer, 'project.png');
 
     $images = array();
 
     $current = $project->getProfileImagePHID();
     $has_current = false;
     if ($current) {
       $files = id(new PhabricatorFileQuery())
         ->setViewer($viewer)
         ->withPHIDs(array($current))
         ->execute();
       if ($files) {
         $file = head($files);
         if ($file->isTransformableImage()) {
           $has_current = true;
           $images[$current] = array(
             'uri' => $file->getBestURI(),
             'tip' => pht('Current Picture'),
           );
         }
       }
     }
 
+    $builtins = array(
+      'projects/v3/bug.png',
+      'projects/v3/calendar.png',
+      'projects/v3/cloud.png',
+      'projects/v3/creditcard.png',
+      'projects/v3/database.png',
+      'projects/v3/desktop.png',
+      'projects/v3/experimental.png',
+      'projects/v3/flag.png',
+      'projects/v3/folder.png',
+      'projects/v3/lock.png',
+      'projects/v3/mail.png',
+      'projects/v3/mobile.png',
+      'projects/v3/organization.png',
+      'projects/v3/people.png',
+      'projects/v3/servers.png',
+      'projects/v3/tag.png',
+      'projects/v3/trash.png',
+      'projects/v3/truck.png',
+      'projects/v3/umbrella.png',
+    );
+
+    foreach ($builtins as $builtin) {
+      $file = PhabricatorFile::loadBuiltin($viewer, $builtin);
+      $images[$file->getPHID()] = array(
+        'uri' => $file->getBestURI(),
+        'tip' => pht('Builtin Image'),
+      );
+    }
+
     $images[PhabricatorPHIDConstants::PHID_VOID] = array(
       'uri' => $default_image->getBestURI(),
-      'tip' => pht('No Picture'),
+      'tip' => pht('Default Picture'),
     );
 
     require_celerity_resource('people-profile-css');
     Javelin::initBehavior('phabricator-tooltips', array());
 
     $buttons = array();
     foreach ($images as $phid => $spec) {
       $button = javelin_tag(
         'button',
         array(
           'class' => 'button-grey profile-image-button',
           'sigil' => 'has-tooltip',
           'meta' => array(
             'tip' => $spec['tip'],
             'size' => 300,
           ),
         ),
         phutil_tag(
           'img',
           array(
             'height' => 50,
             'width' => 50,
             'src' => $spec['uri'],
           )));
 
       $button = array(
         phutil_tag(
           'input',
           array(
             'type'  => 'hidden',
             'name'  => 'phid',
             'value' => $phid,
           )),
         $button,
       );
 
       $button = phabricator_form(
         $viewer,
         array(
           'class' => 'profile-image-form',
           'method' => 'POST',
         ),
         $button);
 
       $buttons[] = $button;
     }
 
     if ($has_current) {
       $form->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('Current Picture'))
           ->setValue(array_shift($buttons)));
     }
 
     $form->appendChild(
       id(new AphrontFormMarkupControl())
         ->setLabel(pht('Use Picture'))
         ->setValue(
           array(
             $this->renderDefaultForm($project),
             $buttons,
           )));
 
     $launch_id = celerity_generate_unique_node_id();
     $input_id = celerity_generate_unique_node_id();
 
     Javelin::initBehavior(
       'launch-icon-composer',
       array(
         'launchID' => $launch_id,
         'inputID' => $input_id,
       ));
 
     $compose_button = javelin_tag(
       'button',
       array(
-        'class' => 'grey',
+        'class' => 'button-grey',
         'id' => $launch_id,
         'sigil' => 'icon-composer',
       ),
       pht('Choose Icon and Color...'));
 
     $compose_input = javelin_tag(
       'input',
       array(
         'type' => 'hidden',
         'id' => $input_id,
         'name' => 'phid',
       ));
 
     $compose_form = phabricator_form(
       $viewer,
       array(
         'class' => 'profile-image-form',
         'method' => 'POST',
       ),
       array(
         $compose_input,
         $compose_button,
       ));
 
     $form->appendChild(
       id(new AphrontFormMarkupControl())
-        ->setLabel(pht('Quick Create'))
+        ->setLabel(pht('Custom'))
         ->setValue($compose_form));
 
     $upload_form = id(new AphrontFormView())
       ->setUser($viewer)
       ->setEncType('multipart/form-data')
       ->appendChild(
         id(new AphrontFormFileControl())
           ->setName('picture')
           ->setLabel(pht('Upload Picture'))
           ->setError($e_file)
           ->setCaption(
             pht('Supported formats: %s', implode(', ', $supported_formats))))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($manage_uri)
           ->setValue(pht('Upload Picture')));
 
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setForm($form);
 
     $upload_box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Upload New Picture'))
       ->setForm($upload_form);
 
     $nav = $this->getProfileMenu();
     $nav->selectFilter(PhabricatorProject::ITEM_MANAGE);
 
     return $this->newPage()
       ->setTitle($title)
       ->setNavigation($nav)
       ->appendChild(
         array(
           $form_box,
           $upload_box,
         ));
   }
 
   private function renderDefaultForm(PhabricatorProject $project) {
     $viewer = $this->getViewer();
     $compose_color = $project->getDisplayIconComposeColor();
     $compose_icon = $project->getDisplayIconComposeIcon();
 
     $default_builtin = id(new PhabricatorFilesComposeIconBuiltinFile())
       ->setColor($compose_color)
       ->setIcon($compose_icon);
 
     $file_builtins = PhabricatorFile::loadBuiltins(
       $viewer,
       array($default_builtin));
 
     $file_builtin = head($file_builtins);
 
     $default_button = javelin_tag(
       'button',
       array(
         'class' => 'button-grey profile-image-button',
         'sigil' => 'has-tooltip',
         'meta' => array(
           'tip' => pht('Use Icon and Color'),
           'size' => 300,
         ),
       ),
       phutil_tag(
         'img',
         array(
           'height' => 50,
           'width' => 50,
           'src' => $file_builtin->getBestURI(),
         )));
 
     $inputs = array(
       'projectPHID' => $project->getPHID(),
       'icon' => $compose_icon,
       'color' => $compose_color,
     );
 
     foreach ($inputs as $key => $value) {
       $inputs[$key] = javelin_tag(
         'input',
         array(
           'type' => 'hidden',
           'name' => $key,
           'value' => $value,
         ));
     }
 
     $default_form = phabricator_form(
       $viewer,
       array(
         'class' => 'profile-image-form',
         'method' => 'POST',
         'action' => '/file/compose/',
        ),
       array(
         $inputs,
         $default_button,
       ));
 
     return $default_form;
   }
 
 }