diff --git a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
index 8842ce8f0c..5762139cc5 100644
--- a/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
+++ b/it/config/src/main/content/jcr_root/apps/system/config/com.adobe.granite.toggle.impl.dev.DynamicToggleProviderImpl.cfg.json
@@ -21,6 +21,7 @@
     "FT_SITES-19631",
     "FT_FORMS-14255",
     "FT_FORMS-14068",
-    "FT_FORMS-16351"
+    "FT_FORMS-16351",
+    "FT_FORMS-2447"
   ]
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
index 86a74c94e2..f8c88c74b4 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/base/v1/base/_cq_dialog/.content.xml
@@ -783,6 +783,25 @@
                                                     ignoreData="{Boolean}true"
                                                     name="dorExclusion@TypeHint"
                                                     value="Boolean"/>
+                                            <dorFieldStyling
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    emptyText="Select styling option"
+                                                    fieldLabel="Component Style"
+                                                    fieldDescription="These styles are derived from the Document of Record template (XDP) associated with this adaptive form."
+                                                    forceSelection="{Boolean}true"
+                                                    name="./dorFieldStyling">
+                                                <granite:rendercondition
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="granite/ui/components/renderconditions/featuretoggle"
+                                                        toggleName="FT_FORMS-2447"/>
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="fd/af/dor/datasource/fieldstyling"/>
+                                                <granite:data
+                                                        jcr:primaryType="nt:unstructured"
+                                                        af.listeners.onload="guidelib.touchlib.editLayer.dialogUtils.selectDefaultDoRFieldStyling()"/>
+                                            </dorFieldStyling>
                                             <dorColspan
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/form/numberfield"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
index 6dbbf022db..66467209d6 100644
--- a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
+++ b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/panelcontainer/v1/panelcontainer/_cq_dialog/.content.xml
@@ -370,6 +370,25 @@
                                                     </table>
                                                 </items>
                                             </dorLayoutType>
+                                            <dorFieldStyling
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    emptyText="Select styling option"
+                                                    fieldLabel="Component Style"
+                                                    fieldDescription="These styles are derived from the Document of Record template (XDP) associated with this adaptive form."
+                                                    forceSelection="{Boolean}true"
+                                                    name="./dorFieldStyling">
+                                                <granite:rendercondition
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="granite/ui/components/renderconditions/featuretoggle"
+                                                        toggleName="FT_FORMS-2447"/>
+                                                <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="fd/af/dor/datasource/fieldstyling"/>
+                                                <granite:data
+                                                        jcr:primaryType="nt:unstructured"
+                                                        af.listeners.onload="guidelib.touchlib.editLayer.dialogUtils.selectDefaultDoRFieldStyling()"/>
+                                            </dorFieldStyling>
                                             <dorNumCols
                                                     jcr:primaryType="nt:unstructured"
                                                     sling:resourceType="granite/ui/components/coral/foundation/form/autocomplete"