diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 67d3c21de1..155238df48 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '305f7c85',
+    'core.pkg.css' => '5ca11af3',
     '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' => '4203633b',
+    'rsrc/css/core/remarkup.css' => 'a59502c9',
     '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' => '81dab066',
+    'rsrc/css/phui/phui-fontkit.css' => 'ce228013',
     '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' => '4203633b',
+    'phabricator-remarkup-css' => 'a59502c9',
     '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' => '81dab066',
+    'phui-fontkit-css' => 'ce228013',
     '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 499318a0b9..053f5849ca 100644
--- a/webroot/rsrc/css/core/remarkup.css
+++ b/webroot/rsrc/css/core/remarkup.css
@@ -98,42 +98,36 @@
   font-size: 1.625em;
   line-height: 1.625em;
   margin: 16px 0 4px;
-  color: {$bluetext};
 }
 
 .phabricator-remarkup h2.remarkup-header {
   font-size: 1.5em;
   line-height: 1.5em;
   margin: 16px 0 4px;
-  color: {$bluetext};
 }
 
 .phabricator-remarkup h3.remarkup-header {
   font-size: 1.375em;
   line-height: 1.375em;
   margin: 16px 0 4px;
-  color: {$bluetext};
 }
 
 .phabricator-remarkup h4.remarkup-header {
   font-size: 1.25em;
   line-height: 1.25em;
   margin: 8px 0 4px;
-  color: {$bluetext};
 }
 
 .phabricator-remarkup h5.remarkup-header {
   font-size: 1.125em;
   line-height: 1.125em;
   margin: 4px 0;
-  color: {$bluetext};
 }
 
 .phabricator-remarkup h6.remarkup-header {
   font-size: 1em;
   line-height: 1em;
   margin: 4px 0;
-  color: {$bluetext};
 }
 
 .phabricator-remarkup blockquote {
@@ -328,6 +322,12 @@
   padding: 3px 6px;
 }
 
+body div.phabricator-remarkup.remarkup-has-toc
+  .phabricator-remarkup-toc + .remarkup-header {
+  margin-top: 0;
+  padding-top: 0;
+}
+
 .phabricator-remarkup p:first-child,
 .phabricator-remarkup ul.remarkup-list:first-child,
 .phabricator-remarkup ol.remarkup-list:first-child,
diff --git a/webroot/rsrc/css/phui/phui-fontkit.css b/webroot/rsrc/css/phui/phui-fontkit.css
index 380fcf47e4..638e1d38d5 100644
--- a/webroot/rsrc/css/phui/phui-fontkit.css
+++ b/webroot/rsrc/css/phui/phui-fontkit.css
@@ -34,6 +34,15 @@
   line-height: 1.3em;
 }
 
+.phui-font-source-sans .phabricator-remarkup h1.remarkup-header,
+.phui-font-source-sans .phabricator-remarkup h2.remarkup-header,
+.phui-font-source-sans .phabricator-remarkup h3.remarkup-header,
+.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};
+}
+
 .phui-font-source-sans .phabricator-remarkup h2.remarkup-header {
   padding: 24px 24px 8px 0;
   border-bottom: 1px solid {$thinblueborder};