diff --git a/core/modules/action/src/Form/ActionAdminManageForm.php b/core/modules/action/src/Form/ActionAdminManageForm.php
index 0c42f18..fc66471 100644
--- a/core/modules/action/src/Form/ActionAdminManageForm.php
+++ b/core/modules/action/src/Form/ActionAdminManageForm.php
@@ -65,7 +65,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['parent'] = array(
       '#type' => 'details',
       '#title' => $this->t('Create an advanced action'),
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => array('class' => array('form--inline')),
       '#open' => TRUE,
     );
     $form['parent']['action'] = array(
diff --git a/core/modules/comment/src/Form/CommentAdminOverview.php b/core/modules/comment/src/Form/CommentAdminOverview.php
index 97515b2..7d1a2c1 100644
--- a/core/modules/comment/src/Form/CommentAdminOverview.php
+++ b/core/modules/comment/src/Form/CommentAdminOverview.php
@@ -108,7 +108,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $type = '
       '#type' => 'details',
       '#title' => $this->t('Update options'),
       '#open' => TRUE,
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => array('class' => array('form--inline')),
     );
 
     if ($type == 'approval') {
@@ -126,7 +126,10 @@ public function buildForm(array $form, FormStateInterface $form_state, $type = '
       '#options' => $options,
       '#default_value' => 'publish',
     );
-    $form['options']['submit'] = array(
+    $form['options']['actions'] = array(
+      '#type' => 'actions'
+    );
+    $form['options']['actions']['submit'] = array(
       '#type' => 'submit',
       '#value' => $this->t('Update'),
     );
diff --git a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
index dfe750e..71c17f9 100644
--- a/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
+++ b/core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php
@@ -29,7 +29,7 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
     // the Field module.
 
     $element['#theme_wrappers'][] = 'datetime_wrapper';
-    $element['#attributes']['class'][] = 'container-inline';
+    $element['#attributes']['class'][] = 'form--inline';
 
     $element['value'] = array(
       '#type' => 'datetime',
diff --git a/core/modules/dblog/src/Form/DblogFilterForm.php b/core/modules/dblog/src/Form/DblogFilterForm.php
index 1795129..58ddb33 100644
--- a/core/modules/dblog/src/Form/DblogFilterForm.php
+++ b/core/modules/dblog/src/Form/DblogFilterForm.php
@@ -48,7 +48,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $form['filters']['actions'] = array(
       '#type' => 'actions',
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => array('class' => array('form--inline')),
     );
     $form['filters']['actions']['submit'] = array(
       '#type' => 'submit',
diff --git a/core/modules/editor/editor.admin.inc b/core/modules/editor/editor.admin.inc
index 83bc2cf..b1e38b4 100644
--- a/core/modules/editor/editor.admin.inc
+++ b/core/modules/editor/editor.admin.inc
@@ -92,7 +92,7 @@ function editor_image_upload_settings_form(Editor $editor) {
   $form['max_dimensions'] = array(
     '#type' => 'item',
     '#title' => t('Maximum dimensions'),
-    '#field_prefix' => '<div class="container-inline clearfix">',
+    '#field_prefix' => '<div class="form--inline clearfix">',
     '#field_suffix' => '</div>',
     '#description' => t('Images larger than these dimensions will be scaled down.'),
     '#states' => $show_if_image_uploads_enabled,
diff --git a/core/modules/editor/src/Form/EditorImageDialog.php b/core/modules/editor/src/Form/EditorImageDialog.php
index 9c2feb5..aee0a94 100644
--- a/core/modules/editor/src/Form/EditorImageDialog.php
+++ b/core/modules/editor/src/Form/EditorImageDialog.php
@@ -147,7 +147,7 @@ public function buildForm(array $form, FormStateInterface $form_state, FilterFor
       '#type' => 'fieldset',
       '#title' => $this->t('Image size'),
       '#attributes' => array('class' => array(
-        'container-inline',
+        'form--inline',
         'fieldgroup',
         'form-composite',
       )),
@@ -192,8 +192,8 @@ public function buildForm(array $form, FormStateInterface $form_state, FilterFor
           'right' => $this->t('Right'),
         ),
         '#default_value' => $image_element['data-align'] === '' ? 'none' : $image_element['data-align'],
-        '#wrapper_attributes' => array('class' => array('container-inline')),
-        '#attributes' => array('class' => array('container-inline')),
+        '#wrapper_attributes' => array('class' => array('form--inline')),
+        '#attributes' => array('class' => array('form--inline')),
         '#parents' => array('attributes', 'data-align'),
       );
     }
diff --git a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
index d9c1120..85ae8ff 100644
--- a/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
+++ b/core/modules/image/src/Plugin/Field/FieldType/ImageItem.php
@@ -207,7 +207,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#title' => t('Maximum image resolution'),
       '#element_validate' => array(array(get_class($this), 'validateResolution')),
       '#weight' => 4.1,
-      '#field_prefix' => '<div class="container-inline">',
+      '#field_prefix' => '<div class="form--inline">',
       '#field_suffix' => '</div>',
       '#description' => t('The maximum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a larger image is uploaded, it will be resized to reflect the given width and height. Resizing images on upload will cause the loss of <a href="@url">EXIF data</a> in the image.', array('@url' => 'http://en.wikipedia.org/wiki/Exchangeable_image_file_format')),
     );
@@ -234,7 +234,7 @@ public function fieldSettingsForm(array $form, FormStateInterface $form_state) {
       '#title' => t('Minimum image resolution'),
       '#element_validate' => array(array(get_class($this), 'validateResolution')),
       '#weight' => 4.2,
-      '#field_prefix' => '<div class="container-inline">',
+      '#field_prefix' => '<div class="form--inline">',
       '#field_suffix' => '</div>',
       '#description' => t('The minimum allowed image size expressed as WIDTH×HEIGHT (e.g. 640×480). Leave blank for no restriction. If a smaller image is uploaded, it will be rejected.'),
     );
diff --git a/core/modules/locale/src/Form/TranslateFilterForm.php b/core/modules/locale/src/Form/TranslateFilterForm.php
index d283724..25ec6b2 100644
--- a/core/modules/locale/src/Form/TranslateFilterForm.php
+++ b/core/modules/locale/src/Form/TranslateFilterForm.php
@@ -64,7 +64,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
 
     $form['filters']['actions'] = array(
       '#type' => 'actions',
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => array('class' => array('form--inline')),
     );
     $form['filters']['actions']['submit'] = array(
       '#type' => 'submit',
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 7c371d6..19c13cd 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -812,7 +812,7 @@ function node_page_top(array &$page) {
     $page['page_top']['node_preview'] = array(
       '#type' => 'container',
       '#attributes' => array(
-        'class' => array('node-preview-container', 'container-inline')
+        'class' => array('node-preview-container', 'form--inline')
       ),
     );
 
diff --git a/core/modules/path/src/Form/PathFilterForm.php b/core/modules/path/src/Form/PathFilterForm.php
index 7c9a3f7..0df8c91 100644
--- a/core/modules/path/src/Form/PathFilterForm.php
+++ b/core/modules/path/src/Form/PathFilterForm.php
@@ -31,7 +31,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $keys = N
       '#type' => 'details',
       '#title' => $this->t('Filter aliases'),
       '#open' => TRUE,
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => array('class' => array('form--inline')),
     );
     $form['basic']['filter'] = array(
       '#type' => 'search',
diff --git a/core/modules/search/src/Form/SearchPageForm.php b/core/modules/search/src/Form/SearchPageForm.php
index 1f8d017..495f28d 100644
--- a/core/modules/search/src/Form/SearchPageForm.php
+++ b/core/modules/search/src/Form/SearchPageForm.php
@@ -46,7 +46,7 @@ public function form(array $form, FormStateInterface $form_state) {
     $form['basic'] = array(
       '#type' => 'container',
       '#attributes' => array(
-        'class' => array('container-inline'),
+        'class' => array('form--inline'),
       ),
     );
     $form['basic']['keys'] = array(
diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php
index 9095513..ad8937a 100644
--- a/core/modules/search/src/SearchPageListBuilder.php
+++ b/core/modules/search/src/SearchPageListBuilder.php
@@ -258,7 +258,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['search_pages']['add_page'] = array(
       '#type' => 'container',
       '#attributes' => array(
-        'class' => array('container-inline'),
+        'class' => array('form--inline'),
       ),
     );
     // In order to prevent validation errors for the parent form, this cannot be
diff --git a/core/modules/simpletest/src/Form/SimpletestResultsForm.php b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
index 49c086c..89f236c 100644
--- a/core/modules/simpletest/src/Form/SimpletestResultsForm.php
+++ b/core/modules/simpletest/src/Form/SimpletestResultsForm.php
@@ -130,7 +130,7 @@ public function buildForm(array $form, FormStateInterface $form_state, $test_id
     $form['action'] = array(
       '#type' => 'fieldset',
       '#title' => $this->t('Actions'),
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => array('class' => array('form--inline')),
       '#weight' => -11,
     );
 
diff --git a/core/modules/system/css/components/inline-form.theme.css b/core/modules/system/css/components/inline-form.theme.css
index 01a1100..9d96b8d 100644
--- a/core/modules/system/css/components/inline-form.theme.css
+++ b/core/modules/system/css/components/inline-form.theme.css
@@ -3,9 +3,17 @@
  * Visual styles for inline forms.
  */
 
+ .form--inline:after {
+   content: "";
+   display: table;
+   clear: both;
+}
+
 .form--inline .form-item {
   float: left; /* LTR */
   margin-right: 0.5em; /* LTR */
+  max-width: 100%;
+  margin-top: 0;
 }
 [dir="rtl"] .form--inline .form-item {
   float: right;
@@ -27,3 +35,6 @@
 [dir="rtl"] .form--inline .form-actions {
   clear: right;
 }
+.form--inline.form-actions {
+  margin-top: 0;
+}
diff --git a/core/modules/views/src/Plugin/views/field/Field.php b/core/modules/views/src/Plugin/views/field/Field.php
index e4e3b0a..32780e0 100644
--- a/core/modules/views/src/Plugin/views/field/Field.php
+++ b/core/modules/views/src/Plugin/views/field/Field.php
@@ -564,7 +564,7 @@ function multiple_options_form(&$form, FormStateInterface $form_state) {
       '#field_suffix' => $suffix,
       '#options' => $options,
       '#default_value' => $this->options['delta_limit'],
-      '#prefix' => '<div class="container-inline">',
+      '#prefix' => '<div class="form--inline">',
       '#states' => array(
         'visible' => array(
           ':input[name="options[group_rows]"]' => array('checked' => TRUE),
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 946d752..de50676 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -233,7 +233,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['displays']['page']['options']['style'] = array(
       '#type' => 'fieldset',
       '#title' => $this->t('Page display settings'),
-      '#attributes' => array('class' => array('container-inline', 'fieldset-no-legend')),
+      '#attributes' => array('class' => array('form--inline', 'fieldset-no-legend')),
     );
 
     // Create the dropdown for choosing the display format.
@@ -374,7 +374,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       $form['displays']['block']['options']['style'] = array(
         '#type' => 'fieldset',
         '#title' => $this->t('Block display settings'),
-        '#attributes' => array('class' => array('container-inline', 'fieldset-no-legend')),
+        '#attributes' => array('class' => array('form--inline', 'fieldset-no-legend')),
       );
 
       // Create the dropdown for choosing the display format.
diff --git a/core/modules/views_ui/src/Form/Ajax/AddHandler.php b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
index a60da37..4c38a5c 100644
--- a/core/modules/views_ui/src/Form/Ajax/AddHandler.php
+++ b/core/modules/views_ui/src/Form/Ajax/AddHandler.php
@@ -171,7 +171,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#markup' => '<span class="views-ui-view-title">' . $this->t('Selected:') . '</span> ' . '<div class="views-selected-options"></div>',
       '#theme_wrappers' => array('form_element', 'views_ui_container'),
       '#attributes' => array(
-        'class' => array('container-inline', 'views-add-form-selected', 'views-offset-bottom'),
+        'class' => array('form--inline', 'views-add-form-selected', 'views-offset-bottom'),
         'data-drupal-views-offset' => 'bottom',
       ),
     );
diff --git a/core/modules/views_ui/src/ViewAddForm.php b/core/modules/views_ui/src/ViewAddForm.php
index 1cb976e..ff6f18d 100644
--- a/core/modules/views_ui/src/ViewAddForm.php
+++ b/core/modules/views_ui/src/ViewAddForm.php
@@ -112,7 +112,7 @@ public function form(array $form, FormStateInterface $form_state) {
       '#type' => 'fieldset',
       '#title' => t('View settings'),
       '#tree' => TRUE,
-      '#attributes' => array('class' => array('container-inline')),
+      '#attributes' => array('class' => array('form--inline')),
     );
 
     // Create the "Show" dropdown, which allows the base table of the view to be
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index f9b165a..0511c62 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -197,7 +197,7 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
       $row = array();
       // Add a cell to the first row, containing the group operator.
       $row[] = array(
-        'class' => array('group', 'group-operator', 'container-inline'),
+        'class' => array('group', 'group-operator', 'form--inline'),
         'data' => $form['filter_groups']['groups'][$group_id],
         'rowspan' => max(array(2, count($contents) + 1)),
       );
diff --git a/core/themes/bartik/templates/block--search-form-block.html.twig b/core/themes/bartik/templates/block--search-form-block.html.twig
index b2af1ed..bcbf4d5 100644
--- a/core/themes/bartik/templates/block--search-form-block.html.twig
+++ b/core/themes/bartik/templates/block--search-form-block.html.twig
@@ -17,7 +17,7 @@
  */
 #}
 {% block content %}
-  <div{{ content_attributes.addClass('content', 'container-inline') }}>
+  <div{{ content_attributes.addClass('content', 'form--inline') }}>
     {{ parent() }}
   </div>
 {% endblock %}
diff --git a/core/themes/classy/templates/block/block--search-form-block.html.twig b/core/themes/classy/templates/block/block--search-form-block.html.twig
index da28093..ae56a61 100644
--- a/core/themes/classy/templates/block/block--search-form-block.html.twig
+++ b/core/themes/classy/templates/block/block--search-form-block.html.twig
@@ -31,7 +31,7 @@
   set classes = [
     'block',
     'block-search',
-    'container-inline',
+    'form--inline',
   ]
 %}
 <div{{ attributes.addClass(classes) }}>
diff --git a/core/themes/classy/templates/form/datetime-form.html.twig b/core/themes/classy/templates/form/datetime-form.html.twig
index f56182f..be842c3 100644
--- a/core/themes/classy/templates/form/datetime-form.html.twig
+++ b/core/themes/classy/templates/form/datetime-form.html.twig
@@ -10,6 +10,6 @@
  * @see template_preprocess_datetime_form()
  */
 #}
-<div{{ attributes.addClass('container-inline') }}>
+<div{{ attributes.addClass('form--inline') }}>
   {{ content }}
 </div>
diff --git a/core/themes/seven/css/components/form.css b/core/themes/seven/css/components/form.css
index f74eb74..f3c68c8 100644
--- a/core/themes/seven/css/components/form.css
+++ b/core/themes/seven/css/components/form.css
@@ -118,6 +118,7 @@ div.description,
   margin: 0.2em 0 0 0;
   color: #595959;
   font-size: 0.95em;
+  clear: left;
 }
 .form-item .description.error {
   margin-top: 0;
diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme
index 930b7d0..b1a3886 100644
--- a/core/themes/seven/seven.theme
+++ b/core/themes/seven/seven.theme
@@ -185,12 +185,12 @@ function seven_form_node_form_alter(&$form, FormStateInterface $form_state) {
     ),
     'changed' => array(
       '#type' => 'item',
-      '#wrapper_attributes' => array('class' => array('entity-meta__last-saved', 'container-inline')),
+      '#wrapper_attributes' => array('class' => array('entity-meta__last-saved', 'form--inline')),
       '#markup' => '<h4 class="label inline">' . t('Last saved') . '</h4> ' . $is_new,
     ),
     'author' => array(
       '#type' => 'item',
-      '#wrapper_attributes' => array('class' => array('author', 'container-inline')),
+      '#wrapper_attributes' => array('class' => array('author', 'form--inline')),
       '#markup' => '<h4 class="label inline">' . t('Author') . '</h4> ' . $node->getOwner()->getUsername(),
     ),
   );