diff --git a/core/modules/views/views_ui/admin.inc b/core/modules/views/views_ui/admin.inc
index 5b0ae41..9924cb0 100644
--- a/core/modules/views/views_ui/admin.inc
+++ b/core/modules/views/views_ui/admin.inc
@@ -396,66 +396,16 @@ 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 the progress marker to the 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;
 
   // Add the "2 of 3" progress indicator.
-  // @TODO: Move this to a separate function if it's needed on any forms that
-  // don't have the display dropdown.
   if ($form_progress = $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'] = array(
-    '#prefix' => '<div class="views-override clearfix container-inline">',
-    '#suffix' => '</div>',
-    '#weight' => -1000,
-    '#tree' => TRUE,
-  );
-  $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;
-  }
-
 }
 
 
@@ -1324,6 +1274,7 @@ 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_diff($form['buttons']['submit']['#submit'], array(array($view, 'standardSubmit')));
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 a1aec9e..d127daf 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
@@ -217,6 +217,89 @@ public function standardCancel($form, &$form_state) {
     $form_state['redirect'] = 'admin/structure/views/view/' . $this->get('name') . '/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;
+      }
+    }
+
+//    $form['override'] = array(
+//      '#prefix' => '<div class="views-override clearfix container-inline">',
+//      '#suffix' => '</div>',
+//      '#weight' => -1000,
+//      '#tree' => TRUE,
+//    );
+//    $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;
+//    }
+
+
+    $submit_button_text['default'] = ($section_overrides ? t('All displays (except overridden)') : t('All displays'));
+    $submit_button_text[$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) {
+      $submit_button_text['default_revert'] = t('Revert to default');
+    }
+
+    $form['buttons']['submit'] = array(
+      '#theme_wrappers' => array('dropbutton_wrapper'),
+    );
+
+    // Because the elements are not links but buttons, we have to manually wrap
+    // each item in <li> and the whole list in <ul>.
+    $form['buttons']['submit']['prefix']['#markup'] = '<ul class="dropbutton">';
+
+    $form['buttons']['submit']['submit_all'] = array(
+      '#type' => 'submit',
+      '#value' => $submit_button_text['default'],
+      '#prefix' => '<li class="submit-all">',
+      "#suffix" => '</li>',
+    );
+    $form['buttons']['submit']['submit_override'] = array(
+      '#type' => 'submit',
+      '#value' => $submit_button_text[$display_id],
+      '#prefix' => '<li class="submit-override">',
+      "#suffix" => '</li>',
+    );
+
+    if (!$section_defaulted) {
+      $form['buttons']['submit']['submit_revert'] = array(
+        '#type' => 'submit',
+        '#value' => $submit_button_text['default_revert'],
+        '#prefix' => '<li class="submit-revert">',
+        "#suffix" => '</li>',
+      );
+    }
+
+    $form['buttons']['submit']['suffix']['#markup'] = '</ul>';
+  }
+
   /**
    * 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