diff --git a/packages/dnb-eufemia/src/components/form-label/FormLabel.tsx b/packages/dnb-eufemia/src/components/form-label/FormLabel.tsx
index 9b8374598c0..702263e1a87 100644
--- a/packages/dnb-eufemia/src/components/form-label/FormLabel.tsx
+++ b/packages/dnb-eufemia/src/components/form-label/FormLabel.tsx
@@ -139,7 +139,7 @@ export default function FormLabel(localProps: FormLabelAllProps) {
       forElem?.closest('.dnb-input__border--root') ||
       forElem?.closest('.dnb-input__border')
 
-    if (target) {
+    if (target && ref.current) {
       const elem = ref.current
 
       const buttonEnter = () => {
@@ -166,20 +166,21 @@ export default function FormLabel(localProps: FormLabelAllProps) {
       const leave = () => {
         target.classList.remove('hover')
 
-        elem
-          .querySelector('button')
-          ?.removeEventListener?.('mouseenter', buttonEnter)
+        const button = elem.querySelector('button')
+        button?.removeEventListener?.('mouseenter', buttonEnter)
       }
 
-      elem?.addEventListener?.('mouseenter', enter)
-      elem?.addEventListener?.('mouseleave', leave)
+      elem.addEventListener('mouseenter', enter)
+      elem.addEventListener('mouseleave', leave)
 
       return () => {
-        elem?.removeEventListener?.('mouseenter', enter)
-        elem?.removeEventListener?.('mouseleave', leave)
-        elem
-          .querySelector('button')
-          ?.removeEventListener?.('mouseleave', buttonLeave)
+        if (elem) {
+          elem.removeEventListener('mouseenter', enter)
+          elem.removeEventListener('mouseleave', leave)
+
+          const button = elem.querySelector('button')
+          button?.removeEventListener?.('mouseleave', buttonLeave)
+        }
       }
     }
   }, [forId, ref])
diff --git a/packages/dnb-eufemia/src/components/upload/UploadFileListCell.tsx b/packages/dnb-eufemia/src/components/upload/UploadFileListCell.tsx
index 6dbc6e1755b..8de4f53a3a0 100644
--- a/packages/dnb-eufemia/src/components/upload/UploadFileListCell.tsx
+++ b/packages/dnb-eufemia/src/components/upload/UploadFileListCell.tsx
@@ -131,6 +131,7 @@ const UploadFileListCell = ({
             variant="tertiary"
             onClick={onDeleteHandler}
             icon_position="left"
+            disabled={isLoading}
           >
             {deleteButtonText}
           </Button>
diff --git a/packages/dnb-eufemia/src/components/upload/__tests__/UploadFileListCell.test.tsx b/packages/dnb-eufemia/src/components/upload/__tests__/UploadFileListCell.test.tsx
index 45a0184f6ab..2549306ead0 100644
--- a/packages/dnb-eufemia/src/components/upload/__tests__/UploadFileListCell.test.tsx
+++ b/packages/dnb-eufemia/src/components/upload/__tests__/UploadFileListCell.test.tsx
@@ -322,6 +322,21 @@ describe('UploadFileListCell', () => {
       ).toBeInTheDocument()
     })
 
+    it('renders the delete button as disabled when loading state', () => {
+      render(
+        <UploadFileListCell
+          {...defaultProps}
+          uploadFile={{
+            file: createMockFile('file.png', 100, 'image/png'),
+            isLoading: true,
+          }}
+        />
+      )
+      const element = screen.getByRole('button')
+
+      expect(element).toBeDisabled()
+    })
+
     it('does not render the loading state when not loading', () => {
       render(
         <UploadFileListCell
diff --git a/packages/dnb-eufemia/src/extensions/forms/Form/Section/Section.tsx b/packages/dnb-eufemia/src/extensions/forms/Form/Section/Section.tsx
index 71fd440da74..bc84b9fdcfa 100644
--- a/packages/dnb-eufemia/src/extensions/forms/Form/Section/Section.tsx
+++ b/packages/dnb-eufemia/src/extensions/forms/Form/Section/Section.tsx
@@ -6,13 +6,13 @@ import FieldPropsProvider from '../../Field/Provider'
 import SectionContainerProvider from './containers/SectionContainerProvider'
 import ViewContainer from './ViewContainer'
 import EditContainer from './EditContainer'
+import Toolbar from './Toolbar'
 
 import type { Props as DataContextProps } from '../../DataContext/Provider'
 import type { ContainerMode } from './containers/SectionContainer'
 import type { Path, FieldProps, OnChange } from '../../types'
 import type { JsonObject } from '../../utils/json-pointer'
 import type { SharedFieldBlockProps } from '../../FieldBlock'
-import Toolbar from './Toolbar'
 
 export type OverwritePropsDefaults = {
   [key: Path]:
diff --git a/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-section-theme-sbanken.scss b/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-form-section-theme-sbanken.scss
similarity index 100%
rename from packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-section-theme-sbanken.scss
rename to packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-form-section-theme-sbanken.scss
diff --git a/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-section-theme-ui.scss b/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss
similarity index 100%
rename from packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-section-theme-ui.scss
rename to packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss
diff --git a/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/ui.js b/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/ui.js
index 7f7b31db976..a1bcab9f489 100644
--- a/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/ui.js
+++ b/packages/dnb-eufemia/src/extensions/forms/Form/Section/style/themes/ui.js
@@ -3,4 +3,4 @@
  *
  */
 
-import './dnb-section-theme-ui.scss'
+import './dnb-form-section-theme-ui.scss'
diff --git a/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-extensions.scss
index 44ab8defe29..56a335f76cb 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-extensions.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-extensions.scss
@@ -16,5 +16,6 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-ui.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-ui.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-ui.scss';
 @import '../../../extensions/payment-card/style/themes/dnb-payment-card-theme-ui.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-forms.scss
index f88b254164d..bd193841dfa 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-forms.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-eiendom/eiendom-theme-forms.scss
@@ -16,4 +16,5 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-ui.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-ui.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-ui.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-extensions.scss
index 735ed3dd5d8..d2d8a5bf442 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-extensions.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-extensions.scss
@@ -16,5 +16,6 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-sbanken.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-sbanken.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-sbanken.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-sbanken.scss';
 @import '../../../extensions/payment-card/style/themes/dnb-payment-card-theme-ui.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-forms.scss
index 326e15d8a38..d27d0c49f78 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-forms.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-sbanken/sbanken-theme-forms.scss
@@ -16,5 +16,5 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-sbanken.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-sbanken.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-sbanken.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-sbanken.scss';
-@import '../../../extensions/forms/Form/Section/style/themes/dnb-section-theme-sbanken.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-extensions.scss b/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-extensions.scss
index bb638a401ba..b237d0fb93b 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-extensions.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-extensions.scss
@@ -12,5 +12,6 @@
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-ui.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-ui.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-ui.scss';
 @import '../../../extensions/payment-card/style/themes/dnb-payment-card-theme-ui.scss';
diff --git a/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-forms.scss b/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-forms.scss
index 7215604584f..bd193841dfa 100644
--- a/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-forms.scss
+++ b/packages/dnb-eufemia/src/style/themes/theme-ui/ui-theme-forms.scss
@@ -16,5 +16,5 @@ $THEME_FALLBACK: 'ui';
 
 @import '../../../extensions/forms/Field/Number/style/themes/dnb-number-theme-ui.scss';
 @import '../../../extensions/forms/FieldBlock/style/themes/dnb-field-block-theme-ui.scss';
+@import '../../../extensions/forms/Form/Section/style/themes/dnb-form-section-theme-ui.scss';
 @import '../../../extensions/forms/Wizard/style/themes/dnb-wizard-layout-theme-ui.scss';
-@import '../../../extensions/forms/Form/Section/style/themes/dnb-section-theme-ui.scss';