diff --git a/src/applications/badges/icon/PhabricatorBadgesIconSet.php b/src/applications/badges/icon/PhabricatorBadgesIconSet.php
--- a/src/applications/badges/icon/PhabricatorBadgesIconSet.php
+++ b/src/applications/badges/icon/PhabricatorBadgesIconSet.php
@@ -15,21 +15,33 @@
       'fa-user' => pht('Average Person'),
       'fa-bug' => pht('Ladybug'),
       'fa-users' => pht('Triplets'),
-
       'fa-book' => pht('Nominomicon'),
+
       'fa-rocket' => pht('Escape Route'),
       'fa-life-ring' => pht('Foam Circle'),
       'fa-birthday-cake' => pht('Cake Day'),
-
       'fa-camera-retro' => pht('Leica Enthusiast'),
       'fa-beer' => pht('Liquid Lunch'),
+
       'fa-gift' => pht('Free Stuff'),
       'fa-eye' => pht('Eye See You'),
-
       'fa-heart' => pht('Love is Love'),
       'fa-trophy' => pht('Winner at Things'),
       'fa-umbrella' => pht('Rain Defender'),
+
       'fa-graduation-cap' => pht('In Debt'),
+      'fa-empire' => pht('The Empire'),
+      'fa-first-order' => pht('First Order'),
+      'fa-rebel' => pht('Rebel'),
+      'fa-space-shuttle' => pht('Star Ship'),
+
+      'fa-anchor' => pht('Anchors Away'),
+      'fa-code' => pht('Coder'),
+      'fa-briefcase' => pht('Serious Business'),
+      'fa-globe' => pht('International'),
+      'fa-desktop' => pht('Glowing Rectangle'),
+
+
     );
 
     $icons = array();
diff --git a/src/applications/files/controller/PhabricatorFileIconSetSelectController.php b/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
--- a/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
+++ b/src/applications/files/controller/PhabricatorFileIconSetSelectController.php
@@ -31,6 +31,7 @@
 
     $ii = 0;
     $buttons = array();
+    $breakpoint = ceil(sqrt(count($set->getIcons())));
     foreach ($set->getIcons() as $icon) {
       $label = $icon->getLabel();
 
@@ -75,7 +76,7 @@
           $view,
         ));
 
-      if ((++$ii % 4) == 0) {
+      if ((++$ii % $breakpoint) == 0) {
         $buttons[] = phutil_tag('br');
       }
     }