diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 6ce1ebc7d4..60aa974cbe 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => 'd3651813',
+    'core.pkg.css' => 'bf29d341',
     'core.pkg.js' => '347cd64a',
     'darkconsole.pkg.js' => '8ab24e01',
     'differential.pkg.css' => '3500921f',
@@ -37,20 +37,20 @@ return array(
     'rsrc/css/application/base/main-menu-view.css' => 'c648b2f5',
     'rsrc/css/application/base/notification-menu.css' => '3c9d8aa1',
     'rsrc/css/application/base/phabricator-application-launch-view.css' => '16ca323f',
-    'rsrc/css/application/base/standard-page-view.css' => 'd2a6518d',
+    'rsrc/css/application/base/standard-page-view.css' => 'd3e1abe9',
     'rsrc/css/application/chatlog/chatlog.css' => '852140ff',
     'rsrc/css/application/config/config-options.css' => '7fedf08b',
     'rsrc/css/application/config/config-template.css' => '8e6c6fcd',
     'rsrc/css/application/config/config-welcome.css' => '6abd79be',
     'rsrc/css/application/config/setup-issue.css' => '22270af2',
     'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
-    'rsrc/css/application/conpherence/durable-column.css' => '51c1e074',
+    'rsrc/css/application/conpherence/durable-column.css' => '5faebda3',
     'rsrc/css/application/conpherence/menu.css' => 'f389e048',
-    'rsrc/css/application/conpherence/message-pane.css' => '18ac5e85',
+    'rsrc/css/application/conpherence/message-pane.css' => 'e7c09fda',
     'rsrc/css/application/conpherence/notification.css' => 'd208f806',
     'rsrc/css/application/conpherence/transaction.css' => '25138b7f',
     'rsrc/css/application/conpherence/update.css' => '1099a660',
-    'rsrc/css/application/conpherence/widget-pane.css' => 'a9082fd0',
+    'rsrc/css/application/conpherence/widget-pane.css' => '2af42ebe',
     'rsrc/css/application/contentsource/content-source-view.css' => '4b8b05d4',
     'rsrc/css/application/countdown/timer.css' => '86b7b0a0',
     'rsrc/css/application/dashboard/dashboard.css' => '17937d22',
@@ -110,7 +110,7 @@ return array(
     'rsrc/css/core/core.css' => '76e8ee93',
     'rsrc/css/core/remarkup.css' => 'e10512ff',
     'rsrc/css/core/syntax.css' => '56c1ba38',
-    'rsrc/css/core/z-index.css' => 'd1a30710',
+    'rsrc/css/core/z-index.css' => '72110fd4',
     'rsrc/css/diviner/diviner-shared.css' => '38813222',
     'rsrc/css/font/font-awesome.css' => 'ae9a7b4d',
     'rsrc/css/font/font-source-sans-pro.css' => '4a2430d7',
@@ -150,7 +150,7 @@ return array(
     'rsrc/css/phui/phui-tag-view.css' => 'ea469f3a',
     'rsrc/css/phui/phui-text.css' => 'cf019f54',
     'rsrc/css/phui/phui-timeline-view.css' => 'b0fbc4d7',
-    'rsrc/css/phui/phui-workboard-view.css' => '8896938c',
+    'rsrc/css/phui/phui-workboard-view.css' => '3279cbbf',
     'rsrc/css/phui/phui-workpanel-view.css' => 'e495a5cc',
     'rsrc/css/sprite-gradient.css' => '4bdb98a7',
     'rsrc/css/sprite-login.css' => 'a355d921',
@@ -518,14 +518,14 @@ return array(
     'changeset-view-manager' => '58562350',
     'config-options-css' => '7fedf08b',
     'config-welcome-css' => '6abd79be',
-    'conpherence-durable-column-view' => '51c1e074',
+    'conpherence-durable-column-view' => '5faebda3',
     'conpherence-menu-css' => 'f389e048',
-    'conpherence-message-pane-css' => '18ac5e85',
+    'conpherence-message-pane-css' => 'e7c09fda',
     'conpherence-notification-css' => 'd208f806',
     'conpherence-thread-manager' => '0a5192c4',
     'conpherence-transaction-css' => '25138b7f',
     'conpherence-update-css' => '1099a660',
-    'conpherence-widget-pane-css' => 'a9082fd0',
+    'conpherence-widget-pane-css' => '2af42ebe',
     'differential-changeset-view-css' => 'e19cfd6e',
     'differential-core-view-css' => '7ac3cabc',
     'differential-inline-comment-editor' => '2529c82d',
@@ -752,7 +752,7 @@ return array(
     'phabricator-side-menu-view-css' => '7e8c6341',
     'phabricator-slowvote-css' => '266df6a1',
     'phabricator-source-code-view-css' => '2ceee894',
-    'phabricator-standard-page-view' => 'd2a6518d',
+    'phabricator-standard-page-view' => 'd3e1abe9',
     'phabricator-textareautils' => '5c93c52c',
     'phabricator-title' => 'df5e11d2',
     'phabricator-tooltip' => '1d298e3a',
@@ -767,7 +767,7 @@ return array(
     'phabricator-uiexample-reactor-select' => 'a155550f',
     'phabricator-uiexample-reactor-sendclass' => '1def2711',
     'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
-    'phabricator-zindex-css' => 'd1a30710',
+    'phabricator-zindex-css' => '72110fd4',
     'phame-css' => '88bd4705',
     'pholio-css' => '95174bdd',
     'pholio-edit-css' => '3ad9d1ee',
@@ -809,7 +809,7 @@ return array(
     'phui-tag-view-css' => 'ea469f3a',
     'phui-text-css' => 'cf019f54',
     'phui-timeline-view-css' => 'b0fbc4d7',
-    'phui-workboard-view-css' => '8896938c',
+    'phui-workboard-view-css' => '3279cbbf',
     'phui-workpanel-view-css' => 'e495a5cc',
     'phuix-action-list-view' => 'b5c256b8',
     'phuix-action-view' => '6e8cefa4',
diff --git a/src/view/page/PhabricatorStandardPageView.php b/src/view/page/PhabricatorStandardPageView.php
index 4971c917f4..149f69abad 100644
--- a/src/view/page/PhabricatorStandardPageView.php
+++ b/src/view/page/PhabricatorStandardPageView.php
@@ -392,7 +392,9 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
         'class' => 'phabricator-standard-page',
       ),
       array(
+        $developer_warning,
         $header_chrome,
+        $setup_warning,
         phutil_tag(
           'div',
           array(
@@ -422,8 +424,6 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
         'class' => implode(' ', $classes),
       ),
       array(
-        $developer_warning,
-        $setup_warning,
         $main_page,
         $durable_column,
       ));
diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css
index f1ae527106..b2d7fff276 100644
--- a/webroot/rsrc/css/application/base/standard-page-view.css
+++ b/webroot/rsrc/css/application/base/standard-page-view.css
@@ -111,9 +111,14 @@ a.handle-disabled {
 }
 
 .setup-warning-callout {
-  position: relative;
   padding: 8px 16px;
-  background: {$lightyellow};
+  background: {$lightred};
+  border-bottom: 1px solid {$sh-redborder};
+  position: relative;
+}
+
+.setup-warning-callout a {
+  color: {$red};
 }
 
 .phui-handle .phui-icon-view {
diff --git a/webroot/rsrc/css/application/conpherence/durable-column.css b/webroot/rsrc/css/application/conpherence/durable-column.css
index 574dc94aff..9e6f39ea46 100644
--- a/webroot/rsrc/css/application/conpherence/durable-column.css
+++ b/webroot/rsrc/css/application/conpherence/durable-column.css
@@ -29,10 +29,6 @@
   background: #fff;
 }
 
-.page-has-warning .conpherence-durable-column {
-  top: 32px;
-}
-
 .conpherence-durable-column .loading-mask {
   position: absolute;
   top: 90px;
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
index 63a7eecbd2..fa78b622e5 100644
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -61,6 +61,10 @@
   -webkit-overflow-scrolling: touch;
 }
 
+.page-has-warning .conpherence-message-pane .conpherence-messages {
+  top: 110px;
+}
+
 .conpherence-messages.jx-scrollbar-frame {
   overflow-y: hidden;
 }
diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css
index 164ea1ebfa..388cb42032 100644
--- a/webroot/rsrc/css/application/conpherence/widget-pane.css
+++ b/webroot/rsrc/css/application/conpherence/widget-pane.css
@@ -16,6 +16,11 @@
   -webkit-overflow-scrolling: touch;
 }
 
+.page-has-warning .conpherence-widget-pane,
+.page-had-warning .loading .widgets-loading-mask {
+  top: 110px;
+}
+
 .device .conpherence-widget-pane,
 .device .loading .widgets-loading-mask {
   top: 44px;
@@ -82,6 +87,10 @@
   width: 240px;
 }
 
+.device-desktop .page-has-warning .conpherence-widget-pane .widgets-body {
+  top: 142px;
+}
+
 /* files widget */
 
 .conpherence-widget-pane #widgets-files .no-files {
diff --git a/webroot/rsrc/css/core/z-index.css b/webroot/rsrc/css/core/z-index.css
index a9284818d1..d349532642 100644
--- a/webroot/rsrc/css/core/z-index.css
+++ b/webroot/rsrc/css/core/z-index.css
@@ -6,6 +6,7 @@
   z-index: -1;
 }
 
+.setup-warning-callout,
 .keyboard-focus-focus-reticle {
   z-index: 1;
 }
@@ -86,7 +87,6 @@
   z-index: 6;
 }
 
-.setup-warning-callout,
 .aphront-developer-error-callout {
   z-index: 6;
 }
diff --git a/webroot/rsrc/css/phui/phui-workboard-view.css b/webroot/rsrc/css/phui/phui-workboard-view.css
index eab522b6fe..796fbc6fe5 100644
--- a/webroot/rsrc/css/phui/phui-workboard-view.css
+++ b/webroot/rsrc/css/phui/phui-workboard-view.css
@@ -15,6 +15,10 @@
   right: 0;
 }
 
+.device-desktop .page-has-warning .phui-workboard-view-shadow {
+  top: 148px;
+}
+
 .phui-workboard-view-shadow::-webkit-scrollbar {
   height: 12px;
   width: 12px;