diff --git a/webapp/packages/core-blocks/src/Icon.test.tsx b/webapp/packages/core-blocks/src/Icon.test.tsx
index 67c83209fd..4e4b30ef80 100644
--- a/webapp/packages/core-blocks/src/Icon.test.tsx
+++ b/webapp/packages/core-blocks/src/Icon.test.tsx
@@ -13,20 +13,20 @@ import { Icon } from './Icon';
 test('icons.svg#name', () => {
   (globalThis as any)._ROOT_URI_ = undefined;
 
-  render(<Icon name="test" />);
+  render(<Icon data-testid="Icon" name="test" />);
   expect(screen.getByTestId('Icon').querySelector('use')).toHaveAttribute('href', '/icons/icons.svg#test');
 });
 
 test('/image.jpg', () => {
   (globalThis as any)._ROOT_URI_ = undefined;
 
-  render(<Icon name="/image.jpg" />);
+  render(<Icon data-testid="Icon" name="/image.jpg" />);
   expect(screen.getByTestId('Icon').querySelector('use')).toHaveAttribute('href', '/image.jpg');
 });
 
 test('{_ROOT_URI_}/icons.svg#name', () => {
   (globalThis as any)._ROOT_URI_ = '/path/';
 
-  render(<Icon name="test" />);
+  render(<Icon data-testid="Icon" name="test" />);
   expect(screen.getByTestId('Icon').querySelector('use')).toHaveAttribute('href', '/path/icons/icons.svg#test');
 });
diff --git a/webapp/packages/core-blocks/src/Icon.tsx b/webapp/packages/core-blocks/src/Icon.tsx
index c1f4f1db94..bcfad2a592 100644
--- a/webapp/packages/core-blocks/src/Icon.tsx
+++ b/webapp/packages/core-blocks/src/Icon.tsx
@@ -14,7 +14,7 @@ export const Icon: React.FC<SVGAttributes<any>> = function Icon(props) {
   const cn = `icon ${className || ''}`;
   const url = GlobalConstants.absoluteUrl(name.startsWith('/') ? name : `/icons/icons.svg#${name}`);
   return (
-    <svg {...rest} data-testid="Icon" className={cn} aria-hidden="true" focusable="false">
+    <svg {...rest} className={cn} aria-hidden="true" focusable="false">
       <use href={url} />
     </svg>
   );