diff --git a/core/modules/image/css/editors/image.css b/core/modules/image/css/editors/image.css
index 08bb679..64d627d 100644
--- a/core/modules/image/css/editors/image.css
+++ b/core/modules/image/css/editors/image.css
@@ -32,12 +32,6 @@
   background-size: cover;
 }
 
-.quickedit-image-field-info {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-}
-
 .quickedit-image-text {
   display: block;
 }
diff --git a/core/modules/image/js/theme.js b/core/modules/image/js/theme.js
index cba8f7b..8a37658 100644
--- a/core/modules/image/js/theme.js
+++ b/core/modules/image/js/theme.js
@@ -67,16 +67,12 @@
   Drupal.theme.quickeditImageToolbar = function (settings) {
     var html = '<form class="quickedit-image-field-info">';
     if (settings.alt_field) {
-      html += '  <div>' +
-        '    <label for="alt" class="' + (settings.alt_field_required ? 'required' : '') + '">' + Drupal.t('Alternative text') + '</label>' +
-        '    <input type="text" placeholder="' + settings.alt + '" value="' + settings.alt + '" name="alt" ' + (settings.alt_field_required ? 'required' : '') + '/>' +
-        '  </div>';
+      html += '  <label for="alt" class="' + (settings.alt_field_required ? 'required' : '') + '">' + Drupal.t('Alternative text') + '</label>' +
+        '  <input type="text" placeholder="' + Drupal.t('Alternative text') + '" value="' + settings.alt + '" name="alt" ' + (settings.alt_field_required ? 'required' : '') + '/>';
     }
     if (settings.title_field) {
-      html += '  <div>' +
-        '    <label for="title" class="' + (settings.title_field_required ? 'form-required' : '') + '">' + Drupal.t('Title') + '</label>' +
-        '    <input type="text" placeholder="' + settings.title + '" value="' + settings.title + '" name="title" ' + (settings.title_field_required ? 'required' : '') + '/>' +
-        '  </div>';
+      html += '  <label for="title" class="' + (settings.title_field_required ? 'form-required' : '') + '">' + Drupal.t('Title') + '</label>' +
+        '  <input type="text" placeholder="' + settings.title + '" value="' + settings.title + '" name="title" ' + (settings.title_field_required ? 'required' : '') + '/>';
     }
     html += '</form>';
 
diff --git a/core/modules/quickedit/css/quickedit.theme.css b/core/modules/quickedit/css/quickedit.theme.css
index 399db7a..9896427 100644
--- a/core/modules/quickedit/css/quickedit.theme.css
+++ b/core/modules/quickedit/css/quickedit.theme.css
@@ -180,6 +180,12 @@
 .quickedit-toolbar-fullwidth {
   width: 100%;
 }
+.quickedit-toolgroup input {
+  width: 100%;
+}
+.quickedit-toolgroup input[type=submit] {
+  width: auto;
+}
 .quickedit-toolgroup.wysiwyg-floated {
   float: right; /* LTR */
 }