diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -81,7 +81,7 @@
     'rsrc/css/application/maniphest/task-summary.css' => '11cc5344',
     'rsrc/css/application/objectselector/object-selector.css' => '029a133d',
     'rsrc/css/application/owners/owners-path-editor.css' => '2f00933b',
-    'rsrc/css/application/paste/paste.css' => 'eb997ddd',
+    'rsrc/css/application/paste/paste.css' => '1898e534',
     'rsrc/css/application/people/people-profile.css' => '25970776',
     'rsrc/css/application/phame/phame.css' => '88bd4705',
     'rsrc/css/application/pholio/pholio-edit.css' => '3ad9d1ee',
@@ -119,7 +119,7 @@
     'rsrc/css/layout/phabricator-filetree-view.css' => 'fccf9f82',
     'rsrc/css/layout/phabricator-hovercard-view.css' => '0d665853',
     'rsrc/css/layout/phabricator-side-menu-view.css' => '4f2cd343',
-    'rsrc/css/layout/phabricator-source-code-view.css' => '2ceee894',
+    'rsrc/css/layout/phabricator-source-code-view.css' => '098e9b75',
     'rsrc/css/phui/calendar/phui-calendar-day.css' => 'd1cf6f93',
     'rsrc/css/phui/calendar/phui-calendar-list.css' => 'c1c7f338',
     'rsrc/css/phui/calendar/phui-calendar-month.css' => '476be7e0',
@@ -693,7 +693,7 @@
     'multirow-row-manager' => 'b5d57730',
     'owners-path-editor' => 'aa1733d0',
     'owners-path-editor-css' => '2f00933b',
-    'paste-css' => 'eb997ddd',
+    'paste-css' => '1898e534',
     'path-typeahead' => 'f7fc67ec',
     'people-profile-css' => '25970776',
     'phabricator-action-list-view-css' => '32c388b3',
@@ -729,7 +729,7 @@
     'phabricator-shaped-request' => '7cbe244b',
     'phabricator-side-menu-view-css' => '4f2cd343',
     'phabricator-slowvote-css' => '266df6a1',
-    'phabricator-source-code-view-css' => '2ceee894',
+    'phabricator-source-code-view-css' => '098e9b75',
     'phabricator-standard-page-view' => '43045fb4',
     'phabricator-textareautils' => '5c93c52c',
     'phabricator-title' => 'df5e11d2',
diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php
--- a/src/applications/paste/controller/PhabricatorPasteViewController.php
+++ b/src/applications/paste/controller/PhabricatorPasteViewController.php
@@ -73,7 +73,6 @@
 
     $source_code = id(new PHUIBoxView())
       ->appendChild($source_code)
-      ->setBorder(true)
       ->addMargin(PHUI::MARGIN_LARGE_LEFT)
       ->addMargin(PHUI::MARGIN_LARGE_RIGHT)
       ->addMargin(PHUI::MARGIN_LARGE_TOP);
diff --git a/webroot/rsrc/css/application/paste/paste.css b/webroot/rsrc/css/application/paste/paste.css
--- a/webroot/rsrc/css/application/paste/paste.css
+++ b/webroot/rsrc/css/application/paste/paste.css
@@ -3,14 +3,18 @@
  */
 
 .paste-embed {
-  background: {$lightbluebackground};
-  border: 1px solid {$lightblueborder};
-  border-bottom: 1px solid {$blueborder};
+  background: {$sh-yellowbackground};
+  border: 1px solid {$sh-lightyellowborder};
+  border-radius: 3px;
+}
+
+.paste-embed .phabricator-source-code-container {
+  border: none;
 }
 
 .paste-embed-head {
-  border-bottom: 1px solid {$thinblueborder};
-  padding: 6px 10px;
+  border-bottom: 1px solid {$sh-lightyellowborder};
+  padding: 8px 12px;
 }
 
 .paste-embed-head a {
diff --git a/webroot/rsrc/css/layout/phabricator-source-code-view.css b/webroot/rsrc/css/layout/phabricator-source-code-view.css
--- a/webroot/rsrc/css/layout/phabricator-source-code-view.css
+++ b/webroot/rsrc/css/layout/phabricator-source-code-view.css
@@ -3,14 +3,15 @@
  */
 
 .phabricator-source-code-container {
-  background: #ffffff;
+  background: #fff;
   overflow-x: auto;
   overflow-y: hidden;
+  border: 1px solid {$sh-lightyellowborder};
+  border-radius: 3px;
 }
 
 .phui-object-item .phabricator-source-code-container {
   margin-left: 8px;
-  border: 1px solid #d7d7d7;
 }
 
 .phabricator-source-code-view tr:first-child * {
@@ -28,10 +29,11 @@
 }
 
 .phabricator-source-line {
+  background-color: {$sh-yellowbackground};
   text-align: right;
   padding: 2px 6px 1px 12px;
-  border-right: 1px solid {$thinblueborder};
-  color: {$darkbluetext};
+  border-right: 1px solid {$sh-lightyellowborder};
+  color: {$sh-yellowtext};
 
   /* When the user selects rows of source, don't visibly select the line
      numbers beside them. We use JS to strip the line numbers out when the user
@@ -48,11 +50,12 @@
 }
 
 th.phabricator-source-line:hover {
-  background-color: {$greybackground};
+  background: {$sh-lightyellowborder};
+  cursor: pointer;
 }
 
 .phabricator-source-highlight {
-  background: {$lightyellow};
+  background: {$sh-yellowbackground};
 }
 
 .phabricator-source-code-summary {