diff --git a/src/app/shared/number-picker/number-picker.component.html b/src/app/shared/number-picker/number-picker.component.html
index 84fb47f0c8..58b6def50b 100644
--- a/src/app/shared/number-picker/number-picker.component.html
+++ b/src/app/shared/number-picker/number-picker.component.html
@@ -1,6 +1,6 @@
 <div class="d-flex flex-column align-items-center justify-content-around mr-3">
     <button
-      class="btn btn-arrow"
+      class="btn btn-link-focus"
       type="button"
       tabindex="0"
       [disabled]="disabled"
@@ -25,7 +25,7 @@
       aria-label="name"
     >
     <button
-      class="btn btn-arrow"
+      class="btn btn-link-focus"
       type="button"
       tabindex="0"
       [disabled]="disabled"
diff --git a/src/app/shared/number-picker/number-picker.component.scss b/src/app/shared/number-picker/number-picker.component.scss
index dd710d9594..94f7f38ef0 100644
--- a/src/app/shared/number-picker/number-picker.component.scss
+++ b/src/app/shared/number-picker/number-picker.component.scss
@@ -24,7 +24,7 @@ input {
   max-width: 80px !important;
 }
 
-.btn-arrow {
+.btn-link-focus {
   // behave as btn-link but does not override box-shadow of btn-link:focus
   font-weight: $font-weight-normal;
   color: $link-color;
diff --git a/src/app/submission/form/submission-form.component.scss b/src/app/submission/form/submission-form.component.scss
index 56d6288764..c5e142b89c 100644
--- a/src/app/submission/form/submission-form.component.scss
+++ b/src/app/submission/form/submission-form.component.scss
@@ -17,3 +17,23 @@
   z-index: var(--ds-submission-footer-z-index);
 }
 
+.btn-link-focus {
+  // behave as btn-link but does not override box-shadow of btn-link:focus
+  font-weight: $font-weight-normal;
+  color: $link-color;
+  text-decoration: $link-decoration;
+  @include hover {
+    color: $link-hover-color;
+    text-decoration: $link-hover-decoration;
+  }
+  &:disabled,
+  &.disabled {
+    color: $btn-link-disabled-color;
+    pointer-events: none;
+  }
+
+  &:focus,
+  &.focus {
+    text-decoration: $link-hover-decoration;
+  }
+}
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 09c062d191..ce10e0ea59 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,16 +10,16 @@
       </div>
       <div class="float-right w-15" [class.sticky-buttons]="!readMode">
         <ng-container *ngIf="readMode">
-          <ds-file-download-link [cssClasses]="'btn btn-link'" [isBlank]="true" [bitstream]="getBitstream()">
+          <ds-file-download-link [cssClasses]="'btn btn-link-focus'" [isBlank]="true" [bitstream]="getBitstream()">
             <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
           </ds-file-download-link>
-          <button class="btn btn-link"
+          <button class="btn btn-link-focus"
                   [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"
+          <button class="btn btn-link-focus"
                   [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
                   title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
                   [disabled]="(processingDelete$ | async)"