diff --git a/webroot/rsrc/css/core/remarkup.css b/webroot/rsrc/css/core/remarkup.css
--- 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 {
@@ -97,31 +103,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 {
@@ -503,3 +509,8 @@
 .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
--- 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};
 }