diff --git a/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html b/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
index 40d1311457b79cbf35aab2c2f1a772f9dd982672..9e38f53f14d694fa9712960b7a42a4cf6b1ee07a 100644
--- a/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
+++ b/typo3/sysext/backend/Resources/Private/Layouts/ImageManipulation.html
@@ -4,7 +4,7 @@
         <div class="form-wizards-element">
             <f:render section="Main" />
         </div>
-        <div class="form-wizards-items-aside">
+        <div class="form-wizards-items-aside form-wizards-items-aside--field-control">
             <div class="btn-group">
                 {fieldControl -> f:format.raw()}
             </div>
diff --git a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
index ba99c8d4a760db533d7b6528bf16bee4ba5638cb..0c649737ccc571002fbce80bb2c89d8e7f9c7309 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
@@ -144,7 +144,7 @@ class RichTextElement extends AbstractFormElement
         $html[] =               '</textarea>';
         $html[] =           '</div>';
         if (!empty($fieldControlHtml)) {
-            $html[] =           '<div class="form-wizards-items-aside">';
+            $html[] =           '<div class="form-wizards-items-aside form-wizards-items-aside--field-control">';
             $html[] =               '<div class="btn-group">';
             $html[] =                   $fieldControlHtml;
             $html[] =               '</div>';
diff --git a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
index 8d09193187dfbf3d6e7bc62ed4a17ebeb91b4588..1404c619769af55df2072475a8c269a7cf3063f7 100644
--- a/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
+++ b/typo3/sysext/scheduler/Resources/Private/Templates/Backend/SchedulerModule/EditTask.html
@@ -106,7 +106,7 @@
                     <input type="text" name="tx_scheduler[frequency]" class="form-control" id="task_frequency" value="{frequency}">
                 </div>
                 <f:if condition="{frequencyOptions}">
-                    <div class="form-wizards-items-aside">
+                    <div class="form-wizards-items-aside form-wizards-items-aside--field-control">
                         <div class="btn-group">
                             <select
                                 data-update-task-frequency
diff --git a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
index eea3b955ba3df784941623b6dac2161a1475ffa8..bef2225a107570fe66cb3a097be93bef163f7d78 100644
--- a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
+++ b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
@@ -152,7 +152,7 @@ class T3editorElement extends AbstractFormElement
         $html[] =               $editorHtml;
         $html[] =           '</div>';
         if (!empty($fieldControlHtml)) {
-            $html[] =           '<div class="form-wizards-items-aside">';
+            $html[] =           '<div class="form-wizards-items-aside form-wizards-items-aside--field-control">';
             $html[] =               '<div class="btn-group">';
             $html[] =                   $fieldControlHtml;
             $html[] =               '</div>';