diff --git a/Build/Resources/Public/Less/TYPO3/_element_cropper.less b/Build/Resources/Public/Less/TYPO3/_element_cropper.less
index e63faaa6038ab2f693e7290af047359e4afcaec1..0404c0148477db01c776de6d8f3f2b533ecf42fa 100644
--- a/Build/Resources/Public/Less/TYPO3/_element_cropper.less
+++ b/Build/Resources/Public/Less/TYPO3/_element_cropper.less
@@ -65,9 +65,17 @@
 		max-width: 1000px !important;
 	}
 
+	// Custom styles for cropper radio buttons
 	.ratio-buttons {
-		.btn.btn-default {
-			margin-bottom: 5px;
+		margin-bottom: 10px;
+
+		.btn {
+			&.btn-default {
+				margin-bottom: 5px;
+			}
+			&:not(.active) .fa {
+				display: none;
+			}
 		}
 	}
 
@@ -281,16 +289,6 @@
 		}
 	}
 
-	// Custom styles for cropper radio buttons
-	.t3js-ratio-buttons {
-		margin-bottom: 10px;
-
-		.btn:not(.active) .fa {
-			display: none;
-		}
-	}
-
-
 	// Cropper UI-specific styles
 	.cropper-focus-area {
 		cursor: move;
@@ -333,7 +331,7 @@
 		}
 	}
 
-	.t3js-cropper-cover-area {
+	.cropper-cover-area {
 		background: url("../Images/cropper-background-cover-area.svg");
 		pointer-events: none;
 		cursor: not-allowed;
diff --git a/Build/Resources/Public/Less/TYPO3/_element_tceforms.less b/Build/Resources/Public/Less/TYPO3/_element_tceforms.less
index 1729cfd1dba41db216cfd86f351252004e185d51..e9ffce7aab0a0f6d2f0d4348e3dbffc00e628ae7 100644
--- a/Build/Resources/Public/Less/TYPO3/_element_tceforms.less
+++ b/Build/Resources/Public/Less/TYPO3/_element_tceforms.less
@@ -231,7 +231,7 @@ div.t3-form-field-container:first-child .t3-form-field-label-flex {
 .t3-form-field-disable {
 	display: none;
 }
-.t3js-formengine-field-item.disabled {
+.formengine-field-item.disabled {
 	position: relative;
 	.t3-form-field-disable {
 		z-index: 8000;
diff --git a/typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php b/typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php
index 69ddac5fbc0a4c94c7866f2c3edd1f00fd1b5295..b98697822d20804b0affbe6869d9ee32f57e3e18 100644
--- a/typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php
+++ b/typo3/sysext/backend/Classes/Form/Container/FlexFormElementContainer.php
@@ -144,7 +144,7 @@ class FlexFormElementContainer extends AbstractContainer
                 $html[] =        '<label class="t3js-formengine-label">';
                 $html[] =            BackendUtility::wrapInHelp($parameterArray['_cshKey'], $flexFormFieldName, $processedTitle);
                 $html[] =        '</label>';
-                $html[] =        '<div class="t3js-formengine-field-item">';
+                $html[] =        '<div class="formengine-field-item t3js-formengine-field-item">';
                 $html[] =            $childResult['html'];
                 $html[] =        '</div>';
                 $html[] =    '</div>';
diff --git a/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php b/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php
index b697f15984519a7dbd8582a76bc91c7d39443406..e0662211784aae2578cb007f5e5a9952fa8ce3c9 100644
--- a/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/CheckboxElement.php
@@ -136,7 +136,7 @@ class CheckboxElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         if (!$disabled) {
             $html[] = $fieldInformationHtml;
         }
diff --git a/typo3/sysext/backend/Classes/Form/Element/GroupElement.php b/typo3/sysext/backend/Classes/Form/Element/GroupElement.php
index 846396ecfb425af219b2600a025b5b2cec66f91a..6d8ac29a6a32167ea27d043f4b2a3309870fd925 100644
--- a/typo3/sysext/backend/Classes/Form/Element/GroupElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/GroupElement.php
@@ -178,7 +178,7 @@ class GroupElement extends AbstractFormElement
         if (isset($config['readOnly']) && $config['readOnly']) {
             // Return early if element is read only
             $html = [];
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $html[] =   '<div class="form-wizards-wrap">';
             $html[] =       '<div class="form-wizards-element">';
             $html[] =           '<select';
@@ -304,7 +304,7 @@ class GroupElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   $fieldInformationHtml;
         $html[] =   '<div class="form-wizards-wrap">';
         if ($internalType === 'db' && (!isset($config['hideSuggest']) || (bool)$config['hideSuggest'] !== true)) {
diff --git a/typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php b/typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php
index eb7c8b69ff71d50e31debbc3ad4f49b803dea27a..18c23ba597c42198edab153e281de529445126cc 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InputColorPickerElement.php
@@ -71,7 +71,7 @@ class InputColorPickerElement extends AbstractFormElement
 
         if ($config['readOnly']) {
             $html = [];
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $html[] =   '<div class="form-wizards-wrap">';
             $html[] =       '<div class="form-wizards-element">';
             $html[] =           '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
@@ -233,7 +233,7 @@ class InputColorPickerElement extends AbstractFormElement
             $fullElement = implode(LF, $fullElement);
         }
 
-        $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
+        $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
         return $resultArray;
     }
 
diff --git a/typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php b/typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php
index 6b291bd76aa551db73782219aba8f7c220745a59..3d85bda714d3d1e1b8e924c03f555aec88cdf5e8 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InputDateTimeElement.php
@@ -95,7 +95,7 @@ class InputDateTimeElement extends AbstractFormElement
             // Early return for read only fields
             $itemValue = $this->formatValue($format, $itemValue);
             $html = [];
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $html[] =   '<div class="form-wizards-wrap">';
             $html[] =       '<div class="form-wizards-element">';
             $html[] =           '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
@@ -253,7 +253,7 @@ class InputDateTimeElement extends AbstractFormElement
             $fullElement = implode(LF, $fullElement);
         }
 
-        $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
+        $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
         return $resultArray;
     }
 
diff --git a/typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php b/typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php
index 754d77177764b17fc5ff100c861622095f1944fa..343dadaaee3b7d10156f38e8502ebec924e6ce7f 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InputLinkElement.php
@@ -94,7 +94,7 @@ class InputLinkElement extends AbstractFormElement
         if ($config['readOnly']) {
             // Early return for read only fields
             $html = [];
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $html[] =   '<div class="form-wizards-wrap">';
             $html[] =       '<div class="form-wizards-element">';
             $html[] =           '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
@@ -292,7 +292,7 @@ class InputLinkElement extends AbstractFormElement
             $fullElement = implode(LF, $fullElement);
         }
 
-        $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
+        $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
         return $resultArray;
     }
 
diff --git a/typo3/sysext/backend/Classes/Form/Element/InputTextElement.php b/typo3/sysext/backend/Classes/Form/Element/InputTextElement.php
index 08badc343301db274439dd20591ef1d213f3dbfa..79196ef44cc670f28c392dd0c62bd333b05391af 100644
--- a/typo3/sysext/backend/Classes/Form/Element/InputTextElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/InputTextElement.php
@@ -78,7 +78,7 @@ class InputTextElement extends AbstractFormElement
                 $itemValue = $itemValue ? '*********' : '';
             }
             $html = [];
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $html[] =   '<div class="form-wizards-wrap">';
             $html[] =       '<div class="form-wizards-element">';
             $html[] =           '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
@@ -295,7 +295,7 @@ class InputTextElement extends AbstractFormElement
             $fullElement = implode(LF, $fullElement);
         }
 
-        $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
+        $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
         return $resultArray;
     }
 
diff --git a/typo3/sysext/backend/Classes/Form/Element/NoneElement.php b/typo3/sysext/backend/Classes/Form/Element/NoneElement.php
index 21d0fcbc0f8a18a92d62fc384b8987fad1e9ae20..e7fb8a6382fa0ee5385c66e937feb2d861cf39a7 100644
--- a/typo3/sysext/backend/Classes/Form/Element/NoneElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/NoneElement.php
@@ -68,7 +68,7 @@ class NoneElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldInformationResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   $fieldInformationHtml;
         $html[] =   '<div class="form-wizards-wrap">';
         $html[] =       '<div class="form-wizards-element">';
diff --git a/typo3/sysext/backend/Classes/Form/Element/RadioElement.php b/typo3/sysext/backend/Classes/Form/Element/RadioElement.php
index 2eb27c858b8c38a1c6169a778cd6d4699d0870ac..1a722d2c5bb500b9144430d83201abe703877f81 100644
--- a/typo3/sysext/backend/Classes/Form/Element/RadioElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/RadioElement.php
@@ -71,7 +71,7 @@ class RadioElement extends AbstractFormElement
             $fieldWizardHtml = $fieldWizardResult['html'];
             $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             if (!$disabled) {
                 $html[] = $fieldInformationHtml;
             }
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
index 48c0825d0cf6bbca4a30cc734471e84ca9ad9965..10659edfd23b8d341f5ab2fea7f5461df3c4b0f8 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectCheckBoxElement.php
@@ -147,7 +147,7 @@ class SelectCheckBoxElement extends AbstractFormElement
             $fieldWizardHtml = $legacyFieldWizardHtml . $fieldWizardResult['html'];
             $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             if (!$disabled) {
                 $html[] = $fieldInformationHtml;
             }
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php
index 9cfae06b710c3a0bd22f3ae5fe9dd9dd4dfb589b..9c34a247ecbceb4dc78441b12ae1f47da5c008db 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectMultipleSideBySideElement.php
@@ -218,7 +218,7 @@ class SelectMultipleSideBySideElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   $fieldInformationHtml;
         $html[] =   '<div class="form-wizards-wrap">';
         $html[] =       '<div class="form-wizards-element">';
@@ -370,7 +370,7 @@ class SelectMultipleSideBySideElement extends AbstractFormElement
         }
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   '<div class="form-wizards-wrap">';
         $html[] =       '<div class="form-wizards-element">';
         $html[] =           '<label>';
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php
index 005f83dd0f16d37157c9fe3c66c10ea716df4498..c3cc6356faf84d81b67b00071123deb8af0c9d24 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectSingleBoxElement.php
@@ -115,7 +115,7 @@ class SelectSingleBoxElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         if (!$disabled) {
             $html[] = $fieldInformationHtml;
         }
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php
index 63319c7dc3c257224978b199caa134fa6ee6f1b4..a79501f6a02ea00a442c1e1050186dc49ed06619 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectSingleElement.php
@@ -202,7 +202,7 @@ class SelectSingleElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         if (!$disabled) {
             $html[] = $fieldInformationHtml;
         }
diff --git a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
index fc49a70ce4149f0df0d02545d5246eae7060f21b..6affcde3b8d2dc3345048df40d70a79f931af52d 100644
--- a/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/SelectTreeElement.php
@@ -110,7 +110,7 @@ class SelectTreeElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldInformationResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         if (!$readOnly) {
             $html[] = $fieldInformationHtml;
         }
diff --git a/typo3/sysext/backend/Classes/Form/Element/TextElement.php b/typo3/sysext/backend/Classes/Form/Element/TextElement.php
index a7d20fcc2741358ca2398c2b801d883acda0a508..632caf0d652d7e6bafa40887865c564e3768994c 100644
--- a/typo3/sysext/backend/Classes/Form/Element/TextElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/TextElement.php
@@ -96,7 +96,7 @@ class TextElement extends AbstractFormElement
 
         if ($config['readOnly']) {
             $html = [];
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $html[] =   '<div class="form-wizards-wrap">';
             $html[] =       '<div class="form-wizards-element">';
             $html[] =           '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
@@ -292,7 +292,7 @@ class TextElement extends AbstractFormElement
             $fullElement = implode(LF, $fullElement);
         }
 
-        $resultArray['html'] = '<div class="t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
+        $resultArray['html'] = '<div class="formengine-field-item t3js-formengine-field-item">' . $fieldInformationHtml . $fullElement . '</div>';
         return $resultArray;
     }
 
diff --git a/typo3/sysext/backend/Classes/Form/Element/TextTableElement.php b/typo3/sysext/backend/Classes/Form/Element/TextTableElement.php
index d6d1c290a629de55cb3eef9a17287875377e7035..1584245af729fc1b029f5d02c09c78232a84263e 100644
--- a/typo3/sysext/backend/Classes/Form/Element/TextTableElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/TextTableElement.php
@@ -101,7 +101,7 @@ class TextTableElement extends AbstractFormElement
 
         if ($config['readOnly']) {
             $html = [];
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $html[] =   '<div class="form-wizards-wrap">';
             $html[] =       '<div class="form-wizards-element">';
             $html[] =           '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
@@ -185,7 +185,7 @@ class TextTableElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   $fieldInformationHtml;
         $html[] =   '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
         $html[] =       '<div class="form-wizards-wrap">';
diff --git a/typo3/sysext/backend/Classes/Form/Element/UserElement.php b/typo3/sysext/backend/Classes/Form/Element/UserElement.php
index 37c1d5f1fb23dc19c9828e1b8f3882fd703a81f9..238a35b962819adf4016f7997ed7efa0d36f0d30 100644
--- a/typo3/sysext/backend/Classes/Form/Element/UserElement.php
+++ b/typo3/sysext/backend/Classes/Form/Element/UserElement.php
@@ -45,7 +45,7 @@ class UserElement extends AbstractFormElement
         if (!isset($parameterArray['fieldCong']['config']['noTableWrapping'])
             || (bool)$parameterArray['fieldCong']['config']['noTableWrapping'] === false
         ) {
-            $html = '<div class="t3js-formengine-field-item">' . $html . '</div>';
+            $html = '<div class="formengine-field-item t3js-formengine-field-item">' . $html . '</div>';
         }
         $resultArray['html'] = $html;
         return $resultArray;
diff --git a/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php b/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php
index 979af07d35841d3a98408778a4953907cbc8cf88..716a3bd2855a3c43074e43b67baf35c036b2f8f1 100644
--- a/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php
+++ b/typo3/sysext/backend/Classes/View/Wizard/Element/BackendLayoutWizardElement.php
@@ -57,7 +57,7 @@ class BackendLayoutWizardElement extends AbstractFormElement
 
         $json = json_encode($this->rows, JSON_HEX_QUOT | JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS);
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   $fieldInformationHtml;
         $html[] =   '<div class="form-control-wrap">';
         $html[] =       '<div class="form-wizards-wrap">';
diff --git a/typo3/sysext/backend/Resources/Private/TypeScript/ImageManipulation.ts b/typo3/sysext/backend/Resources/Private/TypeScript/ImageManipulation.ts
index 6bad4ded3a26c0f51cbbeccd0707be8c7e0a70ba..722a0b39caa37871e426a9fe2a3b2da1daf90d1d 100644
--- a/typo3/sysext/backend/Resources/Private/TypeScript/ImageManipulation.ts
+++ b/typo3/sysext/backend/Resources/Private/TypeScript/ImageManipulation.ts
@@ -583,7 +583,7 @@ class ImageManipulation {
    */
   private initCoverAreas(container: JQuery, coverAreas: Area[]): void {
     coverAreas.forEach((coverArea: Area): void => {
-      let coverAreaCanvas: JQuery = $('<div class="t3js-cropper-cover-area"></div>');
+      let coverAreaCanvas: JQuery = $('<div class="cropper-cover-area t3js-cropper-cover-area"></div>');
       container.append(coverAreaCanvas);
       coverAreaCanvas.css({
         height: ImageManipulation.toCssPercent(coverArea.height),
diff --git a/typo3/sysext/backend/Resources/Public/Css/backend.css b/typo3/sysext/backend/Resources/Public/Css/backend.css
index 3a5fe2eb0bc3af58b2b7ac7a9d7056001636dcea..6de535edcb00c5f212e09b2f0d4f9fce5650d5b9 100644
--- a/typo3/sysext/backend/Resources/Public/Css/backend.css
+++ b/typo3/sysext/backend/Resources/Public/Css/backend.css
@@ -9727,9 +9727,15 @@ iframe,
   width: 100% !important;
   max-width: 1000px !important;
 }
+.cropper .ratio-buttons {
+  margin-bottom: 10px;
+}
 .cropper .ratio-buttons .btn.btn-default {
   margin-bottom: 5px;
 }
+.cropper .ratio-buttons .btn:not(.active) .fa {
+  display: none;
+}
 .cropper .panel-group {
   position: relative;
   margin: -15px;
@@ -9900,12 +9906,6 @@ iframe,
   bottom: 0;
   left: 0;
 }
-.cropper .t3js-ratio-buttons {
-  margin-bottom: 10px;
-}
-.cropper .t3js-ratio-buttons .btn:not(.active) .fa {
-  display: none;
-}
 .cropper .cropper-focus-area {
   cursor: move;
   height: 200px;
@@ -9944,7 +9944,7 @@ iframe,
   pointer-events: none;
   overflow: hidden;
 }
-.cropper .t3js-cropper-cover-area {
+.cropper .cropper-cover-area {
   background: url("../Images/cropper-background-cover-area.svg");
   pointer-events: none;
   cursor: not-allowed;
@@ -9952,7 +9952,7 @@ iframe,
   opacity: 1;
   z-index: 99999;
 }
-.cropper .t3js-cropper-cover-area:after {
+.cropper .cropper-cover-area:after {
   background-color: rgba(255, 255, 255, 0.95);
   content: "Cover area";
   position: absolute;
@@ -11804,10 +11804,10 @@ div.t3-form-field-container:first-child .t3-form-field-label-flex {
 .t3-form-field-disable {
   display: none;
 }
-.t3js-formengine-field-item.disabled {
+.formengine-field-item.disabled {
   position: relative;
 }
-.t3js-formengine-field-item.disabled .t3-form-field-disable {
+.formengine-field-item.disabled .t3-form-field-disable {
   z-index: 8000;
   background: #fafafa;
   display: block;
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js b/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js
index 15a571352a90b12bec4d85552a4b35622abb8f0f..fd6907c5046ce9a49f080ec6f0d933d0c06d610b 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/ImageManipulation.js
@@ -452,7 +452,7 @@ define(["require", "exports", "TYPO3/CMS/Core/Contrib/imagesloaded.pkgd.min", "T
          */
         ImageManipulation.prototype.initCoverAreas = function (container, coverAreas) {
             coverAreas.forEach(function (coverArea) {
-                var coverAreaCanvas = $('<div class="t3js-cropper-cover-area"></div>');
+                var coverAreaCanvas = $('<div class="cropper-cover-area t3js-cropper-cover-area"></div>');
                 container.append(coverAreaCanvas);
                 coverAreaCanvas.css({
                     height: ImageManipulation.toCssPercent(coverArea.height),
diff --git a/typo3/sysext/rsaauth/Classes/Form/Element/RsaInputElement.php b/typo3/sysext/rsaauth/Classes/Form/Element/RsaInputElement.php
index a6a0503e13867f7700a61cef2e5b7ca974d8344e..1a405c096a6e35c5927830afeb8ef3a7ca2290f7 100644
--- a/typo3/sysext/rsaauth/Classes/Form/Element/RsaInputElement.php
+++ b/typo3/sysext/rsaauth/Classes/Form/Element/RsaInputElement.php
@@ -61,7 +61,7 @@ class RsaInputElement extends AbstractFormElement
 
         if ($config['readOnly']) {
             $html = [];
-            $html[] = '<div class="t3js-formengine-field-item">';
+            $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $html[] =   '<div class="form-wizards-wrap">';
             $html[] =       '<div class="form-wizards-element">';
             $html[] =           '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
@@ -149,7 +149,7 @@ class RsaInputElement extends AbstractFormElement
         $resultArray = $this->mergeChildReturnIntoExistingResult($resultArray, $fieldWizardResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   $fieldInformationHtml;
         $html[] =   '<div class="form-control-wrap" style="max-width: ' . $width . 'px">';
         $html[] =       '<div class="form-wizards-wrap">';
diff --git a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
index 727fe9fb20b18d4337126d4cd04016108b741c7f..89f134423b7f15e8894f65bc363f44c2f0382510 100644
--- a/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
+++ b/typo3/sysext/rte_ckeditor/Classes/Form/Element/RichTextElement.php
@@ -100,7 +100,7 @@ class RichTextElement extends AbstractFormElement
         ];
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   $fieldInformationHtml;
         $html[] =   '<div class="form-control-wrap">';
         $html[] =       '<div class="form-wizards-wrap">';
diff --git a/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php b/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php
index 3f779cfec37c54e93e1602dc7d20bc2c4162e59e..50729f88443432349d7229593ad6beba94416712 100644
--- a/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php
+++ b/typo3/sysext/rtehtmlarea/Classes/Form/Element/RichTextElement.php
@@ -336,7 +336,7 @@ class RichTextElement extends AbstractFormElement
             $fieldWizardHtml = $legacyFieldWizardHtml . $fieldWizardResult['html'];
             $this->resultArray = $this->mergeChildReturnIntoExistingResult($this->resultArray, $fieldWizardResult, false);
 
-            $result[] = '<div class="t3js-formengine-field-item">';
+            $result[] = '<div class="formengine-field-item t3js-formengine-field-item">';
             $result[] =     '<div class="form-control-wrap">';
             $result[] =         '<div class="form-wizards-wrap">';
             $result[] =             '<div class="form-wizards-element">';
diff --git a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
index 47d33450eebaac78883cf5a8313e4d8598103063..92079e1611b5a1f45f33d5a26b16729d048e7c68 100644
--- a/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
+++ b/typo3/sysext/t3editor/Classes/Form/Element/T3editorElement.php
@@ -159,7 +159,7 @@ class T3editorElement extends AbstractFormElement
         $this->resultArray = $this->mergeChildReturnIntoExistingResult($this->resultArray, $fieldWizardResult, false);
 
         $html = [];
-        $html[] = '<div class="t3js-formengine-field-item">';
+        $html[] = '<div class="formengine-field-item t3js-formengine-field-item">';
         $html[] =   $fieldInformationHtml;
         $html[] =   '<div class="form-control-wrap">';
         $html[] =       '<div class="form-wizards-wrap">';