diff --git a/core/modules/views_ui/css/views_ui.admin.css b/core/modules/views_ui/css/views_ui.admin.css
index f0aa168..3d1db05 100644
--- a/core/modules/views_ui/css/views_ui.admin.css
+++ b/core/modules/views_ui/css/views_ui.admin.css
@@ -127,7 +127,7 @@
   left: 0; /* LTR */
   margin: 0;
   position: absolute;
-  top: 40px;
+  top: 23px;
   z-index: 50;
 }
 [dir="rtl"] .views-displays .tabs .action-list {
diff --git a/core/modules/views_ui/src/ViewFormBase.php b/core/modules/views_ui/src/ViewFormBase.php
index 45d77e7..5431f9d 100644
--- a/core/modules/views_ui/src/ViewFormBase.php
+++ b/core/modules/views_ui/src/ViewFormBase.php
@@ -114,7 +114,7 @@ public function getDisplayTabs(ViewUI $view) {
       if (isset($display['display_options']['enabled']) && !$display['display_options']['enabled']) {
         $tabs[$id]['#link']['localized_options']['attributes']['class'][] = 'views-display-disabled-link';
       }
-      if (isset($view->changed_display[$id]) && $view->changed_display[$id]) {
+      if (!empty($view->changed_display[$id])) {
         $tabs[$id]['#link']['localized_options']['attributes']['class'][] = 'views-display-changed-link';
       }
     }
diff --git a/core/modules/views_ui/src/ViewPreviewForm.php b/core/modules/views_ui/src/ViewPreviewForm.php
index 2cfc103..2cc2533 100644
--- a/core/modules/views_ui/src/ViewPreviewForm.php
+++ b/core/modules/views_ui/src/ViewPreviewForm.php
@@ -41,7 +41,7 @@ public function form(array $form, FormStateInterface $form_state) {
     // Add the arguments textfield
     $form['controls']['view_args'] = [
       '#type' => 'textfield',
-      '#title' => $this->t('Use contextual filters:'),
+      '#title' => $this->t('Preview with contextual filters:'),
       '#description' => $this->t('Separate contextual filter values with a "/". For example, %example.', ['%example' => '40/12/10']),
       '#id' => 'preview-args',
     ];
diff --git a/core/themes/seven/css/components/tabs.css b/core/themes/seven/css/components/tabs.css
index 2dbb941..5aab30b 100644
--- a/core/themes/seven/css/components/tabs.css
+++ b/core/themes/seven/css/components/tabs.css
@@ -245,6 +245,8 @@ li.tabs__tab a {
 }
 .tabs.secondary .tabs__tab {
   display: block;
+  padding: 5px 15px 5px 16px; /* LTR */
+  margin-left: -1px; /* LTR */
   color: #0074bd;
   -webkit-transition: border-color 0.2s, background-color 0.2s;
   transition: border-color 0.2s, background-color 0.2s;
@@ -261,32 +263,19 @@ li.tabs__tab a {
   padding-left: 0;
   padding-right: 0;
 }
-.tabs.secondary .tabs__tab {
+.tabs.secondary .tabs__tab + .tabs__tab {
   border-top: 1px solid #d9d8d4;
-  margin-left: 1em;
-  margin-right: 1em;
 }
 .tabs.secondary .tabs__tab.is-active {
   color: #004f80;
   border-left: 2px solid #004f80; /* LTR */
+  padding-left: 15px; /* LTR */
 }
 [dir="rtl"] .tabs.secondary .tabs__tab.is-active {
   border-left: 1px solid #bfbfbf;
   border-right: 2px solid #004f80;
   padding-right: 15px;
 }
-.views-displays .tabs.secondary a {
-  padding: 7px 13px 5px;
-}
-.views-displays .tabs.secondary .tabs__tab a:hover {
-  border-bottom: 2px solid #008ee6;
-}
-.views-displays .tabs.secondary a.is-active {
-  border-bottom: 2px solid #004f80;
-}
-.views-displays .tabs.secondary a.views-display-changed-link {
-  border-color: #e09600;
-}
 /* This is required to win over specificity of [dir="rtl"] .tabs.secondary .tabs__tab.is-active */
 [dir="rtl"] .views-displays .tabs.secondary li.is-active {
   border: 0 none;
@@ -296,6 +285,7 @@ li.tabs__tab a {
 .tabs.secondary .tabs__tab:focus {
   color: #008ee6;
   border-left: 2px solid #008ee6; /* LTR */
+  padding-left: 15px; /* LTR */
 }
 [dir="rtl"] .tabs.secondary .tabs__tab:hover,
 [dir="rtl"] .tabs.secondary .tabs__tab:focus {
@@ -308,15 +298,6 @@ li.tabs__tab a {
   border: 0 none;
   padding-right: 0;
 }
-.views-displays .tabs .open > a,
-.views-displays .tabs .open > a:hover {
-  color: #fff;
-  background-color: #40b6ff;
-  padding-top: 6px;
-  padding-right: 12px;
-  padding-left: 12px;
-}
-
 .tabs.secondary a {
   background-color: transparent;
   padding: 7px 13px 5px;
diff --git a/core/themes/seven/css/components/views-ui.css b/core/themes/seven/css/components/views-ui.css
index 78421a8..4b62e4d 100644
--- a/core/themes/seven/css/components/views-ui.css
+++ b/core/themes/seven/css/components/views-ui.css
@@ -100,10 +100,6 @@ details.fieldset-no-legend {
   padding: 0;
 }
 
-.views-displays ul.secondary li a {
-  color: #0074bd;
-}
-
 .views-displays .tabs.secondary a.views-display-changed-link {
   color: #734c00;
 }
@@ -158,7 +154,20 @@ details.fieldset-no-legend {
  *
  * The tabs that switch between sections
  */
-
+.views-displays {
+  border: 0 none;
+  padding-bottom: 1em;
+}
+.views-display-top {
+  padding-top: 5px;
+  background-color: transparent;
+  border-bottom: 1px solid #A6A6A6;
+  padding: 0;
+}
+.views-display-top .dropbutton-wrapper {
+  padding-top: 12px;
+  right: 0; /* LTR */
+}
 .views-displays .secondary {
   text-align: left; /* LTR */
 }
@@ -169,10 +178,84 @@ details.fieldset-no-legend {
 .views-admin .icon.add {
   background-position: center 3px;
 }
+.views-displays .tabs.secondary li {
+  margin-bottom: 0;
+}
+.views-displays .tabs.secondary .tabs__tab {
+  margin-left: 1em;
+  margin-right: 1em;
+}
+.views-displays .tabs.secondary a {
+  border-top: 0 none;
+  border-right: 0 none;
+  border-left: 0 none;
+  border-color: transparent;
+  border-bottom: 2px solid transparent;
+  border-radius: 0;
+  padding: 7px 13px 5px;
+}
 
+.views-displays .tabs .action-list li {
+  background-color: #ffffff;
+  border-radius: 2px;
+}
+.views-displays .tabs .action-list li:hover {
+  background-color: #40b6ff;
+  color: #ffffff;
+}
+.edit-display-settings {
+  padding-top: 15px;
+  margin: 0;
+}
+.views-display-column {
+  border: 0 none;
+}
+.view-preview-form .form-item-view-args,
+.view-preview-form .form-actions {
+  display: block;
+}
+.views-ui-display-tab-bucket {
+  background: #f3f5ee;
+  border-bottom: 0 none;
+  margin-bottom: 8px;
+}
+.views-live-preview {
+  padding: 0;
+}
+.views-displays ul.secondary li a,
+.views-displays .tabs li a:hover,
+.views-displays .tabs li.is-active a,
+.views-displays .tabs li.is-active a.is-active {
+  background-color: transparent;
+  color: #0074bd;
+}
 .views-displays .secondary a:hover > .icon.add {
   background-position: center 3px;
 }
+.views-displays .tabs .open > a {
+  background-color: #fff;
+  border-bottom: 0 none;
+}
+.views-displays .tabs .open > a:focus,
+.views-displays .tabs .open > a:active,
+.views-displays .tabs .open > a:hover {
+  color: #fff;
+  background-color: #40b6ff;
+}
+.views-displays .tabs.secondary .tabs__tab a:hover {
+  border-bottom: 2px solid #008ee6;
+}
+.views-displays .tabs.secondary a.is-active {
+  border-bottom: 2px solid #004f80;
+}
+.views-displays .tabs.secondary a.is-active.views-display-changed-link,
+.views-displays .tabs.secondary a.views-display-changed-link {
+  border-color: #e09600;
+  color: #e09600;
+}
+.views-displays .tabs .action-list {
+  top: 28px;
+}
 
 .views-displays .secondary .action-list li:last-child {
   border-radius: 0 0 7px 7px;
@@ -252,6 +335,26 @@ details.fieldset-no-legend {
 
 /* @group Live preview elements */
 
+.views-preview-wrapper {
+  border: 0 none;
+}
+.view-preview-form {
+  position: static;
+}
+.view-preview-form__title {
+  background-color: transparent;
+  border-bottom: 0 none;
+  padding: 0;
+  display: inline;
+}
+.view-preview-form .form-item-live-preview {
+  position: static;
+  right: auto;
+  top: auto;
+  margin-top: 0;
+  margin-left: 1em; /* LTR */
+}
+
 .views-query-info pre {
   margin-bottom: 0;
   margin-top: 0;
@@ -304,3 +407,8 @@ details.fieldset-no-legend {
 }
 
 /* @end */
+
+.form-edit .form-actions {
+  background-color: transparent;
+  border: 0 none;
+}
diff --git a/core/themes/stable/css/views_ui/views_ui.admin.css b/core/themes/stable/css/views_ui/views_ui.admin.css
index f0aa168..3d1db05 100644
--- a/core/themes/stable/css/views_ui/views_ui.admin.css
+++ b/core/themes/stable/css/views_ui/views_ui.admin.css
@@ -127,7 +127,7 @@
   left: 0; /* LTR */
   margin: 0;
   position: absolute;
-  top: 40px;
+  top: 23px;
   z-index: 50;
 }
 [dir="rtl"] .views-displays .tabs .action-list {
diff --git a/core/themes/stable/css/views_ui/views_ui.admin.theme.css b/core/themes/stable/css/views_ui/views_ui.admin.theme.css
index 7777d1a..b843586 100644
--- a/core/themes/stable/css/views_ui/views_ui.admin.theme.css
+++ b/core/themes/stable/css/views_ui/views_ui.admin.theme.css
@@ -289,8 +289,14 @@ td.group-title {
   padding-left: 10px;
   padding-right: 0;
 }
+.views-displays {
+  border: 1px solid #ccc;
+  padding-bottom: 36px;
+}
 .views-display-top {
-  border-bottom: 1px solid #A6A6A6;
+  background-color: #e1e2dc;
+  border-bottom: 1px solid #ccc;
+  padding: 8px 8px 3px;
   position: relative;
 }
 .views-display-top .tabs {
@@ -317,11 +323,16 @@ td.group-title {
   margin-right: 0.3em;
 }
 .form-edit .form-actions {
+  background-color: #e1e2dc;
+  border-right: 1px solid #ccc;
+  border-bottom: 1px solid #ccc;
+  border-left: 1px solid #ccc;
   margin-top: 0;
-  padding-top: 8px;
+  padding: 8px 12px;
 }
 .views-displays .tabs.secondary {
   margin-right: 200px; /* LTR */
+  border: 0;
 }
 [dir="rtl"] .views-displays .tabs.secondary {
   margin-left: 200px;
@@ -331,14 +342,15 @@ td.group-title {
 .views-displays .tabs.secondary li.is-active {
   background: transparent;
   border: 0;
+  padding: 0;
   width: auto;
 }
-.views-displays .tabs .action-list {
-  top: 31px;
-}
 .views-displays .tabs li.add ul.action-list li {
   margin: 0;
 }
+.views-displays .tabs.secondary li {
+  margin: 0 5px 5px 6px; /* LTR */
+}
 [dir="rtl"] .views-displays .tabs.secondary li {
   margin-left: 5px;
   margin-right: 6px;
@@ -348,10 +360,18 @@ td.group-title {
 }
 .views-displays .tabs li.tabs__tab:hover {
   border: 0;
+  padding-left: 0; /* LTR */
+}
+[dir="rtl"] .views-displays .tabs li.tabs__tab:hover {
+  padding-right: 0;
 }
 .views-displays .tabs.secondary a {
+  border: 1px solid #cbcbcb;
+  border-radius: 7px;
   display: inline-block;
-  padding: 7px 13px 5px;
+  font-size: small;
+  line-height: 1.3333;
+  padding: 3px 7px;
 }
 
 /* Display a red border if the display doesn't validate. */
@@ -364,16 +384,26 @@ td.group-title {
   outline: none;
   text-decoration: underline;
 }
+.views-displays .tabs.secondary li a {
+  background-color: #fff;
+}
+.views-displays .tabs li a:hover,
+.views-displays .tabs li.is-active a,
+.views-displays .tabs li.is-active a.is-active {
+  background-color: #555;
+  color: #fff;
+}
 .views-displays .tabs .open > a {
+  background-color: #f1f1f1;
+  border-bottom: 1px solid transparent;
   position: relative;
 }
 .views-displays .tabs .open > a:hover {
-  color: #fff;
-  background-color: #40b6ff;
+  color: #0074bd;
+  background-color: #f1f1f1;
 }
 .views-displays .tabs .action-list li {
-  background-color: #ffffff;
-  border-radius: 2px;
+  background-color: #f1f1f1;
   border-color: #cbcbcb;
   border-style: solid;
   border-width: 0 1px;
@@ -398,12 +428,10 @@ td.group-title {
   box-shadow: none;
 }
 .views-displays .tabs .action-list li:hover {
-  background-color: #40b6ff;
-  color: #ffffff;
+  background-color: #ddd;
 }
-
 .edit-display-settings {
-  padding-top: 15px;
+  margin: 12px 12px 0 12px
 }
 .edit-display-settings-top.views-ui-display-tab-bucket {
   border: 1px solid #f3f3f3;
@@ -413,17 +441,28 @@ td.group-title {
   padding-bottom: 4px;
   position: relative;
 }
+.views-display-column {
+  border: 1px solid #f3f3f3;
+}
 .views-display-column + .views-display-column {
   margin-top: 0;
 }
 .view-preview-form .form-item-view-args,
 .view-preview-form .form-actions {
   margin-top: 5px;
-  display: block;
 }
 .view-preview-form .arguments-preview {
   font-size: 1em;
 }
+.view-preview-form .arguments-preview,
+.view-preview-form .form-item-view-args {
+  margin-left: 10px; /* LTR */
+}
+[dir="rtl"] .view-preview-form .arguments-preview,
+[dir="rtl"] .view-preview-form .form-item-view-args {
+  margin-left: 0;
+  margin-right: 10px;
+}
 .view-preview-form .form-item-view-args label {
   float: left; /* LTR */
   font-weight: normal;
@@ -438,7 +477,7 @@ td.group-title {
 .form-item-live-preview,
 .form-item-view-args,
 .preview-submit-wrapper {
-  display: inline;
+  display: inline-block;
 }
 .form-item-live-preview,
 .view-preview-form .form-actions {
@@ -452,11 +491,10 @@ td.group-title {
 
 /* These are the individual "buckets," or boxes, inside the display settings area */
 .views-ui-display-tab-bucket {
-  background: #f3f5ee;
+  border-bottom: 1px solid #f3f3f3;
   line-height: 20px;
   margin: 0;
   padding-top: 4px;
-  margin-bottom: 8px;
   position: relative;
 }
 .views-ui-display-tab-bucket:last-of-type {
@@ -654,15 +692,28 @@ td.group-title {
   margin-left: 0;
   margin-right: 18px;
 }
+.views-preview-wrapper {
+  border: 1px solid #ccc;
+}
+.view-preview-form {
+  position: relative;
+}
 .view-preview-form__title {
-  display: inline;
+  background-color: #e1e2dc;
+  border-bottom: 1px solid #ccc;
+  margin-top: 0;
+  padding: 8px 12px;
 }
-#edit-displays-live-preview {
-  margin: 25px 0 20px 14px;
+.view-preview-form .form-item-live-preview {
+  position: absolute;
+  right: 12px;
+  top: 3px;
+  margin-top: 2px;
+  margin-left: 2px; /* LTR */
 }
 [dir="rtl"] .view-preview-form .form-item-live-preview {
   right: auto;
-  right: 95px;
+  left: 12px;
   margin-left: 0;
   margin-right: 2px;
 }
@@ -746,16 +797,14 @@ td.group-title {
 [dir="rtl"].js .dropbutton-wrapper.dropbutton-multiple.open .dropbutton-action:last-child a {
   border-radius: 0 0 1.1em 0;
 }
-.views-display-top {
-  padding-top: 5px;
-}
 .views-display-top .dropbutton-wrapper {
   position: absolute;
-  padding-top: 12px;
-  right: 0; /* LTR */
+  right: 12px; /* LTR */
+  top: 7px;
 }
 [dir="rtl"] .views-display-top .dropbutton-wrapper {
   left: 12px;
+  right: auto;
 }
 .views-display-top .dropbutton-wrapper .dropbutton-widget .dropbutton-action a {
   width: auto;