diff --git a/webroot/rsrc/css/application/base/standard-page-view.css b/webroot/rsrc/css/application/base/standard-page-view.css
index b4386764ab..1205dc93e7 100644
--- a/webroot/rsrc/css/application/base/standard-page-view.css
+++ b/webroot/rsrc/css/application/base/standard-page-view.css
@@ -1,177 +1,178 @@
 /**
  * @provides phabricator-standard-page-view
  */
 
 .phabricator-anchor-view,
 .phabricator-anchor-navigation-marker {
   position: absolute;
   margin-top: -15px;
 }
 
 .phabricator-chromeless-page .phabricator-standard-page {
   background: transparent;
   border-width: 0px;
 }
 
 .phabricator-standard-page-body {
   clear: both;
 }
 
 body.white-background {
   background: #fff;
 }
 
 .phabricator-standard-page-footer {
   text-align: right;
   margin: 44px 16px 16px;
   padding: 12px 0;
   border-top: 1px solid rgba({$alphagrey},.1);
   color: {$greytext};
 }
 
 .with-durable-column .phabricator-standard-page-footer {
   margin: 36px 16px 28px;
 }
 
 .device .phabricator-standard-page-footer {
   margin: 24px 8px 16px;
 }
 
 !print .phabricator-standard-page-footer {
   display: none;
 }
 
 .device-desktop .has-local-nav + .phabricator-standard-page-footer {
   margin-left: 221px;
 }
 
 .device .phabricator-side-menu-home + .phabricator-standard-page-footer {
   display: none;
 }
 
 .keyboard-shortcut-help td,
 .keyboard-shortcut-help th {
   padding: 8px;
   vertical-align: middle;
 }
 
 .keyboard-shortcut-help th {
   white-space: nowrap;
   color: {$greytext};
 }
 
 .keyboard-focus-focus-reticle {
-  background: #ffffd3;
+  background: rgba(255, 255, 211, 0.15);
   position: absolute;
-  border: 1px solid #999900;
+  border: 1px solid {$yellow};
+  pointer-events: none;
 }
 
 a.handle-status-closed {
   text-decoration: line-through;
   color: #676767;
 }
 
 a.handle-status-closed:hover {
   text-decoration: line-through;
   color: #19558D;
 }
 
 .handle-availability-none .perfect-circle {
   color: {$red};
 }
 
 .handle-availability-partial .perfect-circle {
   color: {$orange};
 }
 
 .handle-availability-no-email .perfect-circle {
   color: {$violet};
 }
 
 .handle-availability-disabled .perfect-circle {
   color: {$greytext};
 }
 
 .aphront-developer-error-callout {
   position: relative;
   padding: 2em;
   background: #aa0000;
   color: white;
   text-align: center;
   font-size: {$smallerfontsize};
 }
 
 .phui-handle.phui-link-person {
   /* Prevent linebreaks between user availability markers and usernames. */
   white-space: nowrap;
 }
 
 .phui-handle .phui-icon-view {
   display: inline-block;
   margin: 2px 2px -2px 0;
 }
 
 .jx-scrollbar-frame {
   position: relative;
   overflow: hidden;
 }
 
 .jx-scrollbar-viewport {
   position: absolute;
   overflow-x: hidden;
   overflow-y: scroll;
   top: 0;
   bottom: 0;
   left: 0;
   right: 0;
 }
 
 .jx-scrollbar-test {
   position: absolute;
   left: -300px;
 }
 
 .jx-scrollbar-bar {
   position: absolute;
   top: 0;
   right: 0;
   bottom: 7px;
   width: 11px;
 }
 
 .jx-scrollbar-bar .jx-scrollbar-handle {
   position: absolute;
   right: 2px;
   -webkit-border-radius: 7px;
   -moz-border-radius: 7px;
   border-radius: 7px;
   min-height: 10px;
   width: 7px;
   opacity: 0;
   -webkit-transition: opacity 0.2s linear;
   -moz-transition: opacity 0.2s linear;
   -o-transition: opacity 0.2s linear;
   -ms-transition: opacity 0.2s linear;
   transition: opacity 0.2s linear;
   background: #6c6e71;
   -webkit-background-clip: padding-box;
   -moz-background-clip: padding;
 }
 
 .jx-scrollbar-bar:hover .jx-scrollbar-handle {
   opacity: 0.7;
   -webkit-transition: opacity 0 linear;
   -moz-transition: opacity 0 linear;
   -o-transition: opacity 0 linear;
   -ms-transition: opacity 0 linear;
   transition: opacity 0 linear;
 }
 
 .jx-scrollbar-bar .jx-scrollbar-visible {
   opacity: 0.7;
 }
 
 .jx-scrollbar-link {
   position: absolute;
   left: -50px;
 }
diff --git a/webroot/rsrc/css/core/z-index.css b/webroot/rsrc/css/core/z-index.css
index a5b95d568b..bdab2e97ed 100644
--- a/webroot/rsrc/css/core/z-index.css
+++ b/webroot/rsrc/css/core/z-index.css
@@ -1,187 +1,187 @@
 /**
  * @provides phabricator-zindex-css
  */
 
-.keyboard-focus-focus-reticle {
-  z-index: 1;
-}
-
 .device .phabricator-action-list-view.phabricator-action-list-toggle,
 .device-desktop .phui-document-content
   .phabricator-action-list-view.phabricator-action-list-toggle {
   z-index: 1;
 }
 
+.keyboard-focus-focus-reticle {
+  z-index: 2;
+}
+
 .device-desktop .phui-timeline-minor-event .phui-timeline-image {
   z-index: 2;
 }
 
 .differential-reticle {
   z-index: 2;
 }
 
 .differential-changeset {
   z-index: 2;
 }
 
 .pholio-new-inline-comment {
   z-index: 2;
 }
 
 .slowvote-bar {
   z-index: 2;
 }
 
 div.phui-calendar-day-event {
   z-index: 2;
 }
 
 .slowvote-above-the-bar {
   z-index: 3;
 }
 
 .phui-timeline-icon-fill {
   z-index: 3;
 }
 
 .phui-crumbs-view {
   z-index: 3;
 }
 
 .phabricator-nav-local {
   z-index: 4;
 }
 
 .project-board-header {
   z-index: 4;
 }
 
 .conpherence-layout .conpherence-no-threads {
   z-index: 4;
 }
 
 .conpherence-menu-pane {
   z-index: 4;
 }
 
 .phabricator-nav-drag {
   z-index: 4;
 }
 
 .conpherence-message-pane .conpherence-search-main {
   z-index: 4;
 }
 
 .dark-console {
   z-index: 5;
 }
 
 .phui-calendar-date-number  {
   z-index: 5;
 }
 
 .phabricator-main-menu {
   z-index: 6;
 }
 
 .aphront-developer-error-callout {
   z-index: 6;
 }
 
 .loading .messages-loading-mask,
 .loading .widgets-loading-mask {
   z-index: 6;
 }
 
 .conpherence-durable-column {
   z-index: 7;
 }
 
 .jx-scrollbar-bar {
   z-index: 8;
 }
 
 .differential-haunt-mode-1 .differential-add-comment-panel,
 .differential-haunt-mode-2 .differential-add-comment-panel {
   z-index: 8;
 }
 
 .remarkup-assist-pinned {
   z-index: 8;
 }
 
 .device-desktop .phabricator-notification-menu {
   z-index: 9;
 }
 
 .jx-mask {
   z-index: 10;
 }
 
 .jx-notification-container {
   z-index: 11;
 }
 
 .phabricator-global-upload-instructions {
   z-index: 11;
 }
 
 .lightbox-attachment {
   z-index: 12;
 }
 
 div.jx-typeahead-results {
   z-index: 13;
 }
 
 .jx-client-dialog {
   z-index: 14;
 }
 
 .fancy-datepicker {
   z-index: 15;
 }
 
 .drag-frame {
   z-index: 16;
 }
 
 .jx-hovercard-container {
   z-index: 17;
 }
 
 .pholio-device-lightbox {
   z-index: 20;
 }
 
 .phuix-autocomplete {
   z-index: 21;
 }
 
 .conpherence-participant-pane {
   z-index: 25;
 }
 
 .conpherence-layout .conpherence-loading-mask {
   z-index: 30;
 }
 
 .phuix-dropdown-menu {
   z-index: 32;
 }
 
 .busy {
   z-index: 40;
 }
 
 .remarkup-control-fullscreen-mode {
   z-index: 50;
 }
 
 .jx-tooltip-container {
   z-index: 51;
 }
 
 .audible .aural-only {
   z-index: 100;
 }