diff --git a/core/themes/stable/css/core/dialog/off-canvas.base.css b/core/themes/stable/css/core/dialog/off-canvas.base.css
index ef3a29da01..25f1acbf71 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.base.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.base.css
@@ -1,6 +1,6 @@
 /*
  * @file
- * Set base styles for the settings tray.
+ * Set base styles for the off-canvas dialog.
  */
 
 /* Set some global attributes. */
@@ -217,18 +217,18 @@
 }
 #drupal-off-canvas .messages--status {
   background-color: #f3faef;
-  background-image: url(../../../../../misc/icons/73b355/check.svg);
+  background-image: url(../../../images/core/icons/73b355/check.svg);
   color: #325e1c;
 }
 #drupal-off-canvas .messages--warning {
   background-color: #fdf8ed;
-  background-image: url(../../../../../misc/icons/e29700/warning.svg);
+  background-image: url(../../../images/core/icons/e29700/warning.svg);
   color: #734c00;
 }
 
 #drupal-off-canvas .messages--error {
   background-color: #fcf4f2;
-  background-image: url(../../../../../misc/icons/e32700/error.svg);
+  background-image: url(../../../images/core/icons/e32700/error.svg);
   color: #a51b00;
 }
 
diff --git a/core/themes/stable/css/core/dialog/off-canvas.button.css b/core/themes/stable/css/core/dialog/off-canvas.button.css
index cfe1dd9869..e37b7ac4e0 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.button.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.button.css
@@ -1,7 +1,7 @@
 /**
  * Visual styling for buttons in the off-canvas dialog.
  *
- * See seven/css/components/buttons.css
+ * @see seven/css/components/buttons.css
  */
 
 #drupal-off-canvas button,
diff --git a/core/themes/stable/css/core/dialog/off-canvas.css b/core/themes/stable/css/core/dialog/off-canvas.css
index 2f20771614..52a8b9e079 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.css
@@ -40,15 +40,15 @@
 }
 
 /*
- * Force the tray to be 100% width at the same breakpoint the dialog system uses
- * to expand dialog widths.
+ * Force the off-canvas dialog to be 100% width at the same breakpoint the
+ * dialog system uses to expand dialog widths.
  */
 @media all and (max-width: 48em) { /* 768px */
   .ui-dialog.ui-dialog-off-canvas {
     width: 100% !important;
   }
-  /* When tray is at 100% width stop the body from scrolling */
-  .js-tray-open {
+  /* When off-canvas dialog is at 100% width stop the body from scrolling */
+  .js-off-canvas-dialog-open {
     height: 100%;
     overflow-y: hidden;
   }
diff --git a/core/themes/stable/css/core/dialog/off-canvas.details.css b/core/themes/stable/css/core/dialog/off-canvas.details.css
index 9495d62cd2..fcd526f0b0 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.details.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.details.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Visual styling for summary and details in the Settings Tray module's off-canvas dialog.
+ * Visual styling for summary and details in the off-canvas dialog.
  */
 
 #drupal-off-canvas details,
diff --git a/core/themes/stable/css/core/dialog/off-canvas.dropbutton.css b/core/themes/stable/css/core/dialog/off-canvas.dropbutton.css
index 13b6e291eb..99f5c61a9d 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.dropbutton.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.dropbutton.css
@@ -241,7 +241,7 @@
   content: '.';
   display: block;
   color: transparent;
-  background: transparent url(../../../../../misc/icons/ffffff/pencil.svg) no-repeat center;
+  background: transparent url(../../../images/core/icons/ffffff/pencil.svg) no-repeat center;
   background-size: 14px;
 }
 
diff --git a/core/themes/stable/css/core/dialog/off-canvas.form.css b/core/themes/stable/css/core/dialog/off-canvas.form.css
index f59400a507..670778e753 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.form.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.form.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Visual styling for forms in the Settings Tray module's off-canvas dialog.
+ * Visual styling for forms in the off-canvas dialog.
  */
 
 #drupal-off-canvas form {
diff --git a/core/themes/stable/css/core/dialog/off-canvas.table.css b/core/themes/stable/css/core/dialog/off-canvas.table.css
index fdc889e199..7e7cd2e662 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.table.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.table.css
@@ -1,6 +1,6 @@
 /**
  * @file
- * Visual styling for tables in the Settings Tray module's off-canvas dialog.
+ * Visual styling for tables in the off-canvas dialog.
  */
 
 #drupal-off-canvas table * {
diff --git a/core/themes/stable/css/core/dialog/off-canvas.tabledrag.css b/core/themes/stable/css/core/dialog/off-canvas.tabledrag.css
index a2c756cead..e6e90407a0 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.tabledrag.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.tabledrag.css
@@ -38,7 +38,7 @@
 }
 #drupal-off-canvas a.tabledrag-handle .handle {
   /* Use lighter drag icon against dark background. */
-  background-image: url(../../../../../misc/icons/bebebe/move.svg);
+  background-image: url(../../../images/core/icons/bebebe/move.svg);
   background-repeat: no-repeat;
   background-position: center;
   height: auto;
@@ -49,7 +49,7 @@
 }
 #drupal-off-canvas .draggable a.tabledrag-handle:hover .handle,
 #drupal-off-canvas .draggable a.tabledrag-handle:focus .handle {
-  background-image: url(../../../../../misc/icons/787878/move.svg);
+  background-image: url(../../../images/core/icons/787878/move.svg);
   text-decoration: none;
 }
 #drupal-off-canvas tr td {
diff --git a/core/themes/stable/css/core/dialog/off-canvas.theme.css b/core/themes/stable/css/core/dialog/off-canvas.theme.css
index b7fc9ec082..e215635d5e 100644
--- a/core/themes/stable/css/core/dialog/off-canvas.theme.css
+++ b/core/themes/stable/css/core/dialog/off-canvas.theme.css
@@ -25,7 +25,7 @@
   visibility: hidden;
 }
 .ui-dialog.ui-dialog-off-canvas .ui-dialog-titlebar-close {
-  background-image: url(../../../../../misc/icons/bebebe/ex.svg);
+  background-image: url(../../../images/core/icons/bebebe/ex.svg);
   background-position: center center;
   background-repeat: no-repeat;
   background-color: transparent;
@@ -36,7 +36,7 @@
   transition: background .5s ease;
 }
 .ui-dialog.ui-dialog-off-canvas .ui-dialog-titlebar-close:hover {
-  background-image: url(../../../../../misc/icons/ffffff/ex.svg);
+  background-image: url(../../../images/core/icons/ffffff/ex.svg);
 }
 [dir="rtl"] .ui-dialog.ui-dialog-off-canvas .ui-dialog-titlebar-close {
   left: 1em;
@@ -60,7 +60,7 @@
   padding-right: 30px;
 }
 .ui-dialog.ui-dialog-off-canvas .ui-dialog-title:before {
-  background: transparent url(../../../../../misc/icons/ffffff/pencil.svg) no-repeat scroll center center;
+  background: transparent url(../../../images/core/icons/ffffff/pencil.svg) no-repeat scroll center center;
   background-size: 100% auto;
   content: '';
   display: block;