diff --git a/src/tedi/components/form/file-dropzone/file-dropzone.module.scss b/src/tedi/components/form/file-dropzone/file-dropzone.module.scss
index a581df3c..becd48cf 100644
--- a/src/tedi/components/form/file-dropzone/file-dropzone.module.scss
+++ b/src/tedi/components/form/file-dropzone/file-dropzone.module.scss
@@ -65,8 +65,12 @@
 
 .tedi-file-dropzone__file-list {
   width: 100%;
+  padding-left: 0;
   margin-top: var(--layout-grid-gutters-04);
-  list-style: none;
+
+  .tedi-file-dropzone__file-list-item {
+    padding-left: 0;
+  }
 }
 
 .tedi-file-dropzone__file-name {
diff --git a/src/tedi/components/form/file-dropzone/file-dropzone.spec.tsx b/src/tedi/components/form/file-dropzone/file-dropzone.spec.tsx
index 57176cd4..0d905e2f 100644
--- a/src/tedi/components/form/file-dropzone/file-dropzone.spec.tsx
+++ b/src/tedi/components/form/file-dropzone/file-dropzone.spec.tsx
@@ -130,7 +130,7 @@ describe('FileDropzone', () => {
     });
 
     render(<FileDropzone id="test-file-dropzone" name="file" label="Upload File" />);
-    const removeButton = screen.getByRole('button', { name: /clear/i });
+    const removeButton = screen.getByRole('button', { name: /remove/i });
     fireEvent.click(removeButton);
 
     expect(onFileRemove).toHaveBeenCalledWith(file);
diff --git a/src/tedi/components/form/file-dropzone/file-dropzone.tsx b/src/tedi/components/form/file-dropzone/file-dropzone.tsx
index e0631cc1..318c2cec 100644
--- a/src/tedi/components/form/file-dropzone/file-dropzone.tsx
+++ b/src/tedi/components/form/file-dropzone/file-dropzone.tsx
@@ -7,8 +7,8 @@ import { useLabels } from '../../../providers/label-provider';
 import { Icon } from '../../base/icon/icon';
 import ClosingButton from '../../buttons/closing-button/closing-button';
 import { Card, CardContent } from '../../cards/card';
+import { List } from '../../content/list';
 import { Col, Row } from '../../layout/grid';
-import { VerticalSpacing } from '../../layout/vertical-spacing';
 import FeedbackText, { FeedbackTextProps } from '../feedback-text/feedback-text';
 import FormLabel, { FormLabelProps } from '../form-label/form-label';
 import styles from './file-dropzone.module.scss';
@@ -42,10 +42,12 @@ export const FileDropzone = (props: FileDropzoneProps): JSX.Element => {
   const { innerFiles, uploadErrorHelper, onFileChange, onFileRemove } = useFileUpload(props);
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
+    disabled,
     accept: props.accept ? { 'application/*': [props.accept] } : undefined,
     multiple: props.multiple,
     maxSize: props.maxSize ? props.maxSize * 1024 ** 2 : undefined,
     onDrop: (acceptedFiles) => {
+      if (disabled) return;
       const event = {
         target: { files: acceptedFiles },
       } as unknown as React.ChangeEvent<HTMLInputElement>;
@@ -65,8 +67,15 @@ export const FileDropzone = (props: FileDropzoneProps): JSX.Element => {
 
   return (
     <>
-      <div {...getRootProps()} className={fileDropzoneBEM}>
-        <input {...getInputProps()} />
+      <div
+        {...getRootProps({
+          tabIndex: disabled ? -1 : 0,
+          'aria-disabled': disabled,
+          'aria-describedby': helperId,
+        })}
+        className={fileDropzoneBEM}
+      >
+        <input {...getInputProps()} disabled={disabled} />
         <div className={styles['tedi-file-dropzone__label-wrapper']}>
           <Icon color={disabled ? 'tertiary' : 'secondary'} size={24} name="attach_file" />
           <FormLabel id={id} label={label} className={styles['tedi-file-dropzone__label']} />
@@ -78,36 +87,39 @@ export const FileDropzone = (props: FileDropzoneProps): JSX.Element => {
         <FeedbackText {...uploadErrorHelper} id={helperId} />
       ) : null}
       {!!innerFiles.length && (
-        <VerticalSpacing size={0.5} className={styles['tedi-file-dropzone__file-list']}>
+        <List
+          className={styles['tedi-file-dropzone__file-list']}
+          style="none"
+          aria-label={getLabel('file-dropzone.selected-files')}
+        >
           {innerFiles.map((file: FileUploadFile) => (
-            <Card
-              background={file.isValid === false ? 'danger-primary' : 'tertiary'}
-              borderless
-              className={styles['tedi-file-dropzone__file-item']}
-              key={file.id || file.name}
-            >
-              <CardContent
-                padding={{
-                  bottom: 0.5,
-                  left: 0.5,
-                  right: 0.5,
-                  top: 0.5,
-                }}
+            <List.Item key={file.id || file.name} className={styles['tedi-file-dropzone__file-list-item']}>
+              <Card
+                background={file.isValid === false ? 'danger-primary' : 'tertiary'}
+                borderless
+                className={styles['tedi-file-dropzone__file-item']}
               >
-                <Row alignItems="center">
-                  <Col className={styles['tedi-file-dropzone__file-name']}>
-                    {file.name}{' '}
-                    {file.isValid === false && <Icon name="info" color="danger" display="inline" size={18} />}
-                  </Col>
-                  <Col width="auto">
-                    <ClosingButton title={getLabel('clear')} onClick={() => onFileRemove(file)} />
-                  </Col>
-                </Row>
-              </CardContent>
-            </Card>
+                <CardContent padding={0.5}>
+                  <Row alignItems="center">
+                    <Col className={styles['tedi-file-dropzone__file-name']}>
+                      {file.name}{' '}
+                      {file.isValid === false && <Icon name="info" color="danger" display="inline" size={18} />}
+                    </Col>
+                    <Col width="auto">
+                      <ClosingButton title={getLabel('remove') + ' ' + file.name} onClick={() => onFileRemove(file)} />
+                    </Col>
+                  </Row>
+                </CardContent>
+              </Card>
+            </List.Item>
           ))}
-        </VerticalSpacing>
+        </List>
       )}
+      <div className="sr-only" role="status" aria-live="polite" aria-atomic="true">
+        {innerFiles.length === 0
+          ? getLabel('file-dropzone.no-file')
+          : getLabel('file-dropzone.files-selected', innerFiles.length)}
+      </div>
     </>
   );
 };
diff --git a/src/tedi/providers/label-provider/labels-map.ts b/src/tedi/providers/label-provider/labels-map.ts
index d712d220..0c64d7ba 100644
--- a/src/tedi/providers/label-provider/labels-map.ts
+++ b/src/tedi/providers/label-provider/labels-map.ts
@@ -226,6 +226,42 @@ export const labelsMap = validateDefaultLabels({
     en: 'Drop files here, or click to browse',
     ru: 'Перетащите файлы сюда или нажмите, чтобы выбрать',
   },
+  'file-dropzone.no-file': {
+    description: 'No file selected label for FileUpload or FileDropzone',
+    components: ['FileDropzone', 'FileUpload'],
+    et: 'Ühtegi faili pole valitud',
+    en: 'No file has been chosen',
+    ru: 'Файлы не выбраны',
+  },
+  'file-dropzone.selected-files': {
+    description: 'Selected files label for FileUpload or FileDropzone',
+    components: ['FileDropzone', 'FileUpload'],
+    et: 'Valitud failid',
+    en: 'Uploaded files',
+    ru: 'Загруженные файлы',
+  },
+  'file-dropzone.files-selected': {
+    description: 'Label for selected file count',
+    components: ['FileDropzone', 'FileUpload'],
+    et: (files: number) => (files === 1 ? `${files} fail valitud` : `${files} faili valitud`),
+    en: (files: number) => (files === 1 ? `${files} file selected` : `${files} files selected`),
+    ru: (files: number) => {
+      const lastDigit = files % 10;
+      const lastTwoDigits = files % 100;
+      const isSingular = lastDigit === 1 && lastTwoDigits !== 11;
+      const isFew = lastDigit >= 2 && lastDigit <= 4 && (lastTwoDigits < 12 || lastTwoDigits > 14);
+
+      if (isSingular) {
+        return `${files} выбранный файл`;
+      }
+
+      if (isFew) {
+        return `${files} выбранных файла`;
+      }
+
+      return `${files} выбранных файлов`;
+    },
+  },
   'modal.close': {
     description: 'Label for modals close button',
     components: ['Modal'],