diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
index 6c44f77be2..5e5708ab2b 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/date-picker-inline/dynamic-date-picker-inline.component.html
@@ -26,6 +26,7 @@
 
         <button class="btn btn-outline-secondary"
                 type="button"
+                [attr.aria-labelledby]="'label_' + model.id"
                 [class.disabled]="model.disabled"
                 [disabled]="model.disabled"
                 (click)="datepicker.toggle()">
diff --git a/src/app/submission/sections/upload/file/section-upload-file.component.html b/src/app/submission/sections/upload/file/section-upload-file.component.html
index 64df1155bf..218a557913 100644
--- a/src/app/submission/sections/upload/file/section-upload-file.component.html
+++ b/src/app/submission/sections/upload/file/section-upload-file.component.html
@@ -10,10 +10,20 @@
       </div>
       <div class="float-right w-15" [class.sticky-buttons]="!readMode">
         <ng-container *ngIf="readMode">
-          <button class="btn btn-link" (click)="downloadBitstreamFile(); $event.stopPropagation()"><i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i></button>
-          <!--<a href="{{fileData.url}}"  title="Download file" target="_blank"><i class="fa fa-download text-normal mr-3" aria-hidden="true"></i></a>-->
-          <button class="btn btn-link" (click)="$event.preventDefault();switchMode();"><i class="fa fa-edit fa-2x text-normal"></i></button>
           <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.download.title' | translate"
+                  title="{{ 'submission.sections.upload.download.title' | translate }}"
+                  (click)="downloadBitstreamFile(); $event.stopPropagation()">
+            <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
+          </button>
+          <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.edit.title' | translate"
+                  title="{{ 'submission.sections.upload.edit.title' | translate }}"
+                  (click)="$event.preventDefault();switchMode();">
+            <i class="fa fa-edit fa-2x text-normal"></i>
+          </button>
+          <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
                   [disabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
@@ -22,9 +32,18 @@
           </button>
         </ng-container>
         <ng-container *ngIf="!readMode">
-          <button class="btn btn-link" (click)="saveBitstreamData($event);" title="{{ 'submission.sections.upload.save-metadata' | translate }}"><i class="fa fa-save fa-2x text-success"></i></button>
-          <button class="btn btn-link" (click)="$event.preventDefault();switchMode();" title="{{ 'submission.sections.upload.undo' | translate }}"><i class="fa fa-ban fa-2x text-warning"></i></button>
           <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.save-metadata' | translate"
+                  title="{{ 'submission.sections.upload.save-metadata' | translate }}"
+                  (click)="saveBitstreamData($event);">
+            <i class="fa fa-save fa-2x text-success"></i>
+          </button>
+          <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.undo' | translate"
+                  title="{{ 'submission.sections.upload.undo' | translate }}"
+                  (click)="$event.preventDefault();switchMode();"><i class="fa fa-ban fa-2x text-warning"></i></button>
+          <button class="btn btn-link"
+                  [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
                   [disabled]="(processingDelete$ | async)"
                   (click)="$event.preventDefault();confirmDelete(content);">
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index 5bd08dfbc8..6f0472c5f7 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -3438,8 +3438,12 @@
 
   "submission.sections.upload.delete.submit": "Delete",
 
+  "submission.sections.upload.download.title": "Download bitstream",
+
   "submission.sections.upload.drop-message": "Drop files to attach them to the item",
 
+  "submission.sections.upload.edit.title": "Edit bitstream",
+
   "submission.sections.upload.form.access-condition-label": "Access condition type",
 
   "submission.sections.upload.form.date-required": "Date is required.",