diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 7ca4234642..65e119deec 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
 return array(
   'names' =>
   array(
-    'core.pkg.css' => '73e14ee6',
+    'core.pkg.css' => '703a28a5',
     'core.pkg.js' => '9c9c8442',
     'darkconsole.pkg.js' => 'ca8671ce',
     'differential.pkg.css' => '4a93db37',
@@ -135,7 +135,7 @@ return array(
     'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
     'rsrc/css/phui/phui-list.css' => '43ed2d93',
     'rsrc/css/phui/phui-object-box.css' => 'ce92d8ec',
-    'rsrc/css/phui/phui-object-item-list-view.css' => '31d6da4e',
+    'rsrc/css/phui/phui-object-item-list-view.css' => '52a438e2',
     'rsrc/css/phui/phui-pinboard-view.css' => '874c22f9',
     'rsrc/css/phui/phui-property-list-view.css' => '2f7199e8',
     'rsrc/css/phui/phui-remarkup-preview.css' => '19ad512b',
@@ -762,7 +762,7 @@ return array(
     'phui-info-panel-css' => '27ea50a1',
     'phui-list-view-css' => '43ed2d93',
     'phui-object-box-css' => 'ce92d8ec',
-    'phui-object-item-list-view-css' => '31d6da4e',
+    'phui-object-item-list-view-css' => '52a438e2',
     'phui-pinboard-view-css' => '874c22f9',
     'phui-property-list-view-css' => '2f7199e8',
     'phui-remarkup-preview-css' => '19ad512b',
diff --git a/src/applications/audit/view/PhabricatorAuditListView.php b/src/applications/audit/view/PhabricatorAuditListView.php
index b27689df09..1b4029cd9e 100644
--- a/src/applications/audit/view/PhabricatorAuditListView.php
+++ b/src/applications/audit/view/PhabricatorAuditListView.php
@@ -103,7 +103,6 @@ final class PhabricatorAuditListView extends AphrontView {
     $rowc = array();
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     foreach ($this->commits as $commit) {
       $commit_phid = $commit->getPHID();
       $commit_handle = $this->getHandle($commit_phid);
diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php
index 6204836958..71779d797b 100644
--- a/src/applications/config/controller/PhabricatorConfigIssueListController.php
+++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php
@@ -45,7 +45,6 @@ final class PhabricatorConfigIssueListController
   private function buildIssueList(array $issues) {
     assert_instances_of($issues, 'PhabricatorSetupIssue');
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     $ignored_items = array();
 
     foreach ($issues as $issue) {
diff --git a/src/applications/daemon/view/PhabricatorDaemonLogListView.php b/src/applications/daemon/view/PhabricatorDaemonLogListView.php
index 1f4bbf4bdd..41d341ec66 100644
--- a/src/applications/daemon/view/PhabricatorDaemonLogListView.php
+++ b/src/applications/daemon/view/PhabricatorDaemonLogListView.php
@@ -18,7 +18,6 @@ final class PhabricatorDaemonLogListView extends AphrontView {
     }
 
     $list = id(new PHUIObjectItemListView())
-      ->setCards(true)
       ->setFlush(true);
     foreach ($this->daemonLogs as $log) {
       $id = $log->getID();
diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
index 2359190214..d7564d3f61 100644
--- a/src/applications/differential/view/DifferentialRevisionListView.php
+++ b/src/applications/differential/view/DifferentialRevisionListView.php
@@ -75,7 +75,6 @@ final class DifferentialRevisionListView extends AphrontView {
     $this->requireResource('aphront-tooltip-css');
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
 
     foreach ($this->revisions as $revision) {
       $item = id(new PHUIObjectItemView())
diff --git a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
index 4486da3a1e..e162bc0768 100644
--- a/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
+++ b/src/applications/harbormaster/query/HarbormasterBuildableSearchEngine.php
@@ -185,7 +185,6 @@ final class HarbormasterBuildableSearchEngine
     $viewer = $this->requireViewer();
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     foreach ($buildables as $buildable) {
       $id = $buildable->getID();
 
diff --git a/src/applications/herald/query/HeraldRuleSearchEngine.php b/src/applications/herald/query/HeraldRuleSearchEngine.php
index 5f912253d1..025536c5b5 100644
--- a/src/applications/herald/query/HeraldRuleSearchEngine.php
+++ b/src/applications/herald/query/HeraldRuleSearchEngine.php
@@ -173,8 +173,7 @@ final class HeraldRuleSearchEngine
     $content_type_map = HeraldAdapter::getEnabledAdapterMap($viewer);
 
     $list = id(new PHUIObjectItemListView())
-      ->setUser($viewer)
-      ->setCards(true);
+      ->setUser($viewer);
     foreach ($rules as $rule) {
       $id = $rule->getID();
 
diff --git a/src/applications/herald/query/HeraldTranscriptSearchEngine.php b/src/applications/herald/query/HeraldTranscriptSearchEngine.php
index 7b17f89608..46f97d99cc 100644
--- a/src/applications/herald/query/HeraldTranscriptSearchEngine.php
+++ b/src/applications/herald/query/HeraldTranscriptSearchEngine.php
@@ -108,7 +108,6 @@ final class HeraldTranscriptSearchEngine
     $viewer = $this->requireViewer();
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     foreach ($transcripts as $xscript) {
       $view_href = phutil_tag(
         'a',
diff --git a/src/applications/herald/view/HeraldRuleEditHistoryView.php b/src/applications/herald/view/HeraldRuleEditHistoryView.php
index d4cb132e33..0ca5a6fc5a 100644
--- a/src/applications/herald/view/HeraldRuleEditHistoryView.php
+++ b/src/applications/herald/view/HeraldRuleEditHistoryView.php
@@ -23,7 +23,6 @@ final class HeraldRuleEditHistoryView extends AphrontView {
   public function render() {
     $list = new PHUIObjectItemListView();
     $list->setFlush(true);
-    $list->setCards(true);
 
     foreach ($this->edits as $edit) {
       $name = nonempty($edit->getRuleName(), 'Unknown Rule');
diff --git a/src/applications/home/controller/PhabricatorHomeQuickCreateController.php b/src/applications/home/controller/PhabricatorHomeQuickCreateController.php
index 2c1bd0ea2d..cf4394daad 100644
--- a/src/applications/home/controller/PhabricatorHomeQuickCreateController.php
+++ b/src/applications/home/controller/PhabricatorHomeQuickCreateController.php
@@ -9,7 +9,6 @@ final class PhabricatorHomeQuickCreateController
     $items = $this->getCurrentApplication()->loadAllQuickCreateItems($viewer);
 
     $list = id(new PHUIObjectItemListView())
-      ->setCards(true)
       ->setUser($viewer);
 
     foreach ($items as $item) {
diff --git a/src/applications/maniphest/view/ManiphestTaskListView.php b/src/applications/maniphest/view/ManiphestTaskListView.php
index a46cd88ef1..bb9e82ee50 100644
--- a/src/applications/maniphest/view/ManiphestTaskListView.php
+++ b/src/applications/maniphest/view/ManiphestTaskListView.php
@@ -36,7 +36,6 @@ final class ManiphestTaskListView extends ManiphestView {
     $handles = $this->handles;
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     $list->setFlush(true);
 
     $status_map = ManiphestTaskStatus::getTaskStatusMap();
diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php
index 7c836aeaf3..559e478423 100644
--- a/src/applications/phriction/controller/PhrictionDiffController.php
+++ b/src/applications/phriction/controller/PhrictionDiffController.php
@@ -260,7 +260,6 @@ final class PhrictionDiffController
     $handles = $this->loadViewerHandles($phids);
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     $list->setFlush(true);
 
     $first = true;
diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php
index a5e00d5633..9ee8352e36 100644
--- a/src/applications/phriction/controller/PhrictionHistoryController.php
+++ b/src/applications/phriction/controller/PhrictionHistoryController.php
@@ -40,7 +40,6 @@ final class PhrictionHistoryController
     $handles = $this->loadViewerHandles($author_phids);
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     $list->setFlush(true);
 
     foreach ($history as $content) {
diff --git a/src/applications/project/controller/PhabricatorProjectBoardViewController.php b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
index ea95cf4c77..b581f5fad8 100644
--- a/src/applications/project/controller/PhabricatorProjectBoardViewController.php
+++ b/src/applications/project/controller/PhabricatorProjectBoardViewController.php
@@ -173,7 +173,6 @@ final class PhabricatorProjectBoardViewController
 
       $cards = id(new PHUIObjectItemListView())
         ->setUser($viewer)
-        ->setCards(true)
         ->setFlush(true)
         ->setAllowEmptyList(true)
         ->addSigil('project-column')
diff --git a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
index 12f37071e8..bb3aee78d4 100644
--- a/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
+++ b/src/applications/repository/query/PhabricatorRepositorySearchEngine.php
@@ -234,7 +234,6 @@ final class PhabricatorRepositorySearchEngine
     $viewer = $this->requireViewer();;
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     foreach ($repositories as $repository) {
       $id = $repository->getID();
 
diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php b/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
index 284da8da70..5faaf5672d 100644
--- a/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
+++ b/src/applications/settings/panel/PhabricatorSettingsPanelExternalAccounts.php
@@ -35,7 +35,6 @@ final class PhabricatorSettingsPanelExternalAccounts
 
     $linked = id(new PHUIObjectItemListView())
       ->setUser($viewer)
-      ->setCards(true)
       ->setFlush(true)
       ->setNoDataString(pht('You have no linked accounts.'));
 
@@ -99,7 +98,6 @@ final class PhabricatorSettingsPanelExternalAccounts
 
     $linkable = id(new PHUIObjectItemListView())
       ->setUser($viewer)
-      ->setCards(true)
       ->setFlush(true)
       ->setNoDataString(
         pht('Your account is linked with all available providers.'));
diff --git a/src/applications/uiexample/examples/PHUIObjectItemListExample.php b/src/applications/uiexample/examples/PHUIObjectItemListExample.php
index 56feae761c..370276eaa6 100644
--- a/src/applications/uiexample/examples/PHUIObjectItemListExample.php
+++ b/src/applications/uiexample/examples/PHUIObjectItemListExample.php
@@ -113,7 +113,6 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
     $head = id(new PHUIHeaderView())
       ->setHeader(pht('Card List'));
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
 
     $list->addItem(
       id(new PHUIObjectItemView())
@@ -161,7 +160,6 @@ final class PHUIObjectItemListExample extends PhabricatorUIExample {
     $head = id(new PHUIHeaderView())
       ->setHeader(pht('Grippable List'));
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
 
     $list->addItem(
       id(new PHUIObjectItemView())
diff --git a/src/applications/uiexample/examples/PHUIWorkboardExample.php b/src/applications/uiexample/examples/PHUIWorkboardExample.php
index 342f51b679..4500215341 100644
--- a/src/applications/uiexample/examples/PHUIWorkboardExample.php
+++ b/src/applications/uiexample/examples/PHUIWorkboardExample.php
@@ -15,7 +15,6 @@ final class PHUIWorkboardExample extends PhabricatorUIExample {
     /* List 1 */
 
     $list = new PHUIObjectItemListView();
-    $list->setCards(true);
     $list->setFlush(true);
 
     $list->addItem(
@@ -43,7 +42,6 @@ final class PHUIWorkboardExample extends PhabricatorUIExample {
     /* List 2 */
 
     $list2 = new PHUIObjectItemListView();
-    $list2->setCards(true);
     $list2->setFlush(true);
 
     $list2->addItem(
@@ -58,7 +56,6 @@ final class PHUIWorkboardExample extends PhabricatorUIExample {
     /* List 3 */
 
     $list3 = new PHUIObjectItemListView();
-    $list3->setCards(true);
     $list3->setFlush(true);
 
     $list3->addItem(
@@ -100,7 +97,6 @@ final class PHUIWorkboardExample extends PhabricatorUIExample {
         ->setBarColor('orange'));
 
     $panel = id(new PHUIWorkpanelView())
-          ->setCards($list)
           ->setHeader('Business Stuff')
           ->setFooterAction(
             id(new PHUIListItemView())
@@ -109,11 +105,9 @@ final class PHUIWorkboardExample extends PhabricatorUIExample {
               ->setHref('/maniphest/task/create/'));
 
     $panel2 = id(new PHUIWorkpanelView())
-          ->setCards($list2)
           ->setHeader('Under Duress');
 
     $panel3 = id(new PHUIWorkpanelView())
-          ->setCards($list3)
           ->setHeader('Spicy Thai Chicken');
 
     $board = id(new PHUIWorkboardView())
diff --git a/src/view/phui/PHUIObjectItemListView.php b/src/view/phui/PHUIObjectItemListView.php
index 4dff2e18ce..87d333044c 100644
--- a/src/view/phui/PHUIObjectItemListView.php
+++ b/src/view/phui/PHUIObjectItemListView.php
@@ -6,7 +6,6 @@ final class PHUIObjectItemListView extends AphrontTagView {
   private $items;
   private $pager;
   private $stackable;
-  private $cards;
   private $noDataString;
   private $flush;
   private $plain;
@@ -58,11 +57,6 @@ final class PHUIObjectItemListView extends AphrontTagView {
     return $this;
   }
 
-  public function setCards($cards) {
-    $this->cards = $cards;
-    return $this;
-  }
-
   public function setStates($states) {
     $this->states = $states;
     return $this;
@@ -79,11 +73,9 @@ final class PHUIObjectItemListView extends AphrontTagView {
     if ($this->stackable) {
       $classes[] = 'phui-object-list-stackable';
     }
-    if ($this->cards) {
-      $classes[] = 'phui-object-list-cards';
-    }
     if ($this->states) {
       $classes[] = 'phui-object-list-states';
+      $classes[] = 'phui-object-list-stackable';
     }
     if ($this->flush) {
       $classes[] = 'phui-object-list-flush';
diff --git a/webroot/rsrc/css/phui/phui-object-item-list-view.css b/webroot/rsrc/css/phui/phui-object-item-list-view.css
index dd8d09438f..d4f17ee3de 100644
--- a/webroot/rsrc/css/phui/phui-object-item-list-view.css
+++ b/webroot/rsrc/css/phui/phui-object-item-list-view.css
@@ -34,12 +34,14 @@
 }
 
 .phui-object-item {
-  background: #fff;
   border-style: solid;
   border-color: {$lightgreyborder};
-  border-width: 0 0 0 4px;
   margin: 5px 0;
   overflow: hidden;
+  border-radius: 3px;
+  border-left-width: 6px;
+  background: #f0f0f0 url('/rsrc/image/texture/card-gradient.png') repeat-x;
+  margin-bottom: 4px;
 }
 
 .phui-object-item .phui-icon-view {
@@ -54,9 +56,6 @@
   position: relative;
   min-height: 29px;
   overflow: hidden;
-}
-
-.phui-object-list-cards .phui-object-item-frame {
   border-bottom-right-radius: 3px;
   border-top-right-radius: 3px;
 }
@@ -187,10 +186,16 @@
 .phui-object-item-list-view.phui-object-list-stackable
   .phui-object-item {
   margin: -1px 0 0 0;
+  border-radius: 0;
+  border-left-width: 1px;
+  background: #fff;
+}
+
+.phui-object-list-stackable .phui-object-item-frame {
+  border-radius: 0;
 }
 
 .phui-object-list-stackable .phui-object-item {
-  border-left-width: 1px;
 }
 
 .device-desktop .phui-object-list-stackable
@@ -435,14 +440,18 @@
   background: {$lightyellow};
 }
 
-.phui-object-list-cards
- .phui-object-item.phui-object-item-highlighted {
+.phui-object-item.phui-object-item-highlighted {
   background-image: linear-gradient(to bottom, rgb(253, 255, 221), rgb(243, 245, 206));
   background-image: -webkit-linear-gradient(top, rgb(253, 255, 221), rgb(243, 245, 206));
 }
 
 .phui-object-item-selected {
   background: {$lightblue};
+  border-left-color: {$blue};
+}
+
+.phui-object-item-selected .phui-object-item-frame {
+  border-color: {$blue};
 }
 
 
@@ -531,33 +540,6 @@
   font-size: 13px;
 }
 
-/* - Card List -----------------------------------------------------------------
-
-  Rounded card list.
-
-*/
-
-/* Hard to sprite since we can't have other sprites appearing in tall cells */
-.phui-object-list-cards .phui-object-item {
-  border-radius: 3px;
-  border-left-width: 6px;
-  background: #f0f0f0 url('/rsrc/image/texture/card-gradient.png') repeat-x;
-  margin-bottom: 4px;
-}
-
-.phui-object-list-cards .phui-object-item-frame {
-  min-height: 50px;
-}
-
-.phui-object-list-cards .phui-object-item-selected {
-  background: #bfdcff;
-}
-
-.phui-object-list-cards .phui-object-item-selected
-  .phui-object-item-frame {
-  border-color: #99ccff;
-}
-
 
 /* - Draggable List ------------------------------------------------------------