diff --git a/packages/application-components/src/components/dialogs/internals/dialog-footer.tsx b/packages/application-components/src/components/dialogs/internals/dialog-footer.tsx
index 2412084e25..a998c05669 100644
--- a/packages/application-components/src/components/dialogs/internals/dialog-footer.tsx
+++ b/packages/application-components/src/components/dialogs/internals/dialog-footer.tsx
@@ -2,6 +2,7 @@ import type { ReactElement, SyntheticEvent, ReactNode } from 'react';
 import { css } from '@emotion/react';
 import { useIntl, type IntlShape } from 'react-intl';
 import { designTokens as uiKitDesignTokens } from '@commercetools-uikit/design-system';
+import type { TIconProps } from '@commercetools-uikit/design-system';
 import PrimaryButton from '@commercetools-uikit/primary-button';
 import SecondaryButton from '@commercetools-uikit/secondary-button';
 import Spacings from '@commercetools-uikit/spacings';
@@ -25,7 +26,7 @@ type Props = {
   dataAttributesPrimaryButton?: { [key: string]: string };
   dataAttributesSecondaryButton?: { [key: string]: string };
   children?: never;
-  iconLeftSecondaryButton?: ReactElement;
+  iconLeftSecondaryButton?: ReactElement<TIconProps>;
   footerContent?: ReactNode;
 };
 
@@ -55,7 +56,6 @@ const DialogFooter = ({
           <SecondaryButton
             label={getFormattedLabel(props.labelSecondary, intl)}
             onClick={props.onCancel}
-            // @ts-ignore FIXME upstream
             iconLeft={props.iconLeftSecondaryButton}
             {...filterDataAttributes(dataAttributesSecondaryButton)}
           />
diff --git a/packages/application-components/src/components/internals/default-form-buttons.tsx b/packages/application-components/src/components/internals/default-form-buttons.tsx
index fa28e8cdfd..f4139bd2ab 100644
--- a/packages/application-components/src/components/internals/default-form-buttons.tsx
+++ b/packages/application-components/src/components/internals/default-form-buttons.tsx
@@ -1,6 +1,7 @@
 import type { ReactElement, SyntheticEvent } from 'react';
 import { useIntl } from 'react-intl';
 import { sharedMessages } from '@commercetools-frontend/i18n';
+import type { TIconProps } from '@commercetools-uikit/design-system';
 import IconButton from '@commercetools-uikit/icon-button';
 import { BinLinearIcon } from '@commercetools-uikit/icons';
 import PrimaryButton from '@commercetools-uikit/primary-button';
@@ -31,7 +32,7 @@ const useFormattedLabel = (label: Label) => {
 };
 
 type PrimaryButtonProps = {
-  iconLeft?: ReactElement;
+  iconLeft?: ReactElement<TIconProps>;
 } & Props;
 
 const FormPrimaryButton = ({
@@ -47,7 +48,6 @@ const FormPrimaryButton = ({
       label={_label}
       onClick={props.onClick}
       isDisabled={isDisabled}
-      // @ts-ignore FIXME upstream
       iconLeft={props.iconLeft}
       {...filterDataAttributes(dataAttributes)}
     />
@@ -57,7 +57,7 @@ const FormPrimaryButton = ({
 FormPrimaryButton.displayName = 'FormPrimaryButton';
 
 type SecondaryButtonProps = {
-  iconLeft?: ReactElement;
+  iconLeft?: ReactElement<TIconProps>;
 } & Props;
 
 const FormSecondaryButton = ({
@@ -73,7 +73,6 @@ const FormSecondaryButton = ({
       label={_label}
       onClick={props.onClick}
       isDisabled={isDisabled}
-      // @ts-ignore FIXME upstream
       iconLeft={props.iconLeft}
       {...filterDataAttributes(dataAttributes)}
     />