diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 78a5a57a0a..878bce2556 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '0d6f3284',
+    'core.pkg.css' => '5e324506',
     'core.pkg.js' => '59d01bb7',
     'darkconsole.pkg.js' => '6d16ff19',
     'differential.pkg.css' => '3500921f',
@@ -108,7 +108,7 @@ return array(
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '76e8ee93',
-    'rsrc/css/core/remarkup.css' => '60a27345',
+    'rsrc/css/core/remarkup.css' => '0037bdbf',
     'rsrc/css/core/syntax.css' => '56c1ba38',
     'rsrc/css/core/z-index.css' => '5a2b9d9d',
     'rsrc/css/diviner/diviner-shared.css' => '38813222',
@@ -131,7 +131,7 @@ return array(
     'rsrc/css/phui/phui-crumbs-view.css' => '594d719e',
     'rsrc/css/phui/phui-document.css' => '94d5dcd8',
     'rsrc/css/phui/phui-feed-story.css' => 'c9f3a0b5',
-    'rsrc/css/phui/phui-fontkit.css' => '81ed5e20',
+    'rsrc/css/phui/phui-fontkit.css' => '66fea602',
     'rsrc/css/phui/phui-form-view.css' => 'b147d2ed',
     'rsrc/css/phui/phui-form.css' => 'f535f938',
     'rsrc/css/phui/phui-header-view.css' => 'da4586b1',
@@ -746,7 +746,7 @@ return array(
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => '6920d200',
     'phabricator-profile-css' => '1a20dcbf',
-    'phabricator-remarkup-css' => '60a27345',
+    'phabricator-remarkup-css' => '0037bdbf',
     'phabricator-search-results-css' => '15c71110',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => '7e8c6341',
@@ -789,7 +789,7 @@ return array(
     'phui-document-view-css' => '94d5dcd8',
     'phui-feed-story-css' => 'c9f3a0b5',
     'phui-font-icon-base-css' => '3dad2ae3',
-    'phui-fontkit-css' => '81ed5e20',
+    'phui-fontkit-css' => '66fea602',
     'phui-form-css' => 'f535f938',
     'phui-form-view-css' => 'b147d2ed',
     'phui-header-view-css' => 'da4586b1',
diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
index 0e7807e3e1..63e4224ba3 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -26,9 +26,15 @@
 }
 
 .phabricator-remarkup .remarkup-code-header {
-  padding: 4px 1px;
+  padding: 2px 8px;
   font-size: 13px;
   font-weight: bold;
+  background: {$sh-yellowbackground};
+  display: inline-block;
+}
+
+.phabricator-remarkup .code-block-counterexample .remarkup-code-header {
+  background-color: {$sh-redbackground};
 }
 
 .phabricator-remarkup .remarkup-code-block pre {
@@ -42,8 +48,8 @@
 }
 
 .phabricator-remarkup pre.remarkup-counterexample {
-  border: 1px solid {$red};
-  background-color: {$lightred};
+  border: 1px solid {$sh-lightredborder};
+  background-color: {$sh-redbackground};
 }
 
 .phabricator-remarkup tt.remarkup-monospaced {
@@ -111,31 +117,31 @@
 .phabricator-remarkup h1.remarkup-header {
   font-size: 24px;
   line-height: 1.625em;
-  margin: 16px 0 4px;
+  margin: 24px 0 4px;
 }
 
 .phabricator-remarkup h2.remarkup-header {
   font-size: 20px;
   line-height: 1.5em;
-  margin: 16px 0 4px;
+  margin: 20px 0 4px;
 }
 
 .phabricator-remarkup h3.remarkup-header {
   font-size: 18px;
   line-height: 1.375em;
-  margin: 16px 0 4px;
+  margin: 20px 0 4px;
 }
 
 .phabricator-remarkup h4.remarkup-header {
   font-size: 15px;
   line-height: 1.25em;
-  margin: 8px 0 4px;
+  margin: 12px 0 4px;
 }
 
 .phabricator-remarkup h5.remarkup-header {
   font-size: 14px;
   line-height: 1.125em;
-  margin: 4px 0;
+  margin: 8px 0 4px;
 }
 
 .phabricator-remarkup h6.remarkup-header {
@@ -517,3 +523,8 @@ var.remarkup-assist-textarea {
 .remarkup-nav-sequence-arrow {
   color: {$lightgreytext};
 }
+
+.phabricator-remarkup hr {
+  background: {$thinblueborder};
+  margin: 24px 0;
+}
diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css
index f7007a3a54..774dd22cd1 100644
--- a/webroot/rsrc/css/phui/phui-fontkit.css
+++ b/webroot/rsrc/css/phui/phui-fontkit.css
@@ -40,14 +40,14 @@
 .phui-font-source-sans .phabricator-remarkup h4.remarkup-header,
 .phui-font-source-sans .phabricator-remarkup h5.remarkup-header,
 .phui-font-source-sans .phabricator-remarkup h6.remarkup-header {
-  color: {$bluetext};
+  color: {$darkbluetext};
   font-weight: 600;
 }
 
 .phui-font-source-sans .phabricator-remarkup h2.remarkup-header {
   padding: 24px 24px 8px 0;
   border-bottom: 1px solid {$thinblueborder};
-  font-size: 20px;
+  font-size: 22px;
   font-weight: 400;
   color: {$bluetext};
   margin: 0 0 16px;
@@ -87,7 +87,8 @@
 }
 
 .phui-font-source-sans a.atom-ref,
-.phui-font-source-sans a.remarkup-link {
+.phui-font-source-sans a.remarkup-link,
+.phui-font-source-sans a.phriction-link {
   color: {$blue};
 }