diff --git a/exports.json b/exports.json
index dc7432a0..16b568cf 100644
--- a/exports.json
+++ b/exports.json
@@ -155,7 +155,7 @@
     "./FileItem": {
       "require": "./dist/cjs/components/Form/File/FileItem.js",
       "module": "./dist/esm/components/Form/File/FileItem.js",
-      "default": "./dist/esm/components/Form/File/FileList.js"
+      "default": "./dist/esm/components/Form/File/FileItem.js"
     },
     "./FileImageItem": {
       "require": "./dist/cjs/components/Form/File/FileImageItem.js",
diff --git a/package.json b/package.json
index ea67c87b..b5008b2d 100644
--- a/package.json
+++ b/package.json
@@ -291,7 +291,7 @@
         "./FileItem": {
             "require": "./dist/cjs/components/Form/File/FileItem.js",
             "module": "./dist/esm/components/Form/File/FileItem.js",
-            "default": "./dist/esm/components/Form/File/FileList.js"
+            "default": "./dist/esm/components/Form/File/FileItem.js"
         },
         "./FileImageItem": {
             "require": "./dist/cjs/components/Form/File/FileImageItem.js",
diff --git a/src/components/Form/File/FileItem.test.tsx b/src/components/Form/File/FileItem.test.tsx
index 103f1103..8e01160f 100644
--- a/src/components/Form/File/FileItem.test.tsx
+++ b/src/components/Form/File/FileItem.test.tsx
@@ -14,12 +14,6 @@ describe('<FileItem>', () => {
     expect(getByRole('file-item')).toBeDefined()
   })
 
-  it('displays file size when provided', () => {
-    const { getByRole } = render(<FileItem {...defaultProps} />)
-
-    expect(getByRole('file-size')).toBeDefined()
-  })
-
   it('renders children components', () => {
     const { getByTestId } = render(
       <FileItem {...defaultProps}>
diff --git a/src/components/Form/File/FileItem.tsx b/src/components/Form/File/FileItem.tsx
index 99a542c0..9de1e8a8 100644
--- a/src/components/Form/File/FileItem.tsx
+++ b/src/components/Form/File/FileItem.tsx
@@ -1,8 +1,8 @@
 import { CSSProperties, ReactNode } from 'react'
 import { composeClasses } from 'lib/classes'
 import { Flex } from 'components/Layout'
-import ToolTipHover from 'components/ToolTipHover'
 import Text from 'components/Typography'
+import Tooltip from 'components/Tooltip'
 import FileItemButton from './FileItemButton'
 import FileItemDropdown from './FileItemDropdown'
 
@@ -54,22 +54,32 @@ export const FileItem = ({
       }}
     >
       <Flex alignItems="center" gap="2" className="mr-auto overflow-hidden">
-        <ToolTipHover
-          variantPopup="dark"
-          complementPosition={{ top: -15, left: 0 }}
-          element={
-            <Flex alignItems="center" justifyContent="start">
-              <div className="truncate">
-                <Text role="file-title" size="xs">
-                  {name}
-                </Text>
-              </div>
-              {fileSize && (
-                <Text role="file-size" className="mt-0.5 ml-0.5" size="xs">
-                  {fileSize} KB
+        <Tooltip
+          variant="primary"
+          content={
+            <>
+              <Flex alignItems="center" justifyContent="start">
+                <div className="truncate">
+                  <Text role="file-title" size="xs">
+                    {name}
+                  </Text>
+                </div>
+                {fileSize && (
+                  <Text role="file-size" className="mt-0.5 ml-0.5" size="xs">
+                    {fileSize} KB
+                  </Text>
+                )}
+              </Flex>
+              {type && (
+                <Text
+                  role="file-type"
+                  variant="small"
+                  className="block text-left"
+                >
+                  {type}
                 </Text>
               )}
-            </Flex>
+            </>
           }
         >
           <Text
@@ -79,10 +89,7 @@ export const FileItem = ({
           >
             {name}
           </Text>
-          <Text role="file-type" variant="small" className="block text-left">
-            {type}
-          </Text>
-        </ToolTipHover>
+        </Tooltip>
       </Flex>
       <div
         role="file-actions"
diff --git a/src/components/Form/File/FileItemButton.tsx b/src/components/Form/File/FileItemButton.tsx
index f619971f..5aa7def2 100644
--- a/src/components/Form/File/FileItemButton.tsx
+++ b/src/components/Form/File/FileItemButton.tsx
@@ -2,7 +2,7 @@ import { ReactNode } from 'react'
 import { composeClasses } from 'lib/classes'
 import { Button, IButtonProps } from 'components/Buttons'
 
-export interface FileItemButtonProps {
+export interface FileItemButtonProps extends Omit<IButtonProps, 'children'> {
   /**
    * Content to display inside the button
    */
diff --git a/src/stories/InputFile.stories.tsx b/src/stories/InputFile.stories.tsx
index 2ae7fd38..5d5167b7 100644
--- a/src/stories/InputFile.stories.tsx
+++ b/src/stories/InputFile.stories.tsx
@@ -12,7 +12,6 @@ type Story = StoryObj<typeof InputFile>
 
 export const Default: Story = {
   args: {
-    hintText: 'Subir en formato XML - PDF',
     progressIndicator: 0,
     dragMessage: 'Suelta aquí',
     id: 'upload',