diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
index 5d3a0110b5..92c8607f99 100644
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -213,7 +213,7 @@ celerity_register_resource_map(array(
   ),
   'differential-revision-comment-css' =>
   array(
-    'uri' => '/res/be9a95b4/rsrc/css/application/differential/revision-comment.css',
+    'uri' => '/res/85efa17a/rsrc/css/application/differential/revision-comment.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -1272,7 +1272,7 @@ celerity_register_resource_map(array(
   ),
   'maniphest-transaction-detail-css' =>
   array(
-    'uri' => '/res/552bb734/rsrc/css/application/maniphest/transaction-detail.css',
+    'uri' => '/res/4083354f/rsrc/css/application/maniphest/transaction-detail.css',
     'type' => 'css',
     'requires' =>
     array(
@@ -1776,23 +1776,7 @@ celerity_register_resource_map(array(
       'uri' => '/res/pkg/46547a92/core.pkg.js',
       'type' => 'js',
     ),
-    '540effd7' =>
-    array(
-      'name' => 'typeahead.pkg.js',
-      'symbols' =>
-      array(
-        0 => 'javelin-typeahead',
-        1 => 'javelin-typeahead-normalizer',
-        2 => 'javelin-typeahead-source',
-        3 => 'javelin-typeahead-preloaded-source',
-        4 => 'javelin-typeahead-ondemand-source',
-        5 => 'javelin-tokenizer',
-        6 => 'javelin-behavior-aphront-basic-tokenizer',
-      ),
-      'uri' => '/res/pkg/540effd7/typeahead.pkg.js',
-      'type' => 'js',
-    ),
-    '80580cea' =>
+    '4c3b1b11' =>
     array(
       'name' => 'differential.pkg.css',
       'symbols' =>
@@ -1810,9 +1794,25 @@ celerity_register_resource_map(array(
         10 => 'phabricator-content-source-view-css',
         11 => 'differential-local-commits-view-css',
       ),
-      'uri' => '/res/pkg/80580cea/differential.pkg.css',
+      'uri' => '/res/pkg/4c3b1b11/differential.pkg.css',
       'type' => 'css',
     ),
+    '540effd7' =>
+    array(
+      'name' => 'typeahead.pkg.js',
+      'symbols' =>
+      array(
+        0 => 'javelin-typeahead',
+        1 => 'javelin-typeahead-normalizer',
+        2 => 'javelin-typeahead-source',
+        3 => 'javelin-typeahead-preloaded-source',
+        4 => 'javelin-typeahead-ondemand-source',
+        5 => 'javelin-tokenizer',
+        6 => 'javelin-behavior-aphront-basic-tokenizer',
+      ),
+      'uri' => '/res/pkg/540effd7/typeahead.pkg.js',
+      'type' => 'js',
+    ),
     'b164acea' =>
     array(
       'name' => 'javelin.pkg.js',
@@ -1886,23 +1886,23 @@ celerity_register_resource_map(array(
     'aphront-crumbs-view-css' => 'da9f8734',
     'aphront-dialog-view-css' => 'da9f8734',
     'aphront-form-view-css' => 'da9f8734',
-    'aphront-headsup-action-list-view-css' => '80580cea',
+    'aphront-headsup-action-list-view-css' => '4c3b1b11',
     'aphront-list-filter-view-css' => 'da9f8734',
     'aphront-panel-view-css' => 'da9f8734',
     'aphront-side-nav-view-css' => 'da9f8734',
     'aphront-table-view-css' => 'da9f8734',
     'aphront-tokenizer-control-css' => 'da9f8734',
     'aphront-typeahead-control-css' => 'da9f8734',
-    'differential-changeset-view-css' => '80580cea',
-    'differential-core-view-css' => '80580cea',
+    'differential-changeset-view-css' => '4c3b1b11',
+    'differential-core-view-css' => '4c3b1b11',
     'differential-inline-comment-editor' => 'ef420ead',
-    'differential-local-commits-view-css' => '80580cea',
-    'differential-revision-add-comment-css' => '80580cea',
-    'differential-revision-comment-css' => '80580cea',
-    'differential-revision-comment-list-css' => '80580cea',
-    'differential-revision-detail-css' => '80580cea',
-    'differential-revision-history-css' => '80580cea',
-    'differential-table-of-contents-css' => '80580cea',
+    'differential-local-commits-view-css' => '4c3b1b11',
+    'differential-revision-add-comment-css' => '4c3b1b11',
+    'differential-revision-comment-css' => '4c3b1b11',
+    'differential-revision-comment-list-css' => '4c3b1b11',
+    'differential-revision-detail-css' => '4c3b1b11',
+    'differential-revision-history-css' => '4c3b1b11',
+    'differential-table-of-contents-css' => '4c3b1b11',
     'diffusion-commit-view-css' => '03ef179e',
     'javelin-behavior' => 'b164acea',
     'javelin-behavior-aphront-basic-tokenizer' => '540effd7',
@@ -1940,14 +1940,14 @@ celerity_register_resource_map(array(
     'javelin-util' => 'b164acea',
     'javelin-vector' => 'b164acea',
     'javelin-workflow' => '46547a92',
-    'phabricator-content-source-view-css' => '80580cea',
+    'phabricator-content-source-view-css' => '4c3b1b11',
     'phabricator-core-buttons-css' => 'da9f8734',
     'phabricator-core-css' => 'da9f8734',
     'phabricator-directory-css' => 'da9f8734',
     'phabricator-drag-and-drop-file-upload' => 'ef420ead',
     'phabricator-keyboard-shortcut' => '46547a92',
     'phabricator-keyboard-shortcut-manager' => '46547a92',
-    'phabricator-object-selector-css' => '80580cea',
+    'phabricator-object-selector-css' => '4c3b1b11',
     'phabricator-remarkup-css' => 'da9f8734',
     'phabricator-shaped-request' => 'ef420ead',
     'phabricator-standard-page-view' => 'da9f8734',
diff --git a/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php b/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php
index b430e7055e..f9d237c3ca 100644
--- a/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php
+++ b/src/applications/differential/view/inlinecomment/DifferentialInlineCommentView.php
@@ -218,8 +218,10 @@ final class DifferentialInlineCommentView extends AphrontView {
         '<span class="differential-inline-comment-line">'.$line.'</span>'.
         phutil_escape_html($author).
       '</div>'.
-      '<div class="phabricator-remarkup">'.
-        $content.
+      '<div class="differential-inline-comment-content">'.
+        '<div class="phabricator-remarkup">'.
+          $content.
+        '</div>'.
       '</div>');
 
     return $this->scaffoldMarkup($markup);
diff --git a/webroot/rsrc/css/application/differential/revision-comment.css b/webroot/rsrc/css/application/differential/revision-comment.css
index 33cb0b50eb..4619938056 100644
--- a/webroot/rsrc/css/application/differential/revision-comment.css
+++ b/webroot/rsrc/css/application/differential/revision-comment.css
@@ -84,10 +84,11 @@
   line-height:         1.4em;
   margin:              0em;
   padding:             .3em 5px .4em 1.25em;
+  overflow: auto;
 }
 
-.differential-comment-content {
-  overflow: hidden;
+.differential-inline-comment-content {
+  overflow: auto;
 }
 
 .differential-comment-content .phabricator-remarkup .remarkup-code-block,
diff --git a/webroot/rsrc/css/application/maniphest/transaction-detail.css b/webroot/rsrc/css/application/maniphest/transaction-detail.css
index 1bd39081b5..b480d06cdd 100644
--- a/webroot/rsrc/css/application/maniphest/transaction-detail.css
+++ b/webroot/rsrc/css/application/maniphest/transaction-detail.css
@@ -80,6 +80,7 @@
   border-top: 1px solid #e6e6e6;
   padding: 4px 1em;
   background: #fcfcfc;
+  overflow: auto;
 }
 
 .maniphest-change-table {