diff --git a/packages/dnb-design-system-portal/src/docs/uilib/components/modal/Examples.js b/packages/dnb-design-system-portal/src/docs/uilib/components/modal/Examples.js
index c974e61fb5b..c690ae210fb 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/components/modal/Examples.js
+++ b/packages/dnb-design-system-portal/src/docs/uilib/components/modal/Examples.js
@@ -70,7 +70,7 @@ export const ModalExampleCloseByHandler = () => (
       /* jsx */ `
 <Modal
   title="Auto close"
-  trigger_text="Click me"
+  triggerAttributes={{ text: "Click me" }}
   align_content="center"
   max_width="40rem"
   close_modal={close => {
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/components/modal/visual-tests/Examples.js b/packages/dnb-design-system-portal/src/docs/uilib/components/modal/visual-tests/Examples.js
index 2a8e251e9cd..f7050256a3d 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/components/modal/visual-tests/Examples.js
+++ b/packages/dnb-design-system-portal/src/docs/uilib/components/modal/visual-tests/Examples.js
@@ -12,7 +12,7 @@ export const ModalExampleDrawerHeader = () => (
       /* jsx */ `
 <Modal
   mode="drawer"
-  trigger_text="Open Drawer"
+  triggerAttributes={{ text: "Open Drawer" }}
 >
   <Modal.Bar>
     <Breadcrumb />
@@ -94,7 +94,7 @@ export const ModalExampleDrawerBasic = () => (
 <Modal
   mode="drawer"
   title="Drawer Title"
-  trigger_text="Open Drawer"
+  triggerAttributes={{ text: "Open Drawer" }}
 >
   <Modal.Content>
     <P top>This is a left aligned Drawer content.</P>
@@ -111,7 +111,7 @@ export const DrawerWithoutSpacing = () => (
 <Modal
   mode="drawer"
   title="Drawer without spacing"
-  trigger_text="Open Drawer with no spacing"
+  triggerAttributes={{ text: "Open Drawer with no spacing" }}
   spacing={false}
 >
   <Modal.Content>
@@ -164,9 +164,7 @@ export const ModalExampleFullscreen = () => (
 <Modal
   title={<span className="dnb-sr-only">"Hidden" Modal title</span>}
   fullscreen="true"
-  trigger_variant="tertiary"
-  trigger_text="Click me"
-  trigger_icon="bell"
+  triggerAttributes={{ text: "Click me", icon: "bell", variant: "tertiary" }}
   modal_content="This is the modal text. Triggered by a tertiary button."
 />
 	`
diff --git a/packages/dnb-design-system-portal/src/docs/uilib/components/progress-indicator/demos.md b/packages/dnb-design-system-portal/src/docs/uilib/components/progress-indicator/demos.md
index d40db94327d..c936e0e3971 100644
--- a/packages/dnb-design-system-portal/src/docs/uilib/components/progress-indicator/demos.md
+++ b/packages/dnb-design-system-portal/src/docs/uilib/components/progress-indicator/demos.md
@@ -151,7 +151,7 @@ render(<ChangeValue />)
   fullscreen={false}
   align_content="centered"
   hide_close_button
-  trigger_text="Show"
+  triggerAttributes={{ text: "Show" }}
   prevent_close={false}
 >
   <ProgressIndicator
@@ -310,7 +310,7 @@ render(<ChangeValue />)
   fullscreen={false}
   align_content="centered"
   hide_close_button
-  trigger_text="Show"
+  triggerAttributes={{ text: "Show" }}
   prevent_close={false}
 >
   <ProgressIndicator
diff --git a/packages/dnb-design-system-portal/src/shared/menu/SidebarMenu.js b/packages/dnb-design-system-portal/src/shared/menu/SidebarMenu.js
index 10c6b9ee5a4..02e59c4781a 100644
--- a/packages/dnb-design-system-portal/src/shared/menu/SidebarMenu.js
+++ b/packages/dnb-design-system-portal/src/shared/menu/SidebarMenu.js
@@ -249,9 +249,11 @@ export default class SidebarLayout extends React.PureComponent {
                 <MediaQuery when={{ min: 0, max: 'medium' }}>
                   <Space left="large" top="large">
                     <PortalToolsMenu
-                      trigger_text="Portal Tools"
-                      trigger_icon="chevron_right"
-                      trigger_icon_position="right"
+                      triggerAttributes={{
+                        text: 'Portal Tools',
+                        icon: 'chevron_right',
+                        icon_position: 'right',
+                      }}
                       tooltipPosition="bottom"
                     />
                   </Space>
diff --git a/packages/dnb-eufemia/src/components/dialog/__tests__/__snapshots__/Dialog.test.tsx.snap b/packages/dnb-eufemia/src/components/dialog/__tests__/__snapshots__/Dialog.test.tsx.snap
index 06d9f0c5a84..588a1e74d10 100644
--- a/packages/dnb-eufemia/src/components/dialog/__tests__/__snapshots__/Dialog.test.tsx.snap
+++ b/packages/dnb-eufemia/src/components/dialog/__tests__/__snapshots__/Dialog.test.tsx.snap
@@ -65,15 +65,6 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
     title="dialog_title"
     trigger={null}
     trigger_attributes={null}
-    trigger_class={null}
-    trigger_disabled={null}
-    trigger_hidden={false}
-    trigger_icon={null}
-    trigger_icon_position="left"
-    trigger_size={null}
-    trigger_text={null}
-    trigger_title={null}
-    trigger_variant="secondary"
   >
     <Modal
       align_content="left"
@@ -118,23 +109,9 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
       title="dialog_title"
       trigger={null}
       trigger_attributes={null}
-      trigger_class={null}
-      trigger_disabled={null}
-      trigger_hidden={false}
-      trigger_icon={null}
-      trigger_icon_position="left"
-      trigger_size={null}
-      trigger_text={null}
-      trigger_title={null}
-      trigger_variant="secondary"
     >
       <HelpButtonInstance
-        class={null}
         className="dnb-modal__trigger"
-        disabled={false}
-        hidden={false}
-        icon={null}
-        icon_position="left"
         id="dialog_id"
         innerRef={
           {
@@ -178,10 +155,7 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
           }
         }
         onClick={[Function]}
-        size={null}
-        text={null}
         title="dialog_title"
-        variant="secondary"
       >
         <Button
           aria-label="dialog_title"
@@ -192,10 +166,9 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
           custom_content={null}
           custom_element={null}
           custom_method={null}
-          disabled={false}
+          disabled={null}
           element={null}
           global_status_id={null}
-          hidden={false}
           href={null}
           icon="question"
           icon_position="left"
@@ -266,7 +239,6 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
             aria-roledescription="Hjelp-knapp"
             className="dnb-button dnb-button--secondary dnb-help-button dnb-modal__trigger dnb-button--icon-position-left dnb-button--has-icon dnb-button--size-medium"
             disabled={false}
-            hidden={false}
             id="dialog_id"
             onClick={[Function]}
             type="button"
@@ -281,10 +253,9 @@ exports[`Dialog component snapshot should match component snapshot 1`] = `
               custom_content={null}
               custom_element={null}
               custom_method={null}
-              disabled={false}
+              disabled={null}
               element={null}
               global_status_id={null}
-              hidden={false}
               href={null}
               icon="question"
               icon_position="left"
diff --git a/packages/dnb-eufemia/src/components/drawer/__tests__/__snapshots__/Drawer.test.tsx.snap b/packages/dnb-eufemia/src/components/drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
index a7a8b887c99..d7b9c469eab 100644
--- a/packages/dnb-eufemia/src/components/drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
+++ b/packages/dnb-eufemia/src/components/drawer/__tests__/__snapshots__/Drawer.test.tsx.snap
@@ -64,15 +64,6 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
     title="drawer_title"
     trigger={null}
     trigger_attributes={null}
-    trigger_class={null}
-    trigger_disabled={null}
-    trigger_hidden={false}
-    trigger_icon={null}
-    trigger_icon_position="left"
-    trigger_size={null}
-    trigger_text={null}
-    trigger_title={null}
-    trigger_variant="secondary"
   >
     <Modal
       align_content="left"
@@ -116,23 +107,9 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
       title="drawer_title"
       trigger={null}
       trigger_attributes={null}
-      trigger_class={null}
-      trigger_disabled={null}
-      trigger_hidden={false}
-      trigger_icon={null}
-      trigger_icon_position="left"
-      trigger_size={null}
-      trigger_text={null}
-      trigger_title={null}
-      trigger_variant="secondary"
     >
       <HelpButtonInstance
-        class={null}
         className="dnb-modal__trigger"
-        disabled={false}
-        hidden={false}
-        icon={null}
-        icon_position="left"
         id="drawer_id"
         innerRef={
           {
@@ -176,10 +153,7 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
           }
         }
         onClick={[Function]}
-        size={null}
-        text={null}
         title="drawer_title"
-        variant="secondary"
       >
         <Button
           aria-label="drawer_title"
@@ -190,10 +164,9 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
           custom_content={null}
           custom_element={null}
           custom_method={null}
-          disabled={false}
+          disabled={null}
           element={null}
           global_status_id={null}
-          hidden={false}
           href={null}
           icon="question"
           icon_position="left"
@@ -264,7 +237,6 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
             aria-roledescription="Hjelp-knapp"
             className="dnb-button dnb-button--secondary dnb-help-button dnb-modal__trigger dnb-button--icon-position-left dnb-button--has-icon dnb-button--size-medium"
             disabled={false}
-            hidden={false}
             id="drawer_id"
             onClick={[Function]}
             type="button"
@@ -279,10 +251,9 @@ exports[`Drawer component snapshot should match component snapshot 1`] = `
               custom_content={null}
               custom_element={null}
               custom_method={null}
-              disabled={false}
+              disabled={null}
               element={null}
               global_status_id={null}
-              hidden={false}
               href={null}
               icon="question"
               icon_position="left"
diff --git a/packages/dnb-eufemia/src/components/global-status/stories/GlobalStatus.stories.js b/packages/dnb-eufemia/src/components/global-status/stories/GlobalStatus.stories.js
index c7786a50145..6bf621f0338 100644
--- a/packages/dnb-eufemia/src/components/global-status/stories/GlobalStatus.stories.js
+++ b/packages/dnb-eufemia/src/components/global-status/stories/GlobalStatus.stories.js
@@ -218,7 +218,7 @@ const InputWithError = () => {
 
 const ModalExample = () => (
   <Modal
-    trigger_text="Open Modal"
+    trigger_attributes={{ text: 'Open Modal' }}
     title="Modal Title"
     // width="80vw"
     on_open={() => {
diff --git a/packages/dnb-eufemia/src/components/modal/Modal.tsx b/packages/dnb-eufemia/src/components/modal/Modal.tsx
index 074d9748ae9..7c9eac0be90 100644
--- a/packages/dnb-eufemia/src/components/modal/Modal.tsx
+++ b/packages/dnb-eufemia/src/components/modal/Modal.tsx
@@ -120,18 +120,8 @@ class Modal extends React.PureComponent<
     open_modal: null,
     close_modal: null,
 
-    // All "trigger_" are deprecated
     trigger: null,
     trigger_attributes: null,
-    trigger_hidden: false,
-    trigger_disabled: null,
-    trigger_variant: 'secondary',
-    trigger_text: null,
-    trigger_title: null,
-    trigger_size: null,
-    trigger_icon: null,
-    trigger_icon_position: 'left',
-    trigger_class: null,
 
     overlay_class: null,
     content_class: null,
@@ -429,18 +419,8 @@ class Modal extends React.PureComponent<
       open_delay, // eslint-disable-line
 
       omit_trigger_button = false,
-      // All "trigger_" are deprecated
       trigger = null,
       trigger_attributes = null,
-      trigger_hidden = 'false',
-      trigger_disabled = null,
-      trigger_variant = 'secondary',
-      trigger_text = null,
-      trigger_title = null,
-      trigger_size = null,
-      trigger_icon,
-      trigger_icon_position = 'left',
-      trigger_class = null,
 
       ...rest
     } = props
@@ -453,18 +433,10 @@ class Modal extends React.PureComponent<
     )
 
     const render = (suffixProps) => {
-      const triggerAttributes = {
-        hidden: isTrue(trigger_hidden),
-        disabled: isTrue(trigger_disabled),
-        variant: trigger_variant,
-        text: trigger_text,
-        title: trigger_title,
-        size: trigger_size,
-        icon: trigger_icon,
-        icon_position: trigger_icon_position,
-        class: trigger_class,
-        ...trigger_attributes,
-      } as ButtonProps
+      const triggerAttributes = (
+        trigger_attributes ? { ...trigger_attributes } : {}
+      ) as ButtonProps
+
       if (isTrue(disabled)) {
         triggerAttributes.disabled = true
       }
diff --git a/packages/dnb-eufemia/src/components/modal/__tests__/Modal.test.tsx b/packages/dnb-eufemia/src/components/modal/__tests__/Modal.test.tsx
index 99e5b4311d4..30baeb7dab0 100644
--- a/packages/dnb-eufemia/src/components/modal/__tests__/Modal.test.tsx
+++ b/packages/dnb-eufemia/src/components/modal/__tests__/Modal.test.tsx
@@ -243,10 +243,10 @@ describe('Modal component', () => {
     )
   })
 
-  it('has a disabled trigger button once we set trigger_disabled to true', () => {
+  it('has a disabled trigger button once we set trigger disabled to true', () => {
     const Comp = mount(<Component {...props} open_state={true} />)
     Comp.setProps({
-      trigger_disabled: true,
+      trigger_attributes: { disabled: true },
     })
     expect(
       Comp.find('button.dnb-modal__trigger')
@@ -569,7 +569,7 @@ describe('Modal component', () => {
             no_animation
             id="modal-id"
             open_state={open}
-            trigger_hidden
+            trigger_attributes={{ hidden: true }}
           >
             content
           </Component>
@@ -614,7 +614,7 @@ describe('Modal component', () => {
             open_state={open}
             on_open={on_open}
             on_close={on_close}
-            trigger_hidden
+            trigger_attributes={{ hidden: true }}
           >
             content
           </Component>
@@ -1019,7 +1019,7 @@ describe('Modal component', () => {
               return (
                 <Component
                   {...props}
-                  trigger_hidden="true"
+                  trigger_attributes={{ hidden: 'true' }}
                   open_state="opened"
                 >
                   content
@@ -1077,7 +1077,7 @@ describe('Modal component', () => {
               return (
                 <OriginalComponent
                   title="Modal Title"
-                  trigger_hidden="true"
+                  trigger_attributes={{ hidden: true }}
                   open_state="opened"
                   labelled_by="modal-trigger"
                   on_open={(e) => {
@@ -1269,13 +1269,17 @@ describe('Modal component', () => {
   })
 
   it('has to have no icon', () => {
-    const Comp1 = mount(<Component trigger_text="Open Modal" />)
+    const Comp1 = mount(
+      <Component trigger_attributes={{ text: 'Open Modal' }} />
+    )
     expect(Comp1.find('.dnb-icon').exists()).toBe(false)
     const Comp2 = mount(
       <Component
-        trigger_text="Open Modal"
-        trigger_variant="tertiary"
-        trigger_icon={false}
+        trigger_attributes={{
+          text: 'Open Modal',
+          variant: 'tertiary',
+          icon: false,
+        }}
       />
     )
     expect(Comp2.find('.dnb-icon').exists()).toBe(false)
@@ -1283,11 +1287,15 @@ describe('Modal component', () => {
 
   it('has to have an icon', () => {
     const Comp1 = mount(
-      <Component trigger_text="Open Modal" trigger_variant="tertiary" />
+      <Component
+        trigger_attributes={{ text: 'Open Modal', variant: 'tertiary' }}
+      />
     )
     expect(Comp1.find('.dnb-icon').exists()).toBe(true)
     const Comp2 = mount(
-      <Component trigger_text="Open Modal" trigger_icon="add" />
+      <Component
+        trigger_attributes={{ text: 'Open Modal', icon: 'add' }}
+      />
     )
     expect(Comp2.find('.dnb-icon').exists()).toBe(true)
   })
@@ -1323,7 +1331,9 @@ describe('Modal trigger', () => {
   const roledescription = 'Hjelp-knapp'
 
   it('will act by default as a HelpButton', () => {
-    const Comp = mount(<Component {...props} trigger_text="" />)
+    const Comp = mount(
+      <Component {...props} trigger_attributes={{ text: '' }} />
+    )
     expect(
       Comp.find('button.dnb-modal__trigger')
         .instance()
@@ -1351,7 +1361,9 @@ describe('Modal trigger', () => {
   })
 
   it('will not act as a HelpButton if only trigger_text was given', () => {
-    const Comp = mount(<Component {...props} trigger_text="text" />)
+    const Comp = mount(
+      <Component {...props} trigger_attributes={{ text: 'text' }} />
+    )
     expect(
       Comp.find('button.dnb-modal__trigger')
         .instance()
@@ -1368,7 +1380,9 @@ describe('Modal trigger', () => {
   })
 
   it('will not act as a HelpButton if a different icon was given', () => {
-    const Comp = mount(<Component {...props} trigger_icon="bell" />)
+    const Comp = mount(
+      <Component {...props} trigger_attributes={{ icon: 'bell' }} />
+    )
     expect(
       Comp.find('button.dnb-modal__trigger')
         .instance()
@@ -1379,8 +1393,10 @@ describe('Modal trigger', () => {
     ).toBe(true)
   })
 
-  it('will not act as a HelpButton if trigger_text was given', () => {
-    const Comp = mount(<Component {...props} trigger_text="text" />)
+  it('will not act as a HelpButton if trigger text was given', () => {
+    const Comp = mount(
+      <Component {...props} trigger_attributes={{ text: 'text' }} />
+    )
     expect(
       Comp.find('button.dnb-modal__trigger')
         .instance()
diff --git a/packages/dnb-eufemia/src/components/modal/__tests__/__snapshots__/Modal.test.tsx.snap b/packages/dnb-eufemia/src/components/modal/__tests__/__snapshots__/Modal.test.tsx.snap
index 84d2e034aaf..eadb9de400b 100644
--- a/packages/dnb-eufemia/src/components/modal/__tests__/__snapshots__/Modal.test.tsx.snap
+++ b/packages/dnb-eufemia/src/components/modal/__tests__/__snapshots__/Modal.test.tsx.snap
@@ -49,15 +49,6 @@ exports[`Modal component have to match snapshot 1`] = `
   title="modal_title"
   trigger={null}
   trigger_attributes={null}
-  trigger_class={null}
-  trigger_disabled={null}
-  trigger_hidden={false}
-  trigger_icon={null}
-  trigger_icon_position="left"
-  trigger_size={null}
-  trigger_text={null}
-  trigger_title={null}
-  trigger_variant="secondary"
 >
   <Modal
     0={
@@ -107,23 +98,9 @@ exports[`Modal component have to match snapshot 1`] = `
     title="modal_title"
     trigger={null}
     trigger_attributes={null}
-    trigger_class={null}
-    trigger_disabled={null}
-    trigger_hidden={false}
-    trigger_icon={null}
-    trigger_icon_position="left"
-    trigger_size={null}
-    trigger_text={null}
-    trigger_title={null}
-    trigger_variant="secondary"
   >
     <HelpButtonInstance
-      class={null}
       className="dnb-modal__trigger"
-      disabled={false}
-      hidden={false}
-      icon={null}
-      icon_position="left"
       id="modal_id"
       innerRef={
         {
@@ -167,10 +144,7 @@ exports[`Modal component have to match snapshot 1`] = `
         }
       }
       onClick={[Function]}
-      size={null}
-      text={null}
       title="modal_title"
-      variant="secondary"
     >
       <Button
         aria-label="modal_title"
@@ -181,10 +155,9 @@ exports[`Modal component have to match snapshot 1`] = `
         custom_content={null}
         custom_element={null}
         custom_method={null}
-        disabled={false}
+        disabled={null}
         element={null}
         global_status_id={null}
-        hidden={false}
         href={null}
         icon="question"
         icon_position="left"
@@ -255,7 +228,6 @@ exports[`Modal component have to match snapshot 1`] = `
           aria-roledescription="Hjelp-knapp"
           className="dnb-button dnb-button--secondary dnb-help-button dnb-modal__trigger dnb-button--icon-position-left dnb-button--has-icon dnb-button--size-medium"
           disabled={false}
-          hidden={false}
           id="modal_id"
           onClick={[Function]}
           type="button"
@@ -270,10 +242,9 @@ exports[`Modal component have to match snapshot 1`] = `
             custom_content={null}
             custom_element={null}
             custom_method={null}
-            disabled={false}
+            disabled={null}
             element={null}
             global_status_id={null}
-            hidden={false}
             href={null}
             icon="question"
             icon_position="left"
diff --git a/packages/dnb-eufemia/src/components/modal/stories/Modal.stories.tsx b/packages/dnb-eufemia/src/components/modal/stories/Modal.stories.tsx
index 835a87a6aca..55998fc3cab 100644
--- a/packages/dnb-eufemia/src/components/modal/stories/Modal.stories.tsx
+++ b/packages/dnb-eufemia/src/components/modal/stories/Modal.stories.tsx
@@ -65,7 +65,7 @@ export const ModalSandbox = () => (
     <Box>
       <Modal
         title="1s close delay"
-        trigger_text="Click me"
+        triggerAttributes={{ text: 'Click me' }}
         focus_selector=".dnb-input__input:first-of-type"
         prevent_close="true"
         // hide_close_button="true"
@@ -94,14 +94,11 @@ export const ModalSandbox = () => (
 
     <Box>
       <Modal
-        // trigger_attributes={{
-        //   'aria-label': 'My Label'
-        // }}
         spacing={false}
         fullscreen={false}
         align_content="centered"
         hide_close_button
-        trigger_text="Show"
+        triggerAttributes={{ text: 'Show' }}
         // prevent_close
         max_width="12rem"
       >
@@ -114,14 +111,11 @@ export const ModalSandbox = () => (
         />
       </Modal>
       <Modal
-        // trigger_attributes={{
-        //   'aria-label': 'My Label'
-        // }}
         spacing={false}
         fullscreen={false}
         align_content="centered"
         hide_close_button
-        trigger_icon="bell"
+        triggerAttributes={{ icon: 'bell' }}
         // prevent_close
         max_width="12rem"
       >
@@ -159,7 +153,7 @@ export const ModalSandbox = () => (
     <Box>
       <Modal
         title="Title 1"
-        trigger_text="Modal in modal"
+        triggerAttributes={{ text: 'Modal in modal' }}
         // open_state="opened"
         style={{
           minHeight: '25rem',
@@ -191,9 +185,7 @@ export const ModalSandbox = () => (
         // open_state="opened"
         fullscreen
         title="Modal Title"
-        trigger_variant="tertiary"
-        // trigger_icon={null}
-        trigger_text="Click me"
+        triggerAttributes={{ text: 'Click me', variant: 'tertiary' }}
       >
         <FillContent />
       </Modal>
@@ -202,7 +194,7 @@ export const ModalSandbox = () => (
       <Modal
         // min_width="60vw"
         max_width="40rem"
-        trigger_text="Open Modal"
+        triggerAttributes={{ text: 'Open modal' }}
         title="Modal Title"
         on_close={(e) => {
           console.log('on_close', e)
@@ -405,8 +397,7 @@ export const DrawerSandbox = () => (
       <Modal
         mode="drawer"
         title="Drawer Title"
-        trigger_text="Open Drawer"
-        trigger_title="Click me"
+        triggerAttributes={{ text: 'Open Drawer', title: 'Click me' }}
       >
         <Modal.Content>
           <P top>This is a left aligned Drawer content.</P>
@@ -420,7 +411,7 @@ export const DrawerSandbox = () => (
         // no_animation
         // open_state="opened"
         mode="drawer"
-        trigger_text="Drawer in Drawer"
+        triggerAttributes={{ text: 'Drawer in Drawer' }}
         // fullscreen
         // container_placement="left"
         // align_content="right"
@@ -457,14 +448,14 @@ export const DrawerSandbox = () => (
 class ModalRerenderExample extends React.PureComponent {
   state = {
     title: 'Modal Title',
-    trigger_text: 'Open Modal',
+    triggerText: 'Open Modal',
   }
   timeout
 
   componentDidMount() {
     this.timeout = setTimeout(() => {
       this.setState({ title: 'New Title' })
-      this.setState({ trigger_text: 'New Open Modal' })
+      this.setState({ triggerText: 'New Open Modal' })
     }, 1e3)
   }
 
@@ -476,10 +467,8 @@ class ModalRerenderExample extends React.PureComponent {
     return (
       <Modal
         // open_state="opened"
-        trigger_text={this.state.trigger_text}
+        triggerAttributes={{ text: this.state.triggerText }}
         title={this.state.title}
-        // trigger_disabled
-        // trigger_hidden
       >
         <Modal.Content spacing>
           {/* <Hr /> */}
@@ -591,8 +580,7 @@ const ModalCloseExample = () => {
         on_click={() => setOpenState('opened')}
       />
       <Modal
-        // trigger_hidden
-        trigger_text="Open Modal and auto close"
+        triggerAttributes={{ text: 'Open Modal and auto close' }}
         title="Modal Title"
         open_state={open_state}
         open_modal={(open) => {
@@ -654,7 +642,7 @@ const ModalTriggerExample = () => {
             return (
               <Modal
                 title="Modal Title"
-                trigger_hidden="true"
+                triggerAttributes={{ hidden: true }}
                 open_state="opened"
                 labelled_by="custom-triggerer"
               >
@@ -857,7 +845,7 @@ function CloseWithAnimation() {
   const [modalOpen, setModalOpen] = React.useState(false)
   return (
     <Modal
-      trigger_text="CloseWithAnimation"
+      triggerAttributes={{ text: 'CloseWithAnimation' }}
       hide_close_button
       open_state={modalOpen}
       on_open={() => setModalOpen(true)}
@@ -873,7 +861,11 @@ function CloseWithAnimation() {
 
 function CloseByCallback() {
   return (
-    <Modal mode="drawer" trigger_text="CloseByCallback" hide_close_button>
+    <Modal
+      mode="drawer"
+      triggerAttributes={{ text: 'CloseByCallback' }}
+      hide_close_button
+    >
       {({ close }) => <Button text="Close by callback" on_click={close} />}
     </Modal>
   )
@@ -899,7 +891,11 @@ const LargeListOfTrs = () => {
 
 export const ModalPerformance = () => (
   <div>
-    <Modal mode="drawer" trigger_text="Open Drawer" bottom>
+    <Modal
+      mode="drawer"
+      triggerAttributes={{ text: 'Open Drawer' }}
+      bottom
+    >
       Content
     </Modal>
 
diff --git a/packages/dnb-eufemia/src/components/modal/types.ts b/packages/dnb-eufemia/src/components/modal/types.ts
index cf9dfb83aaf..917afa81f19 100644
--- a/packages/dnb-eufemia/src/components/modal/types.ts
+++ b/packages/dnb-eufemia/src/components/modal/types.ts
@@ -122,47 +122,6 @@ export interface ModalProps extends ModalRootProps {
    */
   trigger_attributes?: TriggerAttributes
 
-  /**
-   * If truthy, no trigger button will be show. This can be used in combination with `open_state="opened"`.
-   */
-  trigger_hidden?: ExtendedBoolean
-
-  /**
-   * If truthy, then the trigger button can&#39;t be opened.
-   */
-  trigger_disabled?: ExtendedBoolean
-
-  /**
-   * The modal/drawer triggering button variant. Defaults to `secondary`.
-   */
-  trigger_variant?: ModalTriggerVariant
-
-  /**
-   * If type is set to `text`, this will be the text which triggers the modal/drawer. If set to `button` it will be the `title` attribute of the button.
-   */
-  trigger_text?: string
-
-  /**
-   * The modal/drawer triggering button title.
-   */
-  trigger_title?: string
-  trigger_size?: string
-
-  /**
-   * The modal/drawer triggering button icon. Can be used instead of a `trigger_text`. Defaults to `question`.
-   */
-  trigger_icon?: ReactChildType
-
-  /**
-   * Defines the modal/drawer triggering icon position. Defaults to `left` because of the tertiary button variant.
-   */
-  trigger_icon_position?: ModalTriggerIconPosition
-
-  /**
-   * Adds a custom modal trigger class name.
-   */
-  trigger_class?: string
-
   /**
    * The content which will appear when triggering the modal/drawer.
    */
@@ -218,7 +177,7 @@ export interface ModalContentProps {
   root_id?: string
 
   /**
-   * The ID of the trigger component, describing the modal/drawer content. Defaults to the internal `trigger`, so make sure You define the `trigger_title`.
+   * The ID of the trigger component, describing the modal/drawer content. Defaults to the internal `trigger`, so make sure You define the trigger title.
    */
   labelled_by?: string
 
diff --git a/packages/dnb-eufemia/src/components/step-indicator/__tests__/__snapshots__/StepIndicator.test.js.snap b/packages/dnb-eufemia/src/components/step-indicator/__tests__/__snapshots__/StepIndicator.test.js.snap
index 99a6a9d188b..02e2d84167c 100644
--- a/packages/dnb-eufemia/src/components/step-indicator/__tests__/__snapshots__/StepIndicator.test.js.snap
+++ b/packages/dnb-eufemia/src/components/step-indicator/__tests__/__snapshots__/StepIndicator.test.js.snap
@@ -2628,15 +2628,6 @@ exports[`StepIndicator in loose mode have to match snapshot on small screen 1`]
             title="Stegoversikt"
             trigger={null}
             trigger_attributes={null}
-            trigger_class={null}
-            trigger_disabled={null}
-            trigger_hidden={false}
-            trigger_icon={null}
-            trigger_icon_position="left"
-            trigger_size={null}
-            trigger_text={null}
-            trigger_title={null}
-            trigger_variant="secondary"
           >
             <Modal
               align_content="left"
@@ -2681,15 +2672,6 @@ exports[`StepIndicator in loose mode have to match snapshot on small screen 1`]
               title="Stegoversikt"
               trigger={null}
               trigger_attributes={null}
-              trigger_class={null}
-              trigger_disabled={null}
-              trigger_hidden={false}
-              trigger_icon={null}
-              trigger_icon_position="left"
-              trigger_size={null}
-              trigger_text={null}
-              trigger_title={null}
-              trigger_variant="secondary"
             />
           </Modal>
         </StepIndicatorModal>
@@ -5299,15 +5281,6 @@ exports[`StepIndicator in static mode have to match snapshot on small screen 1`]
             title="Stegoversikt"
             trigger={null}
             trigger_attributes={null}
-            trigger_class={null}
-            trigger_disabled={null}
-            trigger_hidden={false}
-            trigger_icon={null}
-            trigger_icon_position="left"
-            trigger_size={null}
-            trigger_text={null}
-            trigger_title={null}
-            trigger_variant="secondary"
           >
             <Modal
               align_content="left"
@@ -5352,15 +5325,6 @@ exports[`StepIndicator in static mode have to match snapshot on small screen 1`]
               title="Stegoversikt"
               trigger={null}
               trigger_attributes={null}
-              trigger_class={null}
-              trigger_disabled={null}
-              trigger_hidden={false}
-              trigger_icon={null}
-              trigger_icon_position="left"
-              trigger_size={null}
-              trigger_text={null}
-              trigger_title={null}
-              trigger_variant="secondary"
             />
           </Modal>
         </StepIndicatorModal>
@@ -7984,15 +7948,6 @@ exports[`StepIndicator in strict mode have to match snapshot on small screen 1`]
             title="Stegoversikt"
             trigger={null}
             trigger_attributes={null}
-            trigger_class={null}
-            trigger_disabled={null}
-            trigger_hidden={false}
-            trigger_icon={null}
-            trigger_icon_position="left"
-            trigger_size={null}
-            trigger_text={null}
-            trigger_title={null}
-            trigger_variant="secondary"
           >
             <Modal
               align_content="left"
@@ -8037,15 +7992,6 @@ exports[`StepIndicator in strict mode have to match snapshot on small screen 1`]
               title="Stegoversikt"
               trigger={null}
               trigger_attributes={null}
-              trigger_class={null}
-              trigger_disabled={null}
-              trigger_hidden={false}
-              trigger_icon={null}
-              trigger_icon_position="left"
-              trigger_size={null}
-              trigger_text={null}
-              trigger_title={null}
-              trigger_variant="secondary"
             />
           </Modal>
         </StepIndicatorModal>