diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php
index 0e13ea08fd..36f0b86202 100644
--- a/src/applications/differential/controller/DifferentialDiffCreateController.php
+++ b/src/applications/differential/controller/DifferentialDiffCreateController.php
@@ -1,217 +1,212 @@
 <?php
 
 final class DifferentialDiffCreateController extends DifferentialController {
 
   public function handleRequest(AphrontRequest $request) {
     $viewer = $this->getViewer();
 
     // If we're on the "Update Diff" workflow, load the revision we're going
     // to update.
     $revision = null;
     $revision_id = $request->getURIData('revisionID');
     if ($revision_id) {
       $revision = id(new DifferentialRevisionQuery())
         ->setViewer($viewer)
         ->withIDs(array($revision_id))
         ->requireCapabilities(
           array(
             PhabricatorPolicyCapability::CAN_VIEW,
             PhabricatorPolicyCapability::CAN_EDIT,
           ))
         ->executeOne();
       if (!$revision) {
         return new Aphront404Response();
       }
     }
 
     $diff = null;
     // This object is just for policy stuff
     $diff_object = DifferentialDiff::initializeNewDiff($viewer);
     $repository_phid = null;
     $errors = array();
     $e_diff = null;
     $e_file = null;
     $validation_exception = null;
     if ($request->isFormPost()) {
 
       $repository_tokenizer = $request->getArr(
         id(new DifferentialRepositoryField())->getFieldKey());
       if ($repository_tokenizer) {
         $repository_phid = reset($repository_tokenizer);
       }
 
       if ($request->getFileExists('diff-file')) {
         $diff = PhabricatorFile::readUploadedFileData($_FILES['diff-file']);
       } else {
         $diff = $request->getStr('diff');
       }
 
       if (!strlen($diff)) {
         $errors[] = pht(
           'You can not create an empty diff. Paste a diff or upload a '.
           'file containing a diff.');
         $e_diff = pht('Required');
         $e_file = pht('Required');
       }
 
       if (!$errors) {
         try {
           $call = new ConduitCall(
             'differential.createrawdiff',
             array(
               'diff' => $diff,
               'repositoryPHID' => $repository_phid,
               'viewPolicy' => $request->getStr('viewPolicy'),
             ));
           $call->setUser($viewer);
           $result = $call->execute();
 
           $diff_id = $result['id'];
 
           $uri = $this->getApplicationURI("diff/{$diff_id}/");
           $uri = new PhutilURI($uri);
           if ($revision) {
             $uri->setQueryParam('revisionID', $revision->getID());
           }
 
           return id(new AphrontRedirectResponse())->setURI($uri);
         } catch (PhabricatorApplicationTransactionValidationException $ex) {
           $validation_exception = $ex;
         }
       }
     }
 
     $form = new AphrontFormView();
     $arcanist_href = PhabricatorEnv::getDoclink('Arcanist User Guide');
     $arcanist_link = phutil_tag(
       'a',
       array(
         'href' => $arcanist_href,
         'target' => '_blank',
       ),
       pht('Learn More'));
 
     $cancel_uri = $this->getApplicationURI();
 
     $policies = id(new PhabricatorPolicyQuery())
       ->setViewer($viewer)
       ->setObject($diff_object)
       ->execute();
 
     $info_view = null;
     if (!$request->isFormPost()) {
       $info_view = id(new PHUIInfoView())
         ->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
         ->setErrors(
           array(
             array(
               pht(
                 'The best way to create a diff is to use the Arcanist '.
                 'command-line tool.'),
               ' ',
               $arcanist_link,
             ),
             pht(
               'You can also paste a diff below, or upload a file '.
               'containing a diff (for example, from %s, %s or %s).',
               phutil_tag('tt', array(), 'svn diff'),
               phutil_tag('tt', array(), 'git diff'),
               phutil_tag('tt', array(), 'hg diff --git')),
           ));
     }
 
     if ($revision) {
       $title = pht('Update Diff');
       $header = pht('Update Diff');
       $button = pht('Continue');
       $header_icon = 'fa-upload';
     } else {
       $title = pht('Create Diff');
       $header = pht('Create New Diff');
       $button = pht('Create Diff');
       $header_icon = 'fa-plus-square';
     }
 
     $form
       ->setEncType('multipart/form-data')
       ->setUser($viewer);
 
     if ($revision) {
       $form->appendChild(
         id(new AphrontFormMarkupControl())
           ->setLabel(pht('Updating Revision'))
           ->setValue($viewer->renderHandle($revision->getPHID())));
     }
 
     if ($repository_phid) {
       $repository_value = array($repository_phid);
     } else {
       $repository_value = array();
     }
 
     $form
       ->appendChild(
         id(new AphrontFormTextAreaControl())
           ->setLabel(pht('Raw Diff'))
           ->setName('diff')
           ->setValue($diff)
           ->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL)
           ->setError($e_diff))
       ->appendChild(
         id(new AphrontFormFileControl())
           ->setLabel(pht('Raw Diff From File'))
           ->setName('diff-file')
           ->setError($e_file))
       ->appendControl(
         id(new AphrontFormTokenizerControl())
           ->setName(id(new DifferentialRepositoryField())->getFieldKey())
           ->setLabel(pht('Repository'))
           ->setDatasource(new DiffusionRepositoryDatasource())
           ->setValue($repository_value)
           ->setLimit(1))
       ->appendChild(
         id(new AphrontFormPolicyControl())
           ->setUser($viewer)
           ->setName('viewPolicy')
           ->setPolicyObject($diff_object)
           ->setPolicies($policies)
           ->setCapability(PhabricatorPolicyCapability::CAN_VIEW))
       ->appendChild(
         id(new AphrontFormSubmitControl())
           ->addCancelButton($cancel_uri)
           ->setValue($button));
 
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Diff'))
+      ->setHeaderText($title)
       ->setValidationException($validation_exception)
       ->setForm($form)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setFormErrors($errors);
 
     $crumbs = $this->buildApplicationCrumbs();
     if ($revision) {
       $crumbs->addTextCrumb(
         $revision->getMonogram(),
         '/'.$revision->getMonogram());
     }
     $crumbs->addTextCrumb($title);
     $crumbs->setBorder(true);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon($header_icon);
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter(array(
-        $info_view,
         $form_box,
+        $info_view,
       ));
 
     return $this->newPage()
       ->setTitle($title)
       ->setCrumbs($crumbs)
       ->appendChild($view);
   }
 
 }
diff --git a/src/view/phui/PHUIInfoView.php b/src/view/phui/PHUIInfoView.php
index 18f5af3374..161e49108b 100644
--- a/src/view/phui/PHUIInfoView.php
+++ b/src/view/phui/PHUIInfoView.php
@@ -1,199 +1,200 @@
 <?php
 
 final class PHUIInfoView extends AphrontTagView {
 
   const SEVERITY_ERROR = 'error';
   const SEVERITY_WARNING = 'warning';
   const SEVERITY_NOTICE = 'notice';
   const SEVERITY_NODATA = 'nodata';
   const SEVERITY_SUCCESS = 'success';
   const SEVERITY_PLAIN = 'plain';
 
   private $title;
   private $errors;
   private $severity = null;
   private $id;
   private $buttons = array();
   private $isHidden;
   private $flush;
   private $icon;
 
   public function setTitle($title) {
     $this->title = $title;
     return $this;
   }
 
   public function setSeverity($severity) {
     $this->severity = $severity;
     return $this;
   }
 
   private function getSeverity() {
     $severity = $this->severity ? $this->severity : self::SEVERITY_ERROR;
     return $severity;
   }
 
   public function setErrors(array $errors) {
     $this->errors = $errors;
     return $this;
   }
 
   public function setID($id) {
     $this->id = $id;
     return $this;
   }
 
   public function setIsHidden($bool) {
     $this->isHidden = $bool;
     return $this;
   }
 
   public function setFlush($flush) {
     $this->flush = $flush;
     return $this;
   }
 
   public function setIcon($icon) {
     if ($icon instanceof PHUIIconView) {
       $this->icon = $icon;
     } else {
       $icon = id(new PHUIIconView())
         ->setIcon($icon);
+      $this->icon = $icon;
     }
 
     return $this;
   }
 
   private function getIcon() {
     if ($this->icon) {
       return $this->icon;
     }
 
     switch ($this->getSeverity()) {
       case self::SEVERITY_ERROR:
         $icon = 'fa-exclamation-circle';
       break;
       case self::SEVERITY_WARNING:
         $icon = 'fa-exclamation-triangle';
       break;
       case self::SEVERITY_NOTICE:
         $icon = 'fa-info-circle';
       break;
       case self::SEVERITY_PLAIN:
       case self::SEVERITY_NODATA:
         return null;
       break;
       case self::SEVERITY_SUCCESS:
         $icon = 'fa-check-circle';
       break;
     }
 
     $icon = id(new PHUIIconView())
       ->setIcon($icon)
       ->addClass('phui-info-icon');
     return $icon;
   }
 
   public function addButton(PHUIButtonView $button) {
     $this->buttons[] = $button;
     return $this;
   }
 
   protected function getTagAttributes() {
     $classes = array();
     $classes[] = 'phui-info-view';
     $classes[] = 'phui-info-severity-'.$this->getSeverity();
     $classes[] = 'grouped';
     if ($this->flush) {
       $classes[] = 'phui-info-view-flush';
     }
     if ($this->getIcon()) {
       $classes[] = 'phui-info-has-icon';
     }
 
     return array(
       'id' => $this->id,
       'class' => implode(' ', $classes),
       'style' => $this->isHidden ? 'display: none;' : null,
     );
   }
 
   protected function getTagContent() {
     require_celerity_resource('phui-info-view-css');
 
     $errors = $this->errors;
     if (count($errors) > 1) {
       $list = array();
       foreach ($errors as $error) {
         $list[] = phutil_tag(
           'li',
           array(),
           $error);
       }
       $list = phutil_tag(
         'ul',
         array(
           'class' => 'phui-info-view-list',
         ),
         $list);
     } else if (count($errors) == 1) {
       $list = head($this->errors);
     } else {
       $list = null;
     }
 
     $title = $this->title;
     if (strlen($title)) {
       $title = phutil_tag(
         'h1',
         array(
           'class' => 'phui-info-view-head',
         ),
         $title);
     } else {
       $title = null;
     }
 
     $children = $this->renderChildren();
     if ($list) {
       $children[] = $list;
     }
 
     $body = null;
     if (!empty($children)) {
       $body = phutil_tag(
         'div',
         array(
           'class' => 'phui-info-view-body',
         ),
         $children);
     }
 
     $buttons = null;
     if (!empty($this->buttons)) {
       $buttons = phutil_tag(
         'div',
         array(
           'class' => 'phui-info-view-actions',
         ),
         $this->buttons);
     }
 
     $icon = null;
     if ($this->getIcon()) {
       $icon = phutil_tag(
         'div',
         array(
           'class' => 'phui-info-view-icon',
         ),
         $this->getIcon());
     }
 
     return array(
       $icon,
       $buttons,
       $title,
       $body,
     );
   }
 }