diff --git a/packages/components/src/Layout/SkipLinks/SkipLinks.component.tsx b/packages/components/src/Layout/SkipLinks/SkipLinks.component.tsx
index 3c9d8afc5e..85bc2777d4 100644
--- a/packages/components/src/Layout/SkipLinks/SkipLinks.component.tsx
+++ b/packages/components/src/Layout/SkipLinks/SkipLinks.component.tsx
@@ -1,7 +1,6 @@
 import { TFunction } from 'i18next';
 import { withTranslation } from 'react-i18next';
-
-import Icon from '../../Icon';
+import { Icon, SVG_TRANSFORMS } from '@talend/design-system';
 import I18N_DOMAIN_COMPONENTS from '../../constants';
 import getDefaultT from '../../translate';
 
@@ -16,7 +15,7 @@ function SkipTo({ href, label }: SkipToProps) {
 	return (
 		<a href={href}>
 			<span className={theme.icon}>
-				<Icon transform="rotate-270" name="talend-arrow-left" />
+				<Icon transform={SVG_TRANSFORMS.Rotate270} name="talend-arrow-left" />
 			</span>
 			<span className={theme.text}>{label}</span>
 		</a>
diff --git a/packages/components/src/Skeleton/Skeleton.component.tsx b/packages/components/src/Skeleton/Skeleton.component.tsx
index 6d779ea084..74a4b1e0c7 100644
--- a/packages/components/src/Skeleton/Skeleton.component.tsx
+++ b/packages/components/src/Skeleton/Skeleton.component.tsx
@@ -79,7 +79,7 @@ function Skeleton({
 		type: getTranslatedType(t, type),
 	});
 
-	if (type === 'icon') {
+	if (type === 'icon' && name) {
 		return <Icon className={classes} name={name} aria-label={ariaLabel} />;
 	}
 	return <span style={{ width, height }} className={classes} aria-label={ariaLabel} />;
diff --git a/packages/design-system/src/components/Icon/Icon.tsx b/packages/design-system/src/components/Icon/Icon.tsx
index 3822d3f25b..eb3da6c027 100644
--- a/packages/design-system/src/components/Icon/Icon.tsx
+++ b/packages/design-system/src/components/Icon/Icon.tsx
@@ -34,7 +34,7 @@ const accessibility = {
 };
 
 // eslint-disable-next-line react/display-name
-export const Icon = forwardRef(
+const IconBase = forwardRef(
 	(
 		{ className, name = 'talend-empty-space', transform, border, ...rest }: IconProps,
 		ref: Ref<SVGSVGElement>,
@@ -153,6 +153,6 @@ export const Icon = forwardRef(
 	},
 );
 
-export const IconMemo = memo(Icon);
+export const Icon = memo(IconBase);
 
-IconMemo.displayName = 'Icon';
+Icon.displayName = 'Icon';
diff --git a/packages/design-system/src/components/Icon/index.ts b/packages/design-system/src/components/Icon/index.ts
index 1de4aa069b..ca5d80d8ae 100644
--- a/packages/design-system/src/components/Icon/index.ts
+++ b/packages/design-system/src/components/Icon/index.ts
@@ -1,5 +1,2 @@
-import { IconMemo } from './Icon';
-
+export * from './Icon';
 export * from './SizedIcon';
-
-export const Icon = IconMemo;