diff --git a/core/modules/views/views_ui/css/views-admin.contextual.css b/core/modules/views/views_ui/css/views-admin.contextual.css
index 0497a56118a..fe9b546634f 100644
--- a/core/modules/views/views_ui/css/views-admin.contextual.css
+++ b/core/modules/views/views_ui/css/views-admin.contextual.css
@@ -49,7 +49,7 @@ ul.contextual-links li span {
 }
 
 ul.contextual-links li a {
-  color: #666666 !important;
+  color: #666 !important;
   margin: 0.25em 0;
   padding-left: 1em;
 }
diff --git a/core/modules/views/views_ui/css/views-admin.theme.css b/core/modules/views/views_ui/css/views-admin.theme.css
index fd74623c59e..8bf02e59b3f 100644
--- a/core/modules/views/views_ui/css/views-admin.theme.css
+++ b/core/modules/views/views_ui/css/views-admin.theme.css
@@ -49,7 +49,7 @@
     url("../images/sprites.png"),
     -moz-linear-gradient(
       -90deg,
-      #ffffff 0,
+      #fff 0,
       #e8e8e8 100%);
   background-image:
     url("../images/sprites.png"),
@@ -64,10 +64,10 @@
     url("../images/sprites.png"),
     -webkit-linear-gradient(
       -90deg,
-      #ffffff 0,
+      #fff 0,
       #e8e8e8 100%);
   background-repeat: no-repeat, repeat-y;
-  border: 1px solid #dddddd;
+  border: 1px solid #ddd;
   border-radius: 4px;
   -moz-box-shadow: 0 0 0 rgba(0,0,0,0.3333) inset;
   -webkit-box-shadow: 0 0 0 rgba(0,0,0,0.3333) inset;
@@ -404,13 +404,13 @@ td.group-title {
 /* @group Attachments */
 
 .views-displays {
-  border: 1px solid #CCC;
+  border: 1px solid #ccc;
   padding-bottom: 36px;
 }
 
 .views-display-top {
   background-color: #e1e2dc;
-  border-bottom: 1px solid #CCCCCC;
+  border-bottom: 1px solid #ccc;
   padding: 8px 8px 8px; /* LTR */
   position: relative;
 }
@@ -464,7 +464,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
  */
 .views-displays ul.secondary li.active a.active.error,
 .views-displays .secondary a.error {
-  border: 2px solid #ED541D;
+  border: 2px solid #ed541d;
   padding: 1px 6px;
 }
 
@@ -473,14 +473,14 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 .views-displays ul.secondary li a {
-  background-color: #ffffff;
+  background-color: #fff;
 }
 
 .views-displays ul.secondary li a:hover,
 .views-displays ul.secondary li.active a,
 .views-displays ul.secondary li.active a.active {
-  background-color: #555555;
-  color: #ffffff;
+  background-color: #555;
+  color: #fff;
 }
 
 .views-displays .secondary .open > a {
@@ -521,7 +521,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 .views-displays .secondary .action-list li:hover {
-  background-color: #dddddd;
+  background-color: #ddd;
 }
 
 /* @end */
@@ -539,9 +539,9 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 #edit-display-settings-top {
-  border: 1px solid #F3F3F3;
+  border: 1px solid #f3f3f3;
   line-height: 20px;
-  margin: 0;
+  margin: 0 0 15px 0;
   padding-top: 4px;
   padding-bottom: 4px;
   position: relative;
@@ -551,10 +551,6 @@ ul#views-display-menu-tabs li.add ul.action-list li{
   margin-top: 12px;
 }
 
-#edit-display-settings-main {
-  margin-top: 15px;
-}
-
 /* @end */
 
 /* @group Attachment columns
@@ -563,7 +559,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
  */
 
 .views-display-column {
-  border: 1px solid #F3F3F3;
+  border: 1px solid #f3f3f3;
 }
 
 .views-display-column + .views-display-column {
@@ -577,11 +573,6 @@ ul#views-display-menu-tabs li.add ul.action-list li{
  * The auto-preview checkbox line.
  */
 
-#views-ui-preview-form > div > div,
-#views-ui-preview-form > div > input {
-  float: left;
-}
-
 #views-ui-preview-form .form-type-checkbox {
   margin-top: 2px;
   margin-left: 2px;
@@ -608,6 +599,17 @@ ul#views-display-menu-tabs li.add ul.action-list li{
   margin-right: 0.75em;
 }
 
+.form-item-live-preview,
+.form-item-view-args,
+#preview-submit-wrapper {
+  display: inline-block;
+}
+
+.form-item-live-preview,
+#preview-submit-wrapper {
+  vertical-align: top;
+}
+
 @media screen and (min-width:45em) { /* 720px */
   #views-ui-preview-form .form-type-textfield .description {
     white-space: nowrap;
@@ -700,7 +702,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
  */
 
 .views-ui-display-tab-bucket .views-display-setting {
-  color: #666666;
+  color: #666;
   font-size: 12px;
   padding-bottom: 2px;
 }
@@ -720,6 +722,10 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 
 /* @end */
 
+.views-edit-view {
+  margin-bottom: 15px;
+}
+
 /* @group Preview
  *
  * The preview controls and the preview pane
@@ -770,8 +776,8 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 .views-ui-dialog .ui-dialog-titlebar-close {
-  background: url("../images/close.png") no-repeat scroll 6px 3px #F3F4EE;
-  border-color: #aaaaaa;
+  background: url("../images/close.png") no-repeat scroll 6px 3px #f3f4ee;
+  border-color: #aaa;
   border-radius: 0 10px 12px 0;
   border-style: solid;
   border-width: 1px 1px 1px 0;
@@ -789,17 +795,17 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 .views-filterable-options .form-type-checkbox {
-  border: 1px solid #CCC;
+  border: 1px solid #ccc;
   padding: 5px 8px;
   border-top: none;
 }
 
 .views-filterable-options {
-  border-top:  1px solid #CCC;
+  border-top:  1px solid #ccc;
 }
 
 .views-filterable-options .even .form-type-checkbox {
-  background-color: #F3F4EE;
+  background-color: #f3f4ee;
 }
 
 .filterable-option .form-item {
@@ -845,7 +851,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 
 .views-ui-dialog #views-ajax-title,
 .views-ui-dialog .views-override {
-  background-color: #F3F4EE;
+  background-color: #f3f4ee;
 }
 
 .views-ui-dialog .views-override {
@@ -877,7 +883,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 .views-ui-dialog .scroll {
-  border: 1px solid #CCC;
+  border: 1px solid #ccc;
   border-width: 1px 0;
   padding: 8px 13px;
 }
@@ -887,7 +893,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 .views-ui-dialog .form-buttons {
-  background-color: #F3F4EE;
+  background-color: #f3f4ee;
   padding: 8px 13px;
 }
 .views-ui-dialog .form-buttons input {
@@ -903,7 +909,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 /* @todo Make this a class to be used anywhere there's node types? */
 .form-type-checkboxes #edit-options-value,
 .form-type-checkboxes #edit-options-validate-options-node-types {
-  border-color: #CCCCCC;
+  border-color: #ccc;
   border-style: solid;
   border-width: 1px;
   max-height: 210px;
@@ -922,25 +928,25 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 #views-ui-rearrange-filter-form tr td[rowspan] {
-  border-color: #CDCDCD;
+  border-color: #cdcdcd;
   border-style: solid;
   border-width: 0 1px 1px 1px;
 }
 
 #views-ui-rearrange-filter-form tr[id^="views-row"] {
-  border-right: 1px solid #CDCDCD;
+  border-right: 1px solid #cdcdcd;
 }
 
 #views-ui-rearrange-filter-form tr[id^="views-row"].even td {
-  background-color: #F3F4ED;
+  background-color: #f3f4ed;
 }
 
 #views-ui-rearrange-filter-form .views-group-title {
-  border-top: 1px solid #CDCDCD;
+  border-top: 1px solid #cdcdcd;
 }
 
 #views-ui-rearrange-filter-form .group-empty {
-  border-bottom: 1px solid #CDCDCD;
+  border-bottom: 1px solid #cdcdcd;
 }
 
 /* @end */
@@ -960,8 +966,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 /* @group Live preview elements */
 
 #views-preview-wrapper {
-  border: 1px solid #CCC;
-  border-top: 2px solid #CCC;
+  border: 1px solid #ccc;
   padding-bottom: 12px;
   padding-top: 12px;
 }
@@ -994,7 +999,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 }
 
 #views-live-preview .preview-section {
-  border: 1px dashed #DEDEDE;
+  border: 1px dashed #dedede;
   margin: 0 -5px;
   padding: 3px 5px;
 }
@@ -1012,7 +1017,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 
 .views-query-info table {
   border-collapse: separate;
-  border-color: #dddddd;
+  border-color: #ddd;
   border-spacing: 0;
   margin: 10px 0;
 }
@@ -1023,7 +1028,7 @@ ul#views-display-menu-tabs li.add ul.action-list li{
 
 .views-query-info table th,
 .views-query-info table td {
-  color: #666666;
+  color: #666;
   padding: 4px 10px;
 }
 
diff --git a/core/themes/seven/style.css b/core/themes/seven/style.css
index 4f6691bf6bb..1b593caf7d1 100644
--- a/core/themes/seven/style.css
+++ b/core/themes/seven/style.css
@@ -1130,10 +1130,6 @@ details.fieldset-no-legend {
   font-size: 1em;
 }
 
-#views-ui-preview-form .form-submit {
-  margin-top: 3px;
-}
-
 .views-admin input.form-submit,
 .views-ui-dialog input.form-submit,
 .views-admin a.button,