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
@@ -121,9 +121,39 @@ final class PhabricatorProjectEditPictureController
       }
     }
 
+    $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');
@@ -200,7 +230,7 @@ final class PhabricatorProjectEditPictureController
     $compose_button = javelin_tag(
       'button',
       array(
-        'class' => 'grey',
+        'class' => 'button-grey',
         'id' => $launch_id,
         'sigil' => 'icon-composer',
       ),
@@ -227,7 +257,7 @@ final class PhabricatorProjectEditPictureController
 
     $form->appendChild(
       id(new AphrontFormMarkupControl())
-        ->setLabel(pht('Quick Create'))
+        ->setLabel(pht('Custom'))
         ->setValue($compose_form));
 
     $upload_form = id(new AphrontFormView())