diff --git a/core/lib/Drupal/Core/Render/Element/Dropbutton.php b/core/lib/Drupal/Core/Render/Element/Dropbutton.php
index c91f210..c690089 100644
--- a/core/lib/Drupal/Core/Render/Element/Dropbutton.php
+++ b/core/lib/Drupal/Core/Render/Element/Dropbutton.php
@@ -35,7 +35,7 @@ public function getInfo() {
   public static function preRenderDropbutton($element) {
     $element['#attached']['library'][] = 'core/drupal.dropbutton';
     $element['#attributes']['class'][] = 'dropbutton__menu';
-		$element['#attributes']['class'][] = 'js-dropbutton__menu';
+    $element['#attributes']['class'][] = 'js-dropbutton__menu';
     if (!isset($element['#theme_wrappers'])) {
       $element['#theme_wrappers'] = array();
     }
diff --git a/core/misc/dropbutton/dropbutton.css b/core/misc/dropbutton/dropbutton.css
index 4f5ac5b..8e0fb82 100644
--- a/core/misc/dropbutton/dropbutton.css
+++ b/core/misc/dropbutton/dropbutton.css
@@ -186,5 +186,5 @@
   /* Other declarations */
   border-radius: 0;
   border-top-right-radius: 20em;
-  border-bottom-right-radius: 20em;	
+  border-bottom-right-radius: 20em;
 }
diff --git a/core/misc/dropbutton/dropbutton.js b/core/misc/dropbutton/dropbutton.js
index 181ff08..a8d4077 100644
--- a/core/misc/dropbutton/dropbutton.js
+++ b/core/misc/dropbutton/dropbutton.js
@@ -125,7 +125,7 @@
         });
     }
     else {
-			//TODO route through button theming
+      //TODO route through button theming
       this.$dropbutton.addClass('dropbutton--single');
       var $action = this.$actions.slice(0, 1).find('a');
       $action.unwrap().unwrap().addClass('button dropbutton__action');
diff --git a/core/modules/book/src/Tests/BookTest.php b/core/modules/book/src/Tests/BookTest.php
index d8c3c54..d786024 100644
--- a/core/modules/book/src/Tests/BookTest.php
+++ b/core/modules/book/src/Tests/BookTest.php
@@ -692,7 +692,7 @@ public function testAdminBookNodeListing() {
     $this->drupalGet('admin/structure/book/' . $this->book->id());
     $this->assertText($this->book->label(), 'The book title is displayed on the administrative book listing page.');
 
-    $elements = $this->xpath('//table//ul[@class="dropbutton__menu"]/li/a');
+    $elements = $this->xpath('//table//div[@class="dropbutton"]//a');
     $this->assertEqual((string) $elements[0], 'View', 'View link is found from the list.');
   }
 
diff --git a/core/modules/field_ui/src/Tests/ManageFieldsTest.php b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
index 4f0bcde..2791b63 100644
--- a/core/modules/field_ui/src/Tests/ManageFieldsTest.php
+++ b/core/modules/field_ui/src/Tests/ManageFieldsTest.php
@@ -150,7 +150,7 @@ function manageFieldsPage($type = '') {
     // Assert entity operations for all fields.
     $number_of_links = 3;
     $number_of_links_found = 0;
-    $operation_links = $this->xpath('//ul[@class = "dropbutton__menu"]/li/a');
+    $operation_links = $this->xpath('//div[@class = "dropbutton"]//a');
     $url = base_path() . "admin/structure/types/manage/$type/fields/node.$type.body";
 
     foreach ($operation_links as $link) {
diff --git a/core/modules/node/src/Tests/AssertButtonsTrait.php b/core/modules/node/src/Tests/AssertButtonsTrait.php
index 96eb6c8..8742f94 100644
--- a/core/modules/node/src/Tests/AssertButtonsTrait.php
+++ b/core/modules/node/src/Tests/AssertButtonsTrait.php
@@ -35,7 +35,7 @@ public function assertButtons($buttons, $dropbutton = TRUE) {
       $this->assertTrue(empty($save_button));
 
       // Dropbutton elements.
-      $elements = $this->xpath('//div[@class="dropbutton-wrapper"]//input[@type="submit"]');
+      $elements = $this->xpath('//div[@class="dropbutton"]//input[@type="submit"]');
       $this->assertEqual($count, count($elements));
       foreach ($elements as $element) {
         $value = isset($element['value']) ? (string) $element['value'] : '';
@@ -46,7 +46,7 @@ public function assertButtons($buttons, $dropbutton = TRUE) {
     else {
       // Assert there is a save button.
       $this->assertTrue(!empty($save_button));
-      $this->assertNoRaw('dropbutton-wrapper');
+      $this->assertNoRaw('dropbutton');
     }
   }
 }
diff --git a/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php b/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php
index 24280a7..0666b1c 100644
--- a/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php
+++ b/core/modules/views/src/Tests/Plugin/RowRenderCacheTest.php
@@ -157,7 +157,7 @@ protected function doTestRenderedOutput(AccountInterface $account, $check_cache
       $output = $view->style_plugin->getField($index, 'delete_node');
       $this->assertEqual($output, $expected);
 
-      $expected = $access ? "  <div class=\"dropbutton\"><ul class=\"dropbutton__menu\">" .
+      $expected = $access ? "<div class=\"dropbutton\"><ul class=\"dropbutton__menu\">" .
           "<li class=\"edit\"><a href=\"$node_url/edit?destination=/\" hreflang=\"en\">Edit</a></li>" .
           "<li class=\"delete\"><a href=\"$node_url/delete?destination=/\" hreflang=\"en\">Delete</a></li>" .
           "</ul></div>" : "";
diff --git a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
index 1b4e475..0b04d67 100644
--- a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
+++ b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
@@ -60,7 +60,7 @@ tips:
     body: 'Add, rearrange or remove filters.'
     weight: 7
     attributes:
-      data-class: 'views-ui-display-tab-bucket.filter .dropbutton-widget'
+      data-class: 'views-ui-display-tab-bucket.filter .dropbutton'
   views-ui-sorts:
     id: views-ui-sorts
     plugin: text
@@ -76,7 +76,7 @@ tips:
     body: 'Add, rearrange or remove sorting rules.'
     weight: 9
     attributes:
-      data-class: 'views-ui-display-tab-bucket.sort .dropbutton-widget'
+      data-class: 'views-ui-display-tab-bucket.sort .dropbutton'
   views-ui-preview:
     id: views-ui-preview
     plugin: text
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index b11f54a..916fdff 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -419,7 +419,7 @@ public function getDisplayDetails($view, $display) {
 
       // Because some of the 'links' are actually submit buttons, we have to
       // manually wrap each item in <li> and the whole list in <ul>.
-      $build['top']['actions']['prefix']['#markup'] = '<ul class="dropbutton">';
+      $build['top']['actions']['prefix']['#markup'] = '<ul class="dropbutton__menu">';
 
       if (!$is_display_deleted) {
         if (!$is_enabled) {