diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index bb3fbdf..81bddad 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -1328,9 +1328,6 @@ public function optionsSummary(&$categories, &$options) {
    */
   public function buildOptionsForm(&$form, &$form_state) {
     parent::buildOptionsForm($form, $form_state);
-    if ($this->defaultableSections($form_state['section'])) {
-      views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
-    }
     $form['#title'] = check_plain($this->display['display_title']) . ': ';
 
     // Set the 'section' to hilite on the form.
diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc
index b3bcda1..97b030b 100644
--- a/core/modules/views/views_ui/admin.inc
+++ b/core/modules/views/views_ui/admin.inc
@@ -378,17 +378,9 @@ function views_ui_pre_render_move_argument_options($form) {
 }
 
 /**
- * Add a <select> dropdown for a given section, allowing the user to
- * change whether this info is stored on the default display or on
- * the current display.
+ * Adds a wrapper element for each views form.
  */
-function views_ui_standard_display_dropdown(&$form, &$form_state, $section) {
-  $view = &$form_state['view'];
-  $display_id = $form_state['display_id'];
-  $executable = $view->get('executable');
-  $displays = $executable->displayHandlers;
-  $current_display = $executable->display_handler;
-
+function views_ui_edit_standard_wrapper(&$form, &$form_state) {
   // @todo Move this to a separate function if it's needed on any forms that
   // don't have the display dropdown.
   $form['override'] = array(
@@ -399,49 +391,12 @@ function views_ui_standard_display_dropdown(&$form, &$form_state, $section) {
   );
 
   // Add the "2 of 3" progress indicator.
-  if ($form_progress = $view->getFormProgress()) {
+  if ($form_progress = $form_state['view']->getFormProgress()) {
     $form['progress']['#markup'] = '<div id="views-progress-indicator">' . t('@current of @total', array('@current' => $form_progress['current'], '@total' => $form_progress['total'])) . '</div>';
     $form['progress']['#weight'] = -1001;
   }
-
-  if ($current_display->isDefaultDisplay()) {
-    return;
-  }
-
-  // Determine whether any other displays have overrides for this section.
-  $section_overrides = FALSE;
-  $section_defaulted = $current_display->isDefaulted($section);
-  foreach ($displays as $id => $display) {
-    if ($id === 'default' || $id === $display_id) {
-      continue;
-    }
-    if ($display && !$display->isDefaulted($section)) {
-      $section_overrides = TRUE;
-    }
-  }
-
-  $display_dropdown['default'] = ($section_overrides ? t('All displays (except overridden)') : t('All displays'));
-  $display_dropdown[$display_id] = t('This @display_type (override)', array('@display_type' => $current_display->getPluginId()));
-  // Only display the revert option if we are in a overridden section.
-  if (!$section_defaulted) {
-    $display_dropdown['default_revert'] = t('Revert to default');
-  }
-
-  $form['override']['dropdown'] = array(
-    '#type' => 'select',
-    '#title' => t('For'), // @TODO: Translators may need more context than this.
-    '#options' => $display_dropdown,
-  );
-  if ($current_display->isDefaulted($section)) {
-    $form['override']['dropdown']['#default_value'] = 'defaults';
-  }
-  else {
-    $form['override']['dropdown']['#default_value'] = $display_id;
-  }
-
 }
 
-
 /**
  * Returns information about subforms for editing the pieces of a view.
  *
@@ -730,18 +685,17 @@ function views_ui_edit_display_form($form, &$form_state) {
   $form['#title'] = $form['options']['#title'];
   unset($form['options']['#title']);
 
-  // Move the override dropdown out of the scrollable section of the form.
-  if (isset($form['options']['override'])) {
-    $form['override'] = $form['options']['override'];
-    unset($form['options']['override']);
-  }
-
   $name = NULL;
   if (isset($form_state['update_name'])) {
     $name = $form_state['update_name'];
   }
 
   $view->getStandardButtons($form, $form_state, 'views_ui_edit_display_form', $name);
+
+  if ($executable->display_handler->defaultableSections($section)) {
+    $view->getApplyOverrideButton($form, $form_state);
+  }
+
   return $form;
 }
 
@@ -795,9 +749,10 @@ function views_ui_rearrange_form($form, &$form_state) {
   $form['#title'] = t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
   $form['#section'] = $display_id . 'rearrange-item';
 
+  views_ui_edit_standard_wrapper($form, $form_state);
+
   if ($display->defaultableSections($types[$type]['plural'])) {
     $form_state['section'] = $types[$type]['plural'];
-    views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
   }
 
   $count = 0;
@@ -863,6 +818,8 @@ function views_ui_rearrange_form($form, &$form_state) {
   }
 
   $view->getStandardButtons($form, $form_state, 'views_ui_rearrange_form');
+  $view->getApplyOverrideButton($form, $form_state);
+
   return $form;
 }
 
@@ -916,9 +873,9 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
   $form['#title'] .= t('Rearrange @type', array('@type' => $types[$type]['ltitle']));
   $form['#section'] = $display_id . 'rearrange-item';
 
+  views_ui_edit_standard_wrapper($form, $form_state);
   if ($display->defaultableSections($types[$type]['plural'])) {
     $form_state['section'] = $types[$type]['plural'];
-    views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
   }
 
   if (!empty($view->form_cache)) {
@@ -1066,6 +1023,8 @@ function views_ui_rearrange_filter_form($form, &$form_state) {
   }
 
   $view->getStandardButtons($form, $form_state, 'views_ui_rearrange_filter_form');
+  $view->getApplyOverrideButton($form, $form_state);
+
   $form['buttons']['add_group'] = array(
     '#type' => 'submit',
     '#value' => t('Create new filter group'),
@@ -1206,7 +1165,7 @@ function views_ui_add_item_form($form, &$form_state) {
 
   $types = ViewExecutable::viewsHandlerTypes();
   $ltitle = $types[$type]['ltitle'];
-  $section = $types[$type]['plural'];
+  $form_state['section'] = $types[$type]['plural'];
 
   if (!empty($types[$type]['type'])) {
     $type = $types[$type]['type'];
@@ -1216,7 +1175,7 @@ function views_ui_add_item_form($form, &$form_state) {
   $form['#section'] = $display_id . 'add-item';
 
   // Add the display override dropdown.
-  views_ui_standard_display_dropdown($form, $form_state, $section);
+  views_ui_edit_standard_wrapper($form, $form_state);
 
   // Figure out all the base tables allowed based upon what the relationships provide.
   $base_tables = $executable->getBaseTables();
@@ -1313,12 +1272,14 @@ function views_ui_add_item_form($form, &$form_state) {
     '#attributes' => array('class' => array('container-inline', 'views-add-form-selected')),
   );
   $view->getStandardButtons($form, $form_state, 'views_ui_add_item_form', t('Add and configure @types', array('@types' => $ltitle)));
+//  $view->getApplyOverrideButton($form, $form_state);
 
   // Remove the default submit function.
   $form['buttons']['submit']['#submit'] = array_filter($form['buttons']['submit']['#submit'], function($var) {
     return !(is_array($var) && isset($var[1]) && $var[1] == 'standardSubmit');
   });
   $form['buttons']['submit']['#submit'][] = array($view, 'submitItemAdd');
+  $form['buttons']['submit']['#button_type'] = 'primary';
 
   return $form;
 }
@@ -1372,6 +1333,8 @@ function views_ui_config_item_form($form, &$form_state) {
   $type = $form_state['type'];
   $id = $form_state['id'];
 
+  views_ui_edit_standard_wrapper($form, $form_state);
+
   $form = array(
     'options' => array(
       '#tree' => TRUE,
@@ -1398,7 +1361,6 @@ function views_ui_config_item_form($form, &$form_state) {
       // that lets the user choose which display the changes should apply to.
       if ($executable->display_handler->defaultableSections($types[$type]['plural'])) {
         $form_state['section'] = $types[$type]['plural'];
-        views_ui_standard_display_dropdown($form, $form_state, $form_state['section']);
       }
 
       // A whole bunch of code to figure out what relationships are valid for
@@ -1484,6 +1446,7 @@ function views_ui_config_item_form($form, &$form_state) {
     }
 
     $view->getStandardButtons($form, $form_state, 'views_ui_config_item_form', $name, t('Remove'), 'remove');
+    $view->getApplyOverrideButton($form, $form_state);
     // Only validate the override values, because this values are required for
     // the override selection.
     $form['buttons']['remove']['#limit_validation_errors'] = array(array('override'));
@@ -1658,6 +1621,7 @@ function views_ui_config_item_group_form($type, &$form_state) {
     }
 
     $view->getStandardButtons($form, $form_state, 'views_ui_config_item_group_form');
+    $view->getApplyOverrideButton($form, $form_state);
   }
   return $form;
 }
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 0dadec7..9cf6dd0 100644
--- a/core/modules/views/views_ui/css/views-admin.theme.css
+++ b/core/modules/views/views_ui/css/views-admin.theme.css
@@ -892,11 +892,12 @@ ul#views-display-menu-tabs li.add ul.action-list li{
   padding-left: 2em;
 }
 
-.views-ui-dialog .form-buttons {
+.views-ui-dialog .form-actions {
+  /** @todo Do we really want to have a custom background color? */
   background-color: #f3f4ee;
   padding: 8px 13px;
 }
-.views-ui-dialog .form-buttons input {
+.views-ui-dialog .form-actions input {
   margin-bottom: 0;
   margin-right: 0;
 }
diff --git a/core/modules/views/views_ui/js/views-admin.js b/core/modules/views/views_ui/js/views-admin.js
index a8fc481..59767dd 100644
--- a/core/modules/views/views_ui/js/views-admin.js
+++ b/core/modules/views/views_ui/js/views-admin.js
@@ -1060,7 +1060,7 @@ Drupal.viewsUi.resizeModal = function (e, no_shrink) {
   difference += $('.views-messages').outerHeight(true);
   difference += $('#views-ajax-title').outerHeight(true);
   difference += $('.views-add-form-selected').outerHeight(true);
-  difference += $('.form-buttons', $modal).outerHeight(true);
+  difference += $('.form-actions', $modal).outerHeight(true);
 
   height = scrollHeight + difference;
 
diff --git a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
index ab5a00f..43e9f23 100644
--- a/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
+++ b/core/modules/views/views_ui/lib/Drupal/views_ui/ViewUI.php
@@ -234,6 +234,63 @@ public function standardCancel($form, &$form_state) {
     $form_state['redirect'] = 'admin/structure/views/view/' . $this->id() . '/edit';
   }
 
+  public function getApplyOverrideButton(&$form, &$form_state) {
+    $view = &$form_state['view'];
+    $display_id = $form_state['display_id'];
+    $section = $form_state['section'];
+    $executable = $view->get('executable');
+    $displays = $executable->displayHandlers;
+    $current_display = $executable->display_handler;
+
+    if ($current_display->isDefaultDisplay()) {
+      return;
+    }
+
+    // Determine whether any other displays have overrides for this section.
+    $section_overrides = FALSE;
+    $section_defaulted = $current_display->isDefaulted($section);
+    foreach ($displays as $id => $display) {
+      if ($id === 'default' || $id === $display_id) {
+        continue;
+      }
+      if ($display && !$display->isDefaulted($section)) {
+        $section_overrides = TRUE;
+      }
+    }
+
+    $submit_button_text['default'] = ($section_overrides ? t('All displays (except overridden)') : t('All displays'));
+    $submit_button_text['override'] = t('This @display_type (override)', array('@display_type' => $current_display->getPluginId()));
+    // Only display the revert option if we are in a overridden section.
+    if (!$section_defaulted) {
+      $submit_button_text['default_revert'] = t('Revert to default');
+    }
+
+    $base['#submit'] = $form['buttons']['submit']['#submit'];
+    $base['#validate'] = $form['buttons']['submit']['#validate'];
+    unset($form['buttons']['submit']);
+    $form['buttons']['submit_all'] = $base + array(
+      '#type' => 'submit',
+      '#value' => $submit_button_text['default'],
+      '#dropbutton' => 'save',
+      '#button_type' => 'primary',
+    );
+    $form['buttons']['submit_override'] = $base + array(
+      '#type' => 'submit',
+      '#value' => $submit_button_text['override'],
+      '#dropbutton' => 'save',
+      '#button_type' => 'primary',
+    );
+
+    if (!$section_defaulted) {
+      $form['buttons']['submit_revert'] = $base + array(
+        '#type' => 'submit',
+        '#value' => $submit_button_text['default_revert'],
+        '#dropbutton' => 'save',
+        '#button_type' => 'primary',
+      );
+    }
+  }
+
   /**
    * Provide a standard set of Apply/Cancel/OK buttons for the forms. Also provide
    * a hidden op operator because the forms plugin doesn't seem to properly
@@ -244,8 +301,7 @@ public function standardCancel($form, &$form_state) {
    */
   public function getStandardButtons(&$form, &$form_state, $form_id, $name = NULL, $third = NULL, $submit = NULL) {
     $form['buttons'] = array(
-      '#prefix' => '<div class="clearfix"><div class="form-buttons">',
-      '#suffix' => '</div></div>',
+      '#type' => 'actions',
     );
 
     if (empty($name)) {
@@ -337,13 +393,24 @@ public function getStandardButtons(&$form, &$form_state, $form_id, $name = NULL,
    */
   public function getOverrideValues($form, $form_state) {
     // Make sure the dropdown exists in the first place.
-    if (isset($form_state['values']['override']['dropdown'])) {
-      // #default_value is used to determine whether it was the default value or not.
-      // So the available options are: $display, 'default' and 'default_revert', not 'defaults'.
-      $was_defaulted = ($form['override']['dropdown']['#default_value'] === 'defaults');
-      $is_defaulted = ($form_state['values']['override']['dropdown'] === 'default');
-      $revert = ($form_state['values']['override']['dropdown'] === 'default_revert');
-
+    if (in_array($form_state['triggering_element']['#parents'][0], array('submit_all', 'submit_override', 'submit_revert'))) {
+      switch ($form_state['triggering_element']['#parents'][0]) {
+        case 'submit_all':
+          $was_defaulted = TRUE;
+          $is_defaulted = TRUE;
+          $revert = FALSE;
+          break;
+        case 'submit_override':
+          $was_defaulted = TRUE;
+          $is_defaulted = FALSE;
+          $revert = FALSE;
+          break;
+        case 'submit_revert':
+          $was_defaulted = FALSE;
+          $is_defaulted = TRUE;
+          $revert = TRUE;
+          break;
+      }
       if ($was_defaulted !== $is_defaulted && isset($form['#section'])) {
         // We're changing which display these values apply to.
         // Update the #section so it knows what to mark changed.
diff --git a/core/themes/bartik/css/style.css b/core/themes/bartik/css/style.css
index 44deab1..dec30b1 100644
--- a/core/themes/bartik/css/style.css
+++ b/core/themes/bartik/css/style.css
@@ -1693,7 +1693,7 @@ div.admin-panel .description {
 .views-ui-dialog .ui-dialog-titlebar-close,
 .views-ui-dialog #views-ajax-title,
 .views-ui-dialog .views-override,
-.views-ui-dialog .form-buttons {
+.views-ui-dialog .form-actions {
   background-color: #f6f6f6;
 }