diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'core.pkg.css' => '5a12afbf',
+    'core.pkg.css' => 'cd8c18d3',
     'core.pkg.js' => 'ba6a742f',
     'darkconsole.pkg.js' => 'df001cab',
     'differential.pkg.css' => '4a93db37',
@@ -105,7 +105,7 @@
     'rsrc/css/application/tokens/tokens.css' => '3d0f239e',
     'rsrc/css/application/uiexample/example.css' => '528b19de',
     'rsrc/css/core/core.css' => '40151074',
-    'rsrc/css/core/remarkup.css' => '9b5d1f91',
+    'rsrc/css/core/remarkup.css' => '7fd5585f',
     'rsrc/css/core/syntax.css' => '3c18c1cb',
     'rsrc/css/core/z-index.css' => 'd1c137f2',
     'rsrc/css/diviner/diviner-shared.css' => '38813222',
@@ -127,7 +127,7 @@
     'rsrc/css/phui/phui-button.css' => 'c7412aa1',
     'rsrc/css/phui/phui-document.css' => 'a5615198',
     'rsrc/css/phui/phui-feed-story.css' => 'e2c9bc83',
-    'rsrc/css/phui/phui-fontkit.css' => 'abeb59f0',
+    'rsrc/css/phui/phui-fontkit.css' => '1502a718',
     'rsrc/css/phui/phui-form-view.css' => 'ebac1b1d',
     'rsrc/css/phui/phui-form.css' => 'b78ec020',
     'rsrc/css/phui/phui-header-view.css' => '39594ac0',
@@ -739,7 +739,7 @@
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'bbae734c',
     'phabricator-profile-css' => 'b459416e',
-    'phabricator-remarkup-css' => '9b5d1f91',
+    'phabricator-remarkup-css' => '7fd5585f',
     'phabricator-search-results-css' => 'f240504c',
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => 'a2ccd7bd',
@@ -780,7 +780,7 @@
     'phui-document-view-css' => 'a5615198',
     'phui-feed-story-css' => 'e2c9bc83',
     'phui-font-icon-base-css' => 'eb84f033',
-    'phui-fontkit-css' => 'abeb59f0',
+    'phui-fontkit-css' => '1502a718',
     'phui-form-css' => 'b78ec020',
     'phui-form-view-css' => 'ebac1b1d',
     'phui-header-view-css' => '39594ac0',
diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php
--- a/src/applications/diviner/controller/DivinerAtomController.php
+++ b/src/applications/diviner/controller/DivinerAtomController.php
@@ -121,6 +121,7 @@
     $document = id(new PHUIDocumentView())
       ->setBook($book->getTitle(), $group_name)
       ->setHeader($header)
+      ->addClass('diviner-view')
       ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
       ->appendChild($properties)
       ->appendChild($warnings)
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
--- a/src/applications/diviner/controller/DivinerBookController.php
+++ b/src/applications/diviner/controller/DivinerBookController.php
@@ -38,6 +38,8 @@
 
     $document = new PHUIDocumentView();
     $document->setHeader($header);
+    $document->addClass('diviner-view');
+
     $document->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS);
 
     $properties = $this->buildPropertyList($book);
diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php
--- a/src/applications/diviner/controller/DivinerMainController.php
+++ b/src/applications/diviner/controller/DivinerMainController.php
@@ -33,6 +33,7 @@
     $document = new PHUIDocumentView();
     $document->setHeader($header);
     $document->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS);
+    $document->addClass('diviner-view');
 
     if ($books) {
       $books = msort($books, 'getTitle');
diff --git a/src/applications/phriction/controller/PhrictionDocumentController.php b/src/applications/phriction/controller/PhrictionDocumentController.php
--- a/src/applications/phriction/controller/PhrictionDocumentController.php
+++ b/src/applications/phriction/controller/PhrictionDocumentController.php
@@ -208,6 +208,7 @@
 
     $page_content = id(new PHUIDocumentView())
       ->setOffset(true)
+      ->setFontKit(PHUIDocumentView::FONT_SOURCE_SANS)
       ->setHeader($header)
       ->appendChild(
         array(
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
@@ -238,15 +238,15 @@
 
 .phabricator-remarkup-toc {
   float: right;
-  border: 1px solid {$lightblueborder};
-  background: {$lightgreybackground};
-  padding: 8px;
-  width: 180px;
+  border-left: 1px solid {$lightblueborder};
+  background: #fff;
+  width: 160px;
+  padding-left: 8px;
   margin: 0 0 4px 8px;
 }
 
 .phabricator-remarkup-toc-header {
-  font-size: 12px;
+  font-size: 13px;
   line-height: 12px;
   color: {$darkbluetext};
   font-weight: bold;
@@ -261,13 +261,16 @@
 }
 
 .phabricator-remarkup-toc ul ul {
-  margin: 0 0 0 10px;
+  margin: 0 0 0 8px;
 }
 
 .phabricator-remarkup-toc ul li {
   padding: 0;
   margin: 0;
-  font-size: 11px;
+  font-size: 13px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 
 .phabricator-remarkup-embed-layout-right {
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
@@ -28,7 +28,7 @@
   padding: 1px 3px 2px;
 }
 
-.phui-font-source-sans .phui-property-list-section {
+.diviner-view .phui-font-source-sans .phui-property-list-section {
   border-bottom: 1px solid {$thinblueborder};
   margin-bottom: 8px;
   background: {$lightgreybackground};
@@ -41,6 +41,13 @@
 
 .phui-font-source-sans .phui-property-list-container {
   padding-bottom: 6px;
+  font-family: 'Helvetica Neue', Arial, sans-serif;
+  font-size: 13px;
+  line-height: 16px;
+}
+
+.phui-font-source-sans .phabricator-action-view {
+  font-family: 'Helvetica Neue', Arial, sans-serif;
 }
 
 .phui-font-source-sans a.remarkup-link {