diff --git a/src/applications/dashboard/storage/PhabricatorDashboard.php b/src/applications/dashboard/storage/PhabricatorDashboard.php
index b79fded93f..2e673de19c 100644
--- a/src/applications/dashboard/storage/PhabricatorDashboard.php
+++ b/src/applications/dashboard/storage/PhabricatorDashboard.php
@@ -1,194 +1,202 @@
 <?php
 
 /**
  * A collection of dashboard panels with a specific layout.
  */
 final class PhabricatorDashboard extends PhabricatorDashboardDAO
   implements
     PhabricatorApplicationTransactionInterface,
     PhabricatorPolicyInterface,
     PhabricatorFlaggableInterface,
     PhabricatorDestructibleInterface,
     PhabricatorProjectInterface,
     PhabricatorNgramsInterface {
 
   protected $name;
   protected $authorPHID;
   protected $viewPolicy;
   protected $editPolicy;
   protected $status;
   protected $icon;
   protected $layoutConfig = array();
 
   const STATUS_ACTIVE = 'active';
   const STATUS_ARCHIVED = 'archived';
 
   private $panelPHIDs = self::ATTACHABLE;
   private $panels = self::ATTACHABLE;
   private $edgeProjectPHIDs = self::ATTACHABLE;
 
 
   public static function initializeNewDashboard(PhabricatorUser $actor) {
     return id(new PhabricatorDashboard())
       ->setName('')
       ->setIcon('fa-dashboard')
       ->setViewPolicy(PhabricatorPolicies::getMostOpenPolicy())
       ->setEditPolicy($actor->getPHID())
       ->setStatus(self::STATUS_ACTIVE)
       ->setAuthorPHID($actor->getPHID())
       ->attachPanels(array())
       ->attachPanelPHIDs(array());
   }
 
   public static function getStatusNameMap() {
     return array(
       self::STATUS_ACTIVE => pht('Active'),
       self::STATUS_ARCHIVED => pht('Archived'),
     );
   }
 
   protected function getConfiguration() {
     return array(
       self::CONFIG_AUX_PHID => true,
       self::CONFIG_SERIALIZATION => array(
         'layoutConfig' => self::SERIALIZATION_JSON,
       ),
       self::CONFIG_COLUMN_SCHEMA => array(
         'name' => 'sort255',
         'status' => 'text32',
         'icon' => 'text32',
         'authorPHID' => 'phid',
       ),
     ) + parent::getConfiguration();
   }
 
   public function generatePHID() {
     return PhabricatorPHID::generateNewPHID(
       PhabricatorDashboardDashboardPHIDType::TYPECONST);
   }
 
   public function getLayoutConfigObject() {
     return PhabricatorDashboardLayoutConfig::newFromDictionary(
       $this->getLayoutConfig());
   }
 
   public function setLayoutConfigFromObject(
     PhabricatorDashboardLayoutConfig $object) {
+
     $this->setLayoutConfig($object->toDictionary());
+
+    // See PHI385. Dashboard panel mutations rely on changes to the Dashboard
+    // object persisting when transactions are applied, but this assumption is
+    // no longer valid after T13054. For now, just save the dashboard
+    // explicitly.
+    $this->save();
+
     return $this;
   }
 
   public function getProjectPHIDs() {
     return $this->assertAttached($this->edgeProjectPHIDs);
   }
 
   public function attachProjectPHIDs(array $phids) {
     $this->edgeProjectPHIDs = $phids;
     return $this;
   }
 
   public function attachPanelPHIDs(array $phids) {
     $this->panelPHIDs = $phids;
     return $this;
   }
 
   public function getPanelPHIDs() {
     return $this->assertAttached($this->panelPHIDs);
   }
 
   public function attachPanels(array $panels) {
     assert_instances_of($panels, 'PhabricatorDashboardPanel');
     $this->panels = $panels;
     return $this;
   }
 
   public function getPanels() {
     return $this->assertAttached($this->panels);
   }
 
   public function isArchived() {
     return ($this->getStatus() == self::STATUS_ARCHIVED);
   }
 
   public function getViewURI() {
     return '/dashboard/view/'.$this->getID().'/';
   }
 
 
 /* -(  PhabricatorApplicationTransactionInterface  )------------------------- */
 
 
   public function getApplicationTransactionEditor() {
     return new PhabricatorDashboardTransactionEditor();
   }
 
   public function getApplicationTransactionObject() {
     return $this;
   }
 
   public function getApplicationTransactionTemplate() {
     return new PhabricatorDashboardTransaction();
   }
 
   public function willRenderTimeline(
     PhabricatorApplicationTransactionView $timeline,
     AphrontRequest $request) {
 
     return $timeline;
   }
 
 
 /* -(  PhabricatorPolicyInterface  )----------------------------------------- */
 
 
   public function getCapabilities() {
     return array(
       PhabricatorPolicyCapability::CAN_VIEW,
       PhabricatorPolicyCapability::CAN_EDIT,
     );
   }
 
   public function getPolicy($capability) {
     switch ($capability) {
       case PhabricatorPolicyCapability::CAN_VIEW:
         return $this->getViewPolicy();
       case PhabricatorPolicyCapability::CAN_EDIT:
         return $this->getEditPolicy();
     }
   }
 
   public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
     return false;
   }
 
 
 /* -(  PhabricatorDestructibleInterface  )----------------------------------- */
 
 
   public function destroyObjectPermanently(
     PhabricatorDestructionEngine $engine) {
 
     $this->openTransaction();
       $installs = id(new PhabricatorDashboardInstall())->loadAllWhere(
         'dashboardPHID = %s',
         $this->getPHID());
       foreach ($installs as $install) {
         $install->delete();
       }
 
       $this->delete();
     $this->saveTransaction();
   }
 
 
 /* -(  PhabricatorNgramInterface  )------------------------------------------ */
 
 
   public function newNgrams() {
     return array(
       id(new PhabricatorDashboardNgrams())
         ->setValue($this->getName()),
     );
   }
 
 }
diff --git a/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php b/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
index d534d32adc..8bbdb1a5e5 100644
--- a/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
+++ b/src/applications/dashboard/typeahead/PhabricatorDashboardPanelDatasource.php
@@ -1,64 +1,66 @@
 <?php
 
 final class PhabricatorDashboardPanelDatasource
   extends PhabricatorTypeaheadDatasource {
 
   public function getBrowseTitle() {
     return pht('Browse Dashboard Panels');
   }
 
   public function getPlaceholderText() {
     return pht('Type a panel name...');
   }
 
   public function getDatasourceApplicationClass() {
     return 'PhabricatorDashboardApplication';
   }
 
   public function loadResults() {
     $results = $this->buildResults();
     return $this->filterResultsAgainstTokens($results);
   }
 
 
   protected function renderSpecialTokens(array $values) {
     return $this->renderTokensFromResults($this->buildResults(), $values);
   }
 
   public function buildResults() {
     $query = id(new PhabricatorDashboardPanelQuery());
     $panels = $this->executeQuery($query);
 
     $results = array();
     foreach ($panels as $panel) {
       $impl = $panel->getImplementation();
       if ($impl) {
         $type_text = $impl->getPanelTypeName();
+        $icon = $impl->getIcon();
       } else {
         $type_text = nonempty($panel->getPanelType(), pht('Unknown Type'));
+        $icon = 'fa-question';
       }
       $id = $panel->getID();
       $monogram = $panel->getMonogram();
       $properties = $panel->getProperties();
 
       $result = id(new PhabricatorTypeaheadResult())
         ->setName($monogram.' '.$panel->getName())
         ->setPHID($id)
-        ->setIcon($impl->getIcon())
+        ->setIcon($icon)
         ->addAttribute($type_text);
 
       if (!empty($properties['class'])) {
         $result->addAttribute($properties['class']);
       }
 
       if ($panel->getIsArchived()) {
         $result->setClosed(pht('Archived'));
       }
 
       $results[$id] = $result;
     }
 
     return $results;
   }
 
 }