diff --git a/core/modules/field_ui/css/field_ui.admin.css b/core/modules/field_ui/css/field_ui.admin.css
index 0cf7a68..18ca244 100644
--- a/core/modules/field_ui/css/field_ui.admin.css
+++ b/core/modules/field_ui/css/field_ui.admin.css
@@ -3,39 +3,25 @@
  * Stylesheet for the Field UI module.
  */
 
-/* 'Manage fields' and 'Manage display' overviews */
-.field-ui-overview .region-title td {
-  font-weight: bold;
-}
-.field-ui-overview .region-message td {
-  font-style: italic;
-}
-
 /* 'Manage form display' and 'Manage display' overview */
-.field-ui-overview .field-plugin-summary-cell {
+.field-ui-overview .field-ui__plugin-summary-wrapper {
   line-height: 1em;
 }
-.field-ui-overview .field-plugin-summary {
+.field-ui-overview .field-ui__plugin-summary {
   float: left;
-  font-size: .9em;
+  font-size: 0.9em;
 }
 .field-ui-overview .field-plugin-summary-cell .warning {
   display: block;
   float: left;
-  margin-right: .5em;
-}
-.field-ui-overview .field-plugin-settings-edit-wrapper {
-  float: right;
-}
-.field-ui-overview .field-plugin-settings-edit {
-  float: right;
+  margin-right: 0.5em;
 }
-.field-ui-overview .field-plugin-settings-editing td {
+.field-ui-overview .field-ui__edit-plugin-settings td {
   vertical-align: top;
 }
 .field-ui-overview .field-plugin-settings-editing .field-plugin-type {
   display: none;
 }
-.field-ui-overview .field-plugin-settings-edit-form .plugin-name {
+.field-ui-overview .field-plugin-settings-edit-form .field-ui__plugin-name {
   font-weight: bold;
 }
diff --git a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
index c982167..f090db2 100644
--- a/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
+++ b/core/modules/field_ui/src/Form/EntityDisplayFormBase.php
@@ -400,7 +400,7 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr
               ),
             ),
           );
-          $field_row['#attributes']['class'][] = 'field-plugin-settings-editing';
+          $field_row['#attributes']['class'][] = 'field-ui__edit-plugin-settings';
         }
       }
     }
@@ -419,9 +419,11 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr
         if (!empty($summary)) {
           $field_row['settings_summary'] = array(
             '#type' => 'inline_template',
-            '#template' => '<div class="field-plugin-summary">{{ summary|safe_join("<br />") }}</div>',
+            '#template' => '<div class="field-ui__plugin-summary">{{ summary|safe_join("<br />") }}</div>',
             '#context' => array('summary' => $summary),
-            '#cell_attributes' => array('class' => array('field-plugin-summary-cell')),
+            '#cell_attributes' => [
+              'class' => ['field-ui__plugin-summary-wrapper'],
+            ],
           );
         }
 
diff --git a/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php b/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
index cb2086d..ae9f6b9 100644
--- a/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
+++ b/core/modules/field_ui/src/Form/EntityFormDisplayEditForm.php
@@ -46,7 +46,7 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr
     $field_row['plugin']['#title'] = $this->t('Formatter for @title', array('@title' => $field_definition->getLabel()));
     if (!empty($field_row['plugin']['settings_edit_form']) && ($plugin = $this->entity->getRenderer($field_name))) {
       $plugin_type_info = $plugin->getPluginDefinition();
-      $field_row['plugin']['settings_edit_form']['label']['#markup'] = $this->t('Widget settings:') . ' <span class="plugin-name">' . $plugin_type_info['label'] . '</span>';
+      $field_row['plugin']['settings_edit_form']['label']['#markup'] = $this->t('Widget settings:') . ' <span class="field-ui__plugin-name">' . $plugin_type_info['label'] . '</span>';
     }
 
     return $field_row;
diff --git a/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php b/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
index 84331f2..5b9cfcc 100644
--- a/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
+++ b/core/modules/field_ui/src/Form/EntityViewDisplayEditForm.php
@@ -61,7 +61,7 @@ protected function buildFieldRow(FieldDefinitionInterface $field_definition, arr
     $field_row['plugin']['#title'] = $this->t('Formatter for @title', array('@title' => $field_definition->getLabel()));
     if (!empty($field_row['plugin']['settings_edit_form']) && ($plugin = $this->entity->getRenderer($field_name))) {
       $plugin_type_info = $plugin->getPluginDefinition();
-      $field_row['plugin']['settings_edit_form']['label']['#markup'] = $this->t('Format settings:') . ' <span class="plugin-name">' . $plugin_type_info['label'] . '</span>';
+      $field_row['plugin']['settings_edit_form']['label']['#markup'] = $this->t('Format settings:') . ' <span class="field-ui__plugin-name">' . $plugin_type_info['label'] . '</span>';
     }
 
     return $field_row;