diff --git a/.eslintrc.json b/.eslintrc.json
index 3d38f3bc4da..dd69069d8d4 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -342,7 +342,8 @@
         // Custom DSpace Angular rules
         "dspace-angular-html/themed-component-usages": "error",
         "dspace-angular-html/no-disabled-attribute-on-button": "error",
-        "@angular-eslint/template/prefer-control-flow": "error"
+        "@angular-eslint/template/prefer-control-flow": "error",
+        "@angular-eslint/template/button-has-type": "error"
       }
     },
     {
diff --git a/src/app/access-control/bulk-access/bulk-access.component.html b/src/app/access-control/bulk-access/bulk-access.component.html
index d22a8bda43b..b94a342f702 100644
--- a/src/app/access-control/bulk-access/bulk-access.component.html
+++ b/src/app/access-control/bulk-access/bulk-access.component.html
@@ -7,10 +7,10 @@ <h1>{{ 'admin.access-control.bulk-access.title' | translate }}</h1>
   <hr>
 
   <div class="d-flex justify-content-end">
-    <button class="btn btn-outline-primary me-3" (click)="reset()">
+    <button type="button" class="btn btn-outline-primary me-3" (click)="reset()">
       {{ 'access-control-cancel' | translate }}
     </button>
-    <button class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="!canExport()" (click)="submit()">
       {{ 'access-control-execute' | translate }}
     </button>
   </div>
diff --git a/src/app/access-control/epeople-registry/epeople-registry.component.html b/src/app/access-control/epeople-registry/epeople-registry.component.html
index c054a5dd55e..be7d0f27100 100644
--- a/src/app/access-control/epeople-registry/epeople-registry.component.html
+++ b/src/app/access-control/epeople-registry/epeople-registry.component.html
@@ -5,7 +5,7 @@
         <h1 id="header" class="pb-2">{{labelPrefix + 'head' | translate}}</h1>
 
         <div>
-          <button class="me-auto btn btn-success addEPerson-button"
+          <button type="button" class="me-auto btn btn-success addEPerson-button"
             [routerLink]="'create'">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ms-1">{{labelPrefix + 'button.add' | translate}}</span>
@@ -36,7 +36,7 @@ <h2 id="search" class="border-bottom pb-2">
           </div>
         </div>
         <div>
-          <button (click)="clearFormAndResetResult();"
+          <button type="button" (click)="clearFormAndResetResult();"
           class="search-button btn btn-secondary">{{labelPrefix + 'button.see-all' | translate}}</button>
         </div>
       </form>
@@ -69,13 +69,13 @@ <h2 id="search" class="border-bottom pb-2">
                     <td>{{epersonDto.eperson.email}}</td>
                     <td>
                       <div class="btn-group edit-field">
-                        <button [routerLink]="getEditEPeoplePage(epersonDto.eperson.id)"
+                        <button type="button" [routerLink]="getEditEPeoplePage(epersonDto.eperson.id)"
                           class="btn btn-outline-primary btn-sm access-control-editEPersonButton"
                           title="{{labelPrefix + 'table.edit.buttons.edit' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
                           <i class="fas fa-edit fa-fw"></i>
                         </button>
                         @if (epersonDto.ableToDelete) {
-                          <button (click)="deleteEPerson(epersonDto.eperson)"
+                          <button type="button" (click)="deleteEPerson(epersonDto.eperson)"
                             class="delete-button btn btn-outline-danger btn-sm access-control-deleteEPersonButton"
                             title="{{labelPrefix + 'table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDto.eperson) } }}">
                             <i class="fas fa-trash-alt fa-fw"></i>
diff --git a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
index b6d45a9cb9f..9d07985d46b 100644
--- a/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
+++ b/src/app/access-control/epeople-registry/eperson-form/eperson-form.component.html
@@ -100,7 +100,7 @@ <h2>{{messagePrefix + '.groupsEPersonIsMemberOf' | translate}}</h2>
             <div class="alert alert-info w-100 mb-2" role="alert">
               <div>{{messagePrefix + '.memberOfNoGroups' | translate}}</div>
               <div>
-                <button [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
+                <button type="button" [routerLink]="[groupsDataService.getGroupRegistryRouterLink()]"
                 class="btn btn-primary">{{messagePrefix + '.goToGroups' | translate}}</button>
               </div>
             </div>
diff --git a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
index 072b836d236..32a0683f886 100644
--- a/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
+++ b/src/app/access-control/group-registry/group-form/members-list/members-list.component.html
@@ -35,7 +35,7 @@ <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
                 <td class="align-middle">
                   <div class="btn-group edit-field">
                     @if (epersonDTO.ableToDelete) {
-                      <button (click)="deleteMemberFromGroup(epersonDTO.eperson)"
+                      <button type="button" (click)="deleteMemberFromGroup(epersonDTO.eperson)"
                         [dsBtnDisabled]="actionConfig.remove.disabled"
                         [ngClass]="['btn btn-sm', actionConfig.remove.css]"
                         title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(epersonDTO.eperson) } }}">
@@ -44,6 +44,7 @@ <h3>{{messagePrefix + '.headMembers' | translate}}</h3>
                     }
                     @if (!epersonDTO.ableToDelete) {
                       <button
+                        type="button"
                         (click)="addMemberToGroup(epersonDTO.eperson)"
                         [dsBtnDisabled]="actionConfig.add.disabled"
                         [ngClass]="['btn btn-sm', actionConfig.add.css]"
@@ -93,7 +94,7 @@ <h3 id="search" class="border-bottom pb-2">
         </div>
       </div>
       <div>
-        <button (click)="clearFormAndResetResult();"
+        <button type="button" (click)="clearFormAndResetResult();"
         class="btn btn-secondary">{{messagePrefix + '.button.see-all' | translate}}</button>
       </div>
     </form>
@@ -129,7 +130,7 @@ <h3 id="search" class="border-bottom pb-2">
                   </td>
                   <td class="align-middle">
                     <div class="btn-group edit-field">
-                      <button (click)="addMemberToGroup(eperson)"
+                      <button type="button"(click)="addMemberToGroup(eperson)"
                         [dsBtnDisabled]="actionConfig.add.disabled"
                         [ngClass]="['btn btn-sm', actionConfig.add.css]"
                         title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(eperson) } }}">
diff --git a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
index c39298865ca..d96a53ca2ba 100644
--- a/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
+++ b/src/app/access-control/group-registry/group-form/subgroup-list/subgroups-list.component.html
@@ -32,7 +32,7 @@ <h4>{{messagePrefix + '.headSubgroups' | translate}}</h4>
                 <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload)}}</td>
                 <td class="align-middle">
                   <div class="btn-group edit-field">
-                    <button (click)="deleteSubgroupFromGroup(group)"
+                    <button type="button" (click)="deleteSubgroupFromGroup(group)"
                       class="btn btn-outline-danger btn-sm deleteButton"
                       title="{{messagePrefix + '.table.edit.buttons.remove' | translate: { name: dsoNameService.getName(group) } }}">
                       <i class="fas fa-trash-alt fa-fw"></i>
@@ -80,7 +80,7 @@ <h4 id="search" class="border-bottom pb-2">
       </div>
     </div>
     <div>
-      <button (click)="clearFormAndResetResult();" class="btn btn-secondary float-end">
+      <button type="button"(click)="clearFormAndResetResult();" class="btn btn-secondary float-end">
         {{messagePrefix + '.button.see-all' | translate}}
       </button>
     </div>
@@ -115,7 +115,7 @@ <h4 id="search" class="border-bottom pb-2">
                 <td class="align-middle">{{ dsoNameService.getName((group.object | async)?.payload) }}</td>
                 <td class="align-middle">
                   <div class="btn-group edit-field">
-                    <button (click)="addSubgroupToGroup(group)"
+                    <button type="button" (click)="addSubgroupToGroup(group)"
                       class="btn btn-outline-primary btn-sm addButton"
                       title="{{messagePrefix + '.table.edit.buttons.add' | translate: { name: dsoNameService.getName(group) } }}">
                       <i class="fas fa-plus fa-fw"></i>
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index 1ce2bb972b0..1f4ff1b5e33 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -4,7 +4,7 @@
       <div class="d-flex justify-content-between border-bottom mb-3">
         <h1 id="header" class="pb-2">{{messagePrefix + 'head' | translate}}</h1>
         <div>
-          <button class="me-auto btn btn-success"
+          <button type="button" class="me-auto btn btn-success"
             [routerLink]="'create'">
             <i class="fas fa-plus"></i>
             <span class="d-none d-sm-inline ms-1">{{messagePrefix + 'button.add' | translate}}</span>
@@ -27,7 +27,7 @@ <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
           </div>
         </div>
         <div>
-          <button (click)="clearFormAndResetResult();" class="btn btn-secondary">
+          <button type="button" (click)="clearFormAndResetResult();" class="btn btn-secondary">
             {{messagePrefix + 'button.see-all' | translate}}
           </button>
         </div>
@@ -65,7 +65,8 @@ <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
                         @switch (groupDto.ableToEdit) {
                           @case (true) {
                             <button
-                              [routerLink]="getGroupEditPageRouterLink(groupDto.group)"
+                              type="button"
+                              [routerLink]="groupService.getGroupEditPageRouterLink(groupDto.group)"
                               class="btn btn-outline-primary btn-sm btn-edit"
                               title="{{messagePrefix + 'table.edit.buttons.edit' | translate: {name: dsoNameService.getName(groupDto.group) } }}"
                               >
@@ -74,6 +75,7 @@ <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
                           }
                           @case (false) {
                             <button
+                              type="button"
                               [dsBtnDisabled]="true"
                               class="btn btn-outline-primary btn-sm btn-edit"
                               placement="left"
@@ -85,7 +87,8 @@ <h2 id="search" class="border-bottom pb-2">{{messagePrefix + 'search.head' | tra
                         }
                         @if (!groupDto.group?.permanent && groupDto.ableToDelete) {
                           <button
-                            (click)="confirmDelete(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
+                            type="button"
+                            (click)="deleteGroup(groupDto)" class="btn btn-outline-danger btn-sm btn-delete"
                             title="{{messagePrefix + 'table.edit.buttons.remove' | translate: {name: dsoNameService.getName(groupDto.group) } }}">
                             <i class="fas fa-trash-alt fa-fw"></i>
                           </button>
diff --git a/src/app/admin/admin-import-batch-page/batch-import-page.component.html b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
index 38c6a1f349f..94feba7aba0 100644
--- a/src/app/admin/admin-import-batch-page/batch-import-page.component.html
+++ b/src/app/admin/admin-import-batch-page/batch-import-page.component.html
@@ -8,7 +8,7 @@ <h1 id="header">{{'admin.batch-import.page.header' | translate}}</h1>
     </p>
   }
   <p>
-    <button class="btn btn-primary" (click)="this.selectCollection();">{{'admin.metadata-import.page.button.select-collection' | translate}}</button>
+    <button type="button" class="btn btn-primary" (click)="this.selectCollection();">{{'admin.metadata-import.page.button.select-collection' | translate}}</button>
   </p>
   <div class="mb-3">
     <div class="form-check">
@@ -49,9 +49,9 @@ <h1 id="header">{{'admin.batch-import.page.header' | translate}}</h1>
   }
 
   <div class="space-children-mr">
-    <button class="btn btn-secondary" id="backButton"
+    <button type="button"class="btn btn-secondary" id="backButton"
     (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
-    <button class="btn btn-primary" id="proceedButton"
+    <button type="button" class="btn btn-primary" id="proceedButton"
     (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
index 154e69d2c9b..bd79ca50eb7 100644
--- a/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
+++ b/src/app/admin/admin-import-metadata-page/metadata-import-page.component.html
@@ -20,9 +20,9 @@ <h1 id="header">{{'admin.metadata-import.page.header' | translate}}</h1>
   </ds-file-dropzone-no-uploader>
 
   <div class="space-children-mr">
-    <button class="btn btn-secondary" id="backButton"
+    <button type="button" class="btn btn-secondary" id="backButton"
             (click)="this.onReturn();">{{'admin.metadata-import.page.button.return' | translate}}</button>
-    <button class="btn btn-primary" id="proceedButton"
+    <button type="button" class="btn btn-primary" id="proceedButton"
             (click)="this.importMetadata();">{{'admin.metadata-import.page.button.proceed' | translate}}</button>
   </div>
 </div>
diff --git a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
index 92d015b25e3..54e5e22da02 100644
--- a/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-service-form/ldn-service-form.component.html
@@ -336,11 +336,11 @@ <h4>{{'service.overview.create.modal' | translate }}</h4>
     <div class="modal-footer">
       @if (!isNewService) {
         <div>
-          <button (click)="closeModal()" class="btn btn-outline-secondary me-2"
+          <button type="button" (click)="closeModal()" class="btn btn-outline-secondary me-2"
             id="delete-confirm-edit">{{ 'service.detail.return' | translate }}
           </button>
           @if (!isNewService) {
-            <button (click)="patchService()"
+            <button type="button"(click)="patchService()"
               class="btn btn-primary">{{ 'service.detail.update' | translate }}
             </button>
           }
@@ -348,10 +348,10 @@ <h4>{{'service.overview.create.modal' | translate }}</h4>
       }
       @if (isNewService) {
         <div>
-          <button (click)="closeModal()" class="btn btn-outline-secondary me-2 "
+          <button type="button"(click)="closeModal()" class="btn btn-outline-secondary me-2 "
             id="delete-confirm-new">{{ 'service.refuse.create' | translate }}
           </button>
-          <button (click)="createService()"
+          <button type="button" (click)="createService()"
             class="btn btn-primary">{{ 'service.confirm.create' | translate }}
           </button>
         </div>
diff --git a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
index 28e592ebfc1..588ae7b4ced 100644
--- a/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
+++ b/src/app/admin/admin-ldn-services/ldn-services-directory/ldn-services-directory.component.html
@@ -3,7 +3,7 @@
     <h1 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h1>
   </div>
   <div class="d-flex justify-content-end">
-    <button class="btn btn-success" routerLink="/admin/ldn/services/new"><i
+    <button type="button" class="btn btn-success" routerLink="/admin/ldn/services/new"><i
     class="fas fa-plus pe-2"></i>{{ 'process.overview.new' | translate }}</button>
   </div>
   @if ((ldnServicesRD$ | async)?.payload?.totalElements > 0) {
@@ -46,12 +46,13 @@ <h1 class="flex-grow-1">{{ 'ldn-registered-services.title' | translate }}</h1>
                 <td>
                   <div class="btn-group">
                     <button
+                      type="button"
                       (click)="selectServiceToDelete(ldnService.id)"
                       [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
                       class="btn btn-outline-danger">
                       <i class="fas fa-trash"></i>
                     </button>
-                    <button [routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
+                    <button type="button"[routerLink]="['/admin/ldn/services/edit/', ldnService.id]"
                       [attr.aria-label]="'ldn-service-overview-select-edit' | translate"
                       class="btn btn-outline-dark">
                       <i class="fas fa-edit"></i>
@@ -85,11 +86,11 @@ <h4>{{'service.overview.delete.header' | translate }}</h4>
       <div>
         {{ 'service.overview.delete.body' | translate }}
       </div>
-      <div class="mt-4 text-end">
-        <button (click)="closeModal()"
+      <div class="mt-4 text-right">
+        <button  type="button" (click)="closeModal()"
           [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
         class="btn btn-outline-secondary me-2">{{ 'service.detail.delete.cancel' | translate }}</button>
-        <button (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
+        <button type="button" (click)="deleteSelected(this.selectedServiceId.toString(), ldnServicesService)"
           class="btn btn-danger"
           [attr.aria-label]="'ldn-service-overview-select-delete' | translate"
           id="delete-confirm">{{ 'service.overview.delete' | translate }}
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
index 4aae0141748..0622e039683 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-detail-modal/admin-notify-detail-modal.component.html
@@ -14,7 +14,7 @@ <h4 class="modal-title">{{'notify-message-modal.title' | translate}}</h4>
   }
 
   <div class="d-flex justify-content-end">
-    <button class="btn-primary" (click)="toggleCoarMessage()">
+    <button type="button" class="btn-primary" (click)="toggleCoarMessage()">
       {{'notify-message-modal.show-message' | translate}}
     </button>
   </div>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
index 981455d743f..4c911c138a3 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-logs/admin-notify-logs-result/admin-notify-logs-result.component.html
@@ -4,7 +4,7 @@
     <div class="col-md-9">
       <div class="h4">
         @if ((selectedSearchConfig$ | async) !== defaultConfiguration) {
-          <button (click)="resetDefaultConfiguration()" class="badge bg-primary me-1 mb-1">
+          <button type="button" (click)="resetDefaultConfiguration()" class="badge bg-primary me-1 mb-1">
             {{ 'admin-notify-logs.' + (selectedSearchConfig$ | async) | translate}}
             <span> ×</span>
           </button>
diff --git a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
index e4277df2cf5..395a6d3573b 100644
--- a/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
+++ b/src/app/admin/admin-notify-dashboard/admin-notify-search-result/admin-notify-search-result.component.html
@@ -49,9 +49,10 @@
           </td>
           <td>
             <div class="d-flex flex-column">
-              <button class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
+              <button type="button" class="btn mb-2 btn-dark" (click)="openDetailModal(message)">{{ 'notify-message-result.detail' | translate }}</button>
               @if (message.queueStatusLabel !== reprocessStatus && validStatusesForReprocess.includes(message.queueStatusLabel)) {
-                <button
+                <button 
+                  type="button"
                   (click)="reprocessMessage(message)"
                   class="btn btn-warning"
                   >
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
index c0633843895..cea80ef1f0d 100644
--- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
+++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
@@ -59,7 +59,7 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.registries.bitstream-formats
 
       <div>
         @if ((bitstreamFormats$ | async)?.payload?.page?.length > 0) {
-          <button class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
+          <button type="button" class="btn btn-primary deselect" (click)="deselectAll()">{{'admin.registries.bitstream-formats.table.deselect-all' | translate}}</button>
         }
         @if ((bitstreamFormats$ | async)?.payload?.page?.length > 0) {
           <button type="submit" class="btn btn-danger float-end" (click)="deleteFormats()">{{'admin.registries.bitstream-formats.table.delete' | translate}}</button>
diff --git a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
index 73072b61049..cbc7835fce4 100644
--- a/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
+++ b/src/app/admin/admin-registries/metadata-registry/metadata-registry.component.html
@@ -56,7 +56,7 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.registries.metadata.head' |
 
       <div>
         @if ((metadataSchemas | async)?.payload?.page?.length > 0) {
-          <button type="submit" class="btn btn-danger float-end" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
+          <button type="button" class="btn btn-danger float-end" (click)="deleteSchemas()">{{'admin.registries.metadata.schemas.table.delete' | translate}}</button>
         }
       </div>
 
diff --git a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
index 438b37d3aa9..ba72e652f4c 100644
--- a/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
+++ b/src/app/admin/admin-registries/metadata-schema/metadata-schema.component.html
@@ -57,7 +57,7 @@ <h2>{{'admin.registries.schema.fields.head' | translate}}</h2>
         }
 
         <div>
-          <button [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
+          <button type="button" [routerLink]="['/admin/registries/metadata']" class="btn btn-primary">{{'admin.registries.schema.return' | translate}}</button>
           @if (fields?.page?.length > 0) {
             <button type="submit" class="btn btn-danger float-end" (click)="deleteFields()">{{'admin.registries.schema.fields.table.delete' | translate}}</button>
           }
diff --git a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
index c696fa23ba2..c6b8dc9c6fb 100644
--- a/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
+++ b/src/app/admin/admin-reports/filtered-collections/filtered-collections.component.html
@@ -14,12 +14,12 @@ <h1 id="header" class="border-bottom pb-2">{{ "admin.reports.collections.head" |
               <div class="container">
                 <div class="row">
                   <span class="col-3"></span>
-                  <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                  <button type="button" class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
                 </div>
                 <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
                 <div class="row">
                   <span class="col-3"></span>
-                  <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
+                  <button type="button" class="btn btn-primary mt-1 col-6" (click)="submit()">{{ "admin.reports.button.show-collections" | translate }}</button>
                 </div>
               </div>
             </ng-template>
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.html
index a8f5463ce18..af33cfe3db4 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items-export-csv/filtered-items-export-csv.component.html
@@ -1,5 +1,5 @@
 @if (shouldShowButton$ | async) {
-  <button class="export-button btn btn-dark btn-sm"
+  <button type="button" class="export-button btn btn-dark btn-sm"
       [ngbTooltip]="tooltipMsg | translate"
       (click)="export()"
       [title]="tooltipMsg | translate" [attr.aria-label]="tooltipMsg | translate">
diff --git a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
index e515999003e..21ac644bebe 100644
--- a/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
+++ b/src/app/admin/admin-reports/filtered-items/filtered-items.component.html
@@ -23,7 +23,7 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
               }
               <div class="row">
                 <span class="col-3"></span>
-                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                <button type="button" class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
               </div>
             </ng-template>
           </ngb-panel>
@@ -66,9 +66,9 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
                           <input class="form-control" formControlName="value"/>
                         </div>
                         <div class="col-auto">
-                          <button class="btn btn-light" (click)="addQueryPredicate()">+</button>
+                          <button type="button" class="btn btn-light" (click)="addQueryPredicate()">+</button>
                           &nbsp;
-                          <button class="btn btn-light" [dsBtnDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
+                          <button type="button" class="btn btn-light" [dsBtnDisabled]="deleteQueryPredicateDisabled()" (click)="deleteQueryPredicate(i)">–</button>
                         </div>
                       </div>
                     </div>
@@ -77,7 +77,7 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
               </div>
               <div class="row">
                 <span class="col-3"></span>
-                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                <button type="button"class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
               </div>
             </ng-template>
           </ngb-panel>
@@ -104,7 +104,7 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
               </div>
               <div class="row">
                 <span class="col-3"></span>
-                <button class="btn btn-primary col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                <button type="button"class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
               </div>
             </ng-template>
           </ngb-panel>
@@ -115,12 +115,12 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
             <ng-template ngbPanelContent>
               <div class="row">
                 <span class="col-3"></span>
-                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                <button type="button"class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
               </div>
               <ds-filters [filtersForm]="filtersFormGroup()"></ds-filters>
               <div class="row">
                 <span class="col-3"></span>
-                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                <button type="button"class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
               </div>
             </ng-template>
           </ngb-panel>
@@ -142,7 +142,7 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
                   <div class="warning">{{ 'metadata-export-filtered-items.columns.warning' | translate }}</div>
                 }
                 <span class="col-3"></span>
-                <button class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
+                <button type="button" class="btn btn-primary mt-1 col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
               </div>
             </ng-template>
           </ngb-panel>
@@ -193,8 +193,8 @@ <h1 id="header" class="border-bottom pb-2">{{'admin.reports.items.head' | transl
                 {{'admin.reports.commons.page' | translate}} {{ currentPage + 1 }} {{'admin.reports.commons.of' | translate}} {{ pageCount() }}
               </div>
               <div>
-                <button id="prev" class="btn btn-light" (click)="prevPage()" [dsBtnDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
-                <button id="next" class="btn btn-light" (click)="nextPage()" [dsBtnDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
+                <button type="button" id="prev" class="btn btn-light" (click)="prevPage()" [dsBtnDisabled]="!canNavigatePrevious()">{{'admin.reports.commons.previous-page' | translate}}</button>
+                <button type="button" id="next" class="btn btn-light" (click)="nextPage()" [dsBtnDisabled]="!canNavigateNext()">{{'admin.reports.commons.next-page' | translate}}</button>
                 <div style="float: right; margin-right: 60px;">
                   <ds-filtered-items-export-csv [reportParams]="queryForm"></ds-filtered-items-export-csv>
                 </div>
diff --git a/src/app/admin/admin-reports/filters-section/filters-section.component.html b/src/app/admin/admin-reports/filters-section/filters-section.component.html
index 88e4335506d..e03c38092b9 100644
--- a/src/app/admin/admin-reports/filters-section/filters-section.component.html
+++ b/src/app/admin/admin-reports/filters-section/filters-section.component.html
@@ -2,9 +2,9 @@
   <ng-container>
     <span class="col-12">&nbsp;</span>
     <span class="col-1">&nbsp;</span>
-    <button id="btnSelectAllFilters" class="btn btn-light mt-1 col-4" (click)="selectAll()">{{"admin.reports.commons.filters.select_all" | translate}}</button>
+    <button type="button" id="btnSelectAllFilters" class="btn btn-light mt-1 col-4" (click)="selectAll()">{{"admin.reports.commons.filters.select_all" | translate}}</button>
     <span class="col-2">&nbsp;</span>
-    <button id="btnDeselectAllFilters" class="btn btn-light mt-1 col-4" (click)="deselectAll()">{{"admin.reports.commons.filters.deselect_all" | translate}}</button>
+    <button type="button" id="btnDeselectAllFilters" class="btn btn-light mt-1 col-4" (click)="deselectAll()">{{"admin.reports.commons.filters.deselect_all" | translate}}</button>
     <span class="col-1">&nbsp;</span>
     <span class="col-12">&nbsp;</span>
   </ng-container>
diff --git a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
index 150411ec40f..28f0d620b98 100644
--- a/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
+++ b/src/app/admin/admin-workflow-page/admin-workflow-search-results/actions/workspace-item/supervision-order-group-selector/supervision-order-group-selector.component.html
@@ -34,11 +34,11 @@
     </div>
     <!--        <div class="d-flex flex-row-reverse m-2">          -->
     <div class="modal-footer">
-      <button class="btn btn-outline-secondary"
+      <button type="button" class="btn btn-outline-secondary"
         (click)="close()">
         <i class="fas fa-times"></i> {{"supervision-group-selector.button.cancel" | translate}}
       </button>
-      <button class="btn btn-primary save"
+      <button type="button" class="btn btn-primary save"
         (click)="save()">
         <i class="fas fa-save"></i> {{"supervision-group-selector.button.save" | translate}}
       </button>
diff --git a/src/app/audit-page/object-audit-overview/object-audit-logs.component.html b/src/app/audit-page/object-audit-overview/object-audit-logs.component.html
index 1d29477a884..d2634ab58ff 100644
--- a/src/app/audit-page/object-audit-overview/object-audit-logs.component.html
+++ b/src/app/audit-page/object-audit-overview/object-audit-logs.component.html
@@ -19,7 +19,7 @@ <h1 class="flex-grow-1">{{'audit.object.overview.title' | translate}}</h1>
     } @else {
       <div class="h5">{{ 'audit.data.not-found' | translate }}</div>
     }
-    <button class="btn btn-outline-secondary mt-3" (click)="goBack()">
+    <button type="button" class="btn btn-outline-secondary mt-3" (click)="goBack()">
       <i class="fas fa-arrow-left me-1"></i>{{ 'audit.object.back' | translate }}
     </button>
     @if ((auditsRD$ | async)?.statusCode === 404) {
diff --git a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
index 1467ffb0cc8..6af1d57df57 100644
--- a/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
+++ b/src/app/bitstream-page/bitstream-download-page/bitstream-download-page.component.html
@@ -1,7 +1,7 @@
 <div class="container">
   <h1 class="h2">{{'bitstream.download.page' | translate:{ bitstream: dsoNameService.getName((bitstream$ | async)) } }}</h1>
   <div class="pt-3">
-    <button (click)="back()" class="btn btn-outline-secondary">
+    <button type="button"(click)="back()" class="btn btn-outline-secondary">
       <i class="fas fa-arrow-left"></i> {{'bitstream.download.page.back' | translate}}
     </button>
   </div>
diff --git a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
index 2147cb85c08..8d2089dfe75 100644
--- a/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
+++ b/src/app/collection-page/delete-collection-page/delete-collection-page.component.html
@@ -6,10 +6,10 @@ <h1 id="header" class="border-bottom pb-2">{{ 'collection.delete.head' | transla
         <p class="pb-2">{{ 'collection.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
         <div class="mb-3 row">
           <div class="col text-end space-children-mr">
-            <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
+            <button type="button" class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
               <i class="fas fa-times"></i> {{'collection.delete.cancel' | translate}}
             </button>
-            <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
+            <button type="button" class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
               @if (processing$ | async) {
                 <span><i class='fas fa-circle-notch fa-spin'></i> {{'collection.delete.processing' | translate}}</span>
               }
diff --git a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
index 28c5f21869e..2385a88de40 100644
--- a/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-metadata/collection-metadata.component.html
@@ -2,19 +2,19 @@
   <span class="d-inline-block mb-2">{{ 'collection.edit.template.label' | translate}}</span>
   <div class="button-row space-children-mr">
     @if (!itemTemplateRD?.payload) {
-      <button class="btn btn-success" (click)="addItemTemplate()">
+      <button type="button" class="btn btn-success" (click)="addItemTemplate()">
         <i class="fas fa-plus" aria-hidden="true"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.add-button" | translate}}</span>
       </button>
     }
     @if (itemTemplateRD?.payload) {
-      <button class="btn btn-danger" (click)="deleteItemTemplate()">
+      <button type="button"class="btn btn-danger" (click)="deleteItemTemplate()">
         <i class="fas fa-trash-alt" aria-hidden="true"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.delete-button" | translate}}</span>
       </button>
     }
     @if (itemTemplateRD?.payload) {
-      <button class="btn btn-primary"
+      <button type="button"class="btn btn-primary"
         [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/itemtemplate'">
         <i class="fas fa-edit" aria-hidden="true"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"collection.edit.template.edit-button" | translate}}</span>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
index 147b10ff620..7e98bd9b27f 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source-controls/collection-source-controls.component.html
@@ -19,42 +19,42 @@ <h3>{{ 'collection.source.controls.head' | translate }}</h3>
         <span>{{contentSource?.message ? contentSource?.message: 'collection.source.controls.harvest.no-information'|translate }}</span>
       </div>
       @if ((testConfigRunning$ |async) !== true) {
-        <button class="btn btn-secondary"
+        <button type="button" class="btn btn-secondary"
           [dsBtnDisabled]="!(isEnabled)"
           (click)="testConfiguration(contentSource)">
           <span>{{'collection.source.controls.test.submit' | translate}}</span>
         </button>
       }
       @if ((testConfigRunning$ |async)) {
-        <button class="btn btn-secondary"
+        <button type="button" class="btn btn-secondary"
           [dsBtnDisabled]="true">
           <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
           <span>{{'collection.source.controls.test.running' | translate}}</span>
         </button>
       }
       @if ((importRunning$ |async) !== true) {
-        <button class="btn btn-primary"
+        <button type="button" class="btn btn-primary"
           [dsBtnDisabled]="!(isEnabled)"
           (click)="importNow()">
           <span class="d-none d-sm-inline">{{'collection.source.controls.import.submit' | translate}}</span>
         </button>
       }
       @if ((importRunning$ |async)) {
-        <button class="btn btn-primary"
+        <button type="button" class="btn btn-primary"
           [dsBtnDisabled]="true">
           <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
           <span class="d-none d-sm-inline">{{'collection.source.controls.import.running' | translate}}</span>
         </button>
       }
       @if ((reImportRunning$ |async) !== true) {
-        <button class="btn btn-primary"
+        <button type="button"class="btn btn-primary"
           [dsBtnDisabled]="!(isEnabled)"
           (click)="resetAndReimport()">
           <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.submit' | translate}}</span>
         </button>
       }
       @if ((reImportRunning$ |async)) {
-        <button class="btn btn-primary"
+        <button type="button"class="btn btn-primary"
           [dsBtnDisabled]="true">
           <span class="spinner-border spinner-border-sm spinner-button" role="status" aria-hidden="true"></span>
           <span class="d-none d-sm-inline">&nbsp;{{'collection.source.controls.reset.running' | translate}}</span>
diff --git a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
index 7f392b2f027..333fea184ab 100644
--- a/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
+++ b/src/app/collection-page/edit-collection-page/collection-source/collection-source.component.html
@@ -1,7 +1,7 @@
 <div class="container-fluid">
   <div class="d-inline-block float-end space-children-mr">
     @if ((isReinstatable$ | async) !== true) {
-      <button class=" btn btn-danger"
+      <button type="button" class="btn btn-danger"
         [dsBtnDisabled]="(hasChanges$ | async) !== true"
         (click)="discard()"><i
       class="fas fa-times"></i>
@@ -9,13 +9,13 @@
     </button>
   }
   @if (isReinstatable$ | async) {
-    <button class="btn btn-warning"
+    <button type="button" class="btn btn-warning"
       (click)="reinstate()"><i
     class="fas fa-undo-alt"></i>
     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
   </button>
 }
-<button class="btn btn-primary"
+<button type="button" class="btn btn-primary"
   [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
   (click)="onSubmit()"><i
 class="fas fa-save"></i>
@@ -58,7 +58,7 @@ <h3>{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
       <div class="col-12">
         <div class="d-inline-block float-end ms-1 space-children-mr">
           @if ((isReinstatable$ | async) !== true) {
-            <button class=" btn btn-danger"
+            <button type="button" class=" btn btn-danger"
               [dsBtnDisabled]="(hasChanges$ | async) !== true"
               (click)="discard()"><i
             class="fas fa-times"></i>
@@ -66,13 +66,13 @@ <h3>{{ 'collection.edit.tabs.source.form.head' | translate }}</h3>
           </button>
         }
         @if (isReinstatable$ | async) {
-          <button class="btn btn-warning"
+          <button type="button" class="btn btn-warning"
             (click)="reinstate()"><i
           class="fas fa-undo-alt"></i>
           <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.reinstate-button" | translate}}</span>
         </button>
       }
-      <button class="btn btn-primary"
+      <button type="button" class="btn btn-primary"
         [dsBtnDisabled]="(hasChanges$ | async) !== true || !isValid() || (initialHarvestType === harvestTypeNone && contentSource.harvestType === initialHarvestType)"
         (click)="onSubmit()"><i
       class="fas fa-save"></i>
diff --git a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
index 765d49b7bf7..13a30ba18ad 100644
--- a/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
+++ b/src/app/collection-page/edit-item-template-page/edit-item-template-page.component.html
@@ -4,7 +4,7 @@
       @if (itemRD?.hasSucceeded) {
         <h1 class="border-bottom">{{ 'collection.edit.template.head' | translate:{ collection: dsoNameService.getName(collection) } }}</h1>
         <ds-dso-edit-metadata [updateDataService]="itemTemplateService" [dso]="itemRD?.payload"></ds-dso-edit-metadata>
-        <button [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
+        <button type="button" [routerLink]="getCollectionEditUrl(collection)" class="btn btn-outline-secondary">{{ 'collection.edit.template.cancel' | translate }}</button>
       }
       @if (itemRD?.isLoading) {
         <ds-loading [message]="'collection.edit.template.loading' | translate"></ds-loading>
diff --git a/src/app/community-list-page/community-list/community-list.component.html b/src/app/community-list-page/community-list/community-list.component.html
index 0b6ba6e37e4..4fe6ed609de 100644
--- a/src/app/community-list-page/community-list/community-list.component.html
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -11,8 +11,8 @@
       </span>
       <div class="align-middle my-auto">
         @if ((dataSource.loading$ | async) !== true) {
-          <button (click)="getNextPage(node)"
-            class="btn btn-outline-primary btn-sm" role="button" tabindex="0" data-test="show-more-button">
+          <button type="button" (click)="getNextPage(node)"
+            class="btn btn-outline-primary btn-sm" role="button">
             <i class="fas fa-angle-down"></i> {{ 'communityList.showMore' | translate }}
           </button>
         }
diff --git a/src/app/community-page/delete-community-page/delete-community-page.component.html b/src/app/community-page/delete-community-page/delete-community-page.component.html
index 3403cc45dbd..5f82541e338 100644
--- a/src/app/community-page/delete-community-page/delete-community-page.component.html
+++ b/src/app/community-page/delete-community-page/delete-community-page.component.html
@@ -6,10 +6,10 @@ <h1 id="header" class="border-bottom pb-2">{{ 'community.delete.head' | translat
         <p class="pb-2">{{ 'community.delete.text' | translate:{ dso: dsoNameService.getName(dso) } }}</p>
         <div class="mb-3 row">
           <div class="col text-end space-children-mr">
-            <button class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
+            <button type="button" class="btn btn-outline-secondary" (click)="onCancel(dso)" [dsBtnDisabled]="(processing$ | async)">
               <i class="fas fa-times" aria-hidden="true"></i> {{'community.delete.cancel' | translate}}
             </button>
-            <button class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
+            <button type="button" class="btn btn-danger" (click)="onConfirm(dso)" [dsBtnDisabled]="(processing$ | async)">
               @if (processing$ | async) {
                 <span><i class='fas fa-circle-notch fa-spin' aria-hidden="true"></i> {{'community.delete.processing' | translate}}</span>
               }
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.html
index 995cfc7b615..301dbe7bab2 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value-field/dso-edit-metadata-authority-field/dso-edit-metadata-authority-field.component.html
@@ -20,7 +20,7 @@
     </ds-dynamic-onebox>
   }
   @if ((isHierarchicalVocabulary$ | async) || (isScrollableVocabulary$ | async)) {
-    <button class="btn btn-secondary w-100 mt-2"
+    <button type="button" class="btn btn-secondary w-100 mt-2"
             [title]="enabledFreeTextEditing ? dsoType + '.edit.metadata.edit.buttons.disable-free-text-editing' : dsoType + '.edit.metadata.edit.buttons.enable-free-text-editing' | translate"
             (click)="toggleFreeTextEdition()">
       <i class="fas fa-fw" [ngClass]="enabledFreeTextEditing ? 'fa-lock' : 'fa-unlock'"></i>
@@ -41,14 +41,14 @@
                [attr.aria-label]="(dsoType + '.edit.metadata.edit.authority.key') | translate"
                (change)="onChangeAuthorityKey()"/>
         @if (editingAuthority) {
-          <button class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn"
+          <button type="button"class="btn btn-outline-success btn-sm ng-star-inserted" id="metadata-confirm-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.close-authority-edition' | translate }}"
                   (click)="onChangeEditingAuthorityStatus(false)">
             <i class="fas fa-lock-open fa-fw"></i>
           </button>
         } @else {
-          <button class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn"
+          <button type="button"class="btn btn-outline-secondary btn-sm ng-star-inserted" id="metadata-confirm-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.open-authority-edition' | translate }}"
                   (click)="onChangeEditingAuthorityStatus(true)">
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
index 4ce0e248c1c..815cc68612c 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.html
@@ -55,14 +55,14 @@
              [ngbTooltip]="isVirtual ? (dsoType + '.edit.metadata.edit.buttons.virtual' | translate) : null">
           @let saving = (saving$ | async);
           @if (mdValue.editing) {
-            <button class="btn btn-outline-success btn-sm ng-star-inserted" data-test="metadata-confirm-btn"
+            <button type="button" class="btn btn-outline-success btn-sm ng-star-inserted" data-test="metadata-confirm-btn"
                     [title]="dsoType + '.edit.metadata.edit.buttons.confirm' | translate"
                     ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.confirm' | translate }}"
                     [dsBtnDisabled]="isVirtual || saving" (click)="confirm.emit(true)">
               <i class="fas fa-check fa-fw"></i>
             </button>
           } @else {
-            <button class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn"
+            <button type="button" class="btn btn-outline-primary btn-sm ng-star-inserted" data-test="metadata-edit-btn"
                     [title]="dsoType + '.edit.metadata.edit.buttons.edit' | translate"
                     ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.edit' | translate }}"
                     [dsBtnDisabled]="isVirtual || mdValue.change === DsoEditMetadataChangeTypeEnum.REMOVE || saving"
@@ -70,21 +70,21 @@
               <i class="fas fa-edit fa-fw"></i>
             </button>
           }
-          <button class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
+          <button type="button" class="btn btn-outline-danger btn-sm" data-test="metadata-remove-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.remove' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.remove' | translate }}"
                   [dsBtnDisabled]="isVirtual || (mdValue.change && mdValue.change !== DsoEditMetadataChangeTypeEnum.ADD) || mdValue.editing || saving"
                   (click)="remove.emit()">
             <i class="fas fa-trash-alt fa-fw"></i>
           </button>
-          <button class="btn btn-outline-warning btn-sm" data-test="metadata-undo-btn"
+          <button type="button" class="btn btn-outline-warning btn-sm" data-test="metadata-undo-btn"
                   [title]="dsoType + '.edit.metadata.edit.buttons.undo' | translate"
                   ngbTooltip="{{ dsoType + '.edit.metadata.edit.buttons.undo' | translate }}"
                   [dsBtnDisabled]="isVirtual || (!mdValue.change && mdValue.reordered) || (!mdValue.change && !mdValue.editing) || saving"
                   (click)="undo.emit()">
             <i class="fas fa-undo-alt fa-fw"></i>
           </button>
-          <button class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn"
+          <button type="button" class="btn btn-outline-secondary ds-drag-handle btn-sm" data-test="metadata-drag-btn"
                   cdkDragHandle [cdkDragHandleDisabled]="isOnlyValue || saving"
                   [class.disabled]="isOnlyValue || saving" [dsBtnDisabled]="isOnlyValue || saving"
                   [title]="dsoType + '.edit.metadata.edit.buttons.drag' | translate"
diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
index d9f62d2a5f4..b0db1274cdf 100644
--- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.html
@@ -1,28 +1,28 @@
 @if (form) {
   <div class="item-metadata">
     <div class="button-row top d-flex my-2 space-children-mr ms-gap">
-      <button class="me-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
+      <button type="button" class="me-auto btn btn-success" id="dso-add-btn" [dsBtnDisabled]="form.newValue || (saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.add-button' | translate"
               [title]="dsoType + '.edit.metadata.add-button' | translate"
               (click)="add()"><i class="fas fa-plus" aria-hidden="true"></i>
         <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.add-button' | translate }}</span>
       </button>
       @if (isReinstatable) {
-        <button class="btn btn-warning ms-1" id="dso-reinstate-btn" [dsBtnDisabled]="(saving$ | async)"
+        <button type="button" class="btn btn-warning ms-1" id="dso-reinstate-btn" [dsBtnDisabled]="(saving$ | async)"
                 [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
                 [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
                 (click)="reinstate()"><i class="fas fa-undo-alt" aria-hidden="true"></i>
           <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.reinstate-button' | translate }}</span>
         </button>
       }
-      <button class="btn btn-primary ms-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+      <button type="button" class="btn btn-primary ms-1" id="dso-save-btn" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
               [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
               [title]="dsoType + '.edit.metadata.save-button' | translate"
               (click)="submit()"><i class="fas fa-save" aria-hidden="true"></i>
         <span class="d-none d-sm-inline">&nbsp;{{ dsoType + '.edit.metadata.save-button' | translate }}</span>
       </button>
       @if (!isReinstatable) {
-        <button class="btn btn-danger ms-1" id="dso-discard-btn"
+        <button type="button" class="btn btn-danger ms-1" id="dso-discard-btn"
                 [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
                 [title]="dsoType + '.edit.metadata.discard-button' | translate"
                 [dsBtnDisabled]="!hasChanges || (saving$ | async)"
@@ -91,7 +91,7 @@
     <div class="button-row bottom d-inline-block w-100">
       <div class="mt-2 float-end space-children-mr ms-gap">
         @if (isReinstatable) {
-          <button class="btn btn-warning" [dsBtnDisabled]="(saving$ | async)"
+          <button type="button"type="button"class="btn btn-warning" [dsBtnDisabled]="(saving$ | async)"
                   [attr.aria-label]="dsoType + '.edit.metadata.reinstate-button' | translate"
                   [title]="dsoType + '.edit.metadata.reinstate-button' | translate"
                   (click)="reinstate()">
@@ -99,14 +99,14 @@
                aria-hidden="true"></i> {{ dsoType + '.edit.metadata.reinstate-button' | translate }}
           </button>
         }
-        <button class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
+        <button type="button" class="btn btn-primary" [dsBtnDisabled]="!hasChanges || (saving$ | async)"
                 [attr.aria-label]="dsoType + '.edit.metadata.save-button' | translate"
                 [title]="dsoType + '.edit.metadata.save-button' | translate"
                 (click)="submit()">
           <i class="fas fa-save" aria-hidden="true"></i> {{ dsoType + '.edit.metadata.save-button' | translate }}
         </button>
         @if (!isReinstatable) {
-          <button class="btn btn-danger"
+          <button type="button" class="btn btn-danger"
                   [attr.aria-label]="dsoType + '.edit.metadata.discard-button' | translate"
                   [title]="dsoType + '.edit.metadata.discard-button' | translate"
                   [dsBtnDisabled]="!hasChanges || (saving$ | async)"
diff --git a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
index 20cf35aabcd..c83401875cb 100644
--- a/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
+++ b/src/app/dso-shared/dso-edit-metadata/metadata-field-selector/metadata-field-selector.component.html
@@ -24,6 +24,7 @@
         @if (mdFieldOptions$ | async) {
           @for (listEntry of (mdFieldOptions$ | async); track listEntry) {
             <button
+              type="button"
               class="d-block dropdown-item"
               dsHoverClass="ds-hover"
               (click)="select(listEntry)" #listEntryElement>
@@ -33,6 +34,7 @@
         }
         @if (loading) {
           <button
+            type="button"
             class="list-group-item list-group-item-action border-0 list-entry">
             <ds-loading [showMessage]="false"></ds-loading>
           </button>
diff --git a/src/app/external-log-in/external-log-in/external-log-in.component.html b/src/app/external-log-in/external-log-in/external-log-in.component.html
index 90b03d55fb5..9f2fdbd9113 100644
--- a/src/app/external-log-in/external-log-in/external-log-in.component.html
+++ b/src/app/external-log-in/external-log-in/external-log-in.component.html
@@ -22,7 +22,7 @@ <h4>{{ 'external-login.confirmation.header' | translate }}</h4>
         <h4 class="mt-2">{{ 'external-login.component.or' | translate }}</h4>
       </div>
       <div class="col d-flex justify-content-center align-items-center">
-        <button data-test="open-modal" class="btn block btn-lg btn-primary" (click)="openLoginModal(loginModal)">
+        <button type="button" data-test="open-modal" class="btn block btn-lg btn-primary" (click)="openLoginModal(loginModal)">
           {{ 'external-login.connect-to-existing-account.label' | translate }}
         </button>
       </div>
diff --git a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.html b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.html
index 8dd11ed3d78..19b3c943646 100644
--- a/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.html
+++ b/src/app/external-login-review-account-info-page/review-account-info/review-account-info.component.html
@@ -54,7 +54,7 @@ <h2> {{'external-login-validation.review-account-info.header' | translate}}</h2>
       }
     </tbody>
   </table>  <div class="d-flex justify-content-end">
-    <button class="btn btn-primary" (click)="onSave()">
+    <button type="button" class="btn btn-primary" (click)="onSave()">
       {{'confirmation-modal.review-account-info.save' | translate}}
     </button>
   </div>
diff --git a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
index 59ce7311f83..1fbdaff4598 100644
--- a/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
+++ b/src/app/forgot-password/forgot-password-form/forgot-password-form.component.html
@@ -26,6 +26,7 @@ <h1 class="mb-4">{{'forgot-password.form.head' | translate}}</h1>
     <div class="row">
       <div class="col-12">
         <button
+          type="button"
           [dsBtnDisabled]="isInValid"
           class="btn btn-default btn-primary"
         (click)="submit()">{{'forgot-password.form.submit' | translate}}</button>
diff --git a/src/app/home-page/recent-item-list/recent-item-list.component.html b/src/app/home-page/recent-item-list/recent-item-list.component.html
index 877fb85b8b5..a02cc7b3f4b 100644
--- a/src/app/home-page/recent-item-list/recent-item-list.component.html
+++ b/src/app/home-page/recent-item-list/recent-item-list.component.html
@@ -2,18 +2,14 @@
   @if (itemRD?.hasSucceeded && itemRD?.payload?.page.length > 0) {
     <div class="mt-4" [ngClass]="placeholderFontClass" @fadeIn>
       <div class="d-flex flex-row border-bottom mb-4 pb-4"></div>
-      <h2> {{ 'home.recent-submissions.head' | translate }}</h2>
-      <ul class="list-unstyled m-0 p-0">
-        @for (item of itemRD?.payload?.page; track item) {
-          <li class="my-4">
-            <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
-            </ds-listable-object-component-loader>
-          </li>
-        }
-      </ul>
-      <button (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-start" role="link" tabindex="0">
-        {{ 'vocabulary-treeview.load-more' | translate }} ...
-      </button>
+      <h2> {{'home.recent-submissions.head' | translate}}</h2>
+      @for (item of itemRD?.payload?.page; track item) {
+        <div class="my-4">
+          <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode" class="pb-4">
+          </ds-listable-object-component-loader>
+        </div>
+      }
+      <button type="button" (click)="onLoadMore()" class="btn btn-primary search-button mt-4 float-start ng-tns-c290-40"> {{'vocabulary-treeview.load-more' | translate }} ...</button>
     </div>
   }
   @if (itemRD?.hasFailed) {
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 57695d588c9..5161cdd655e 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -80,7 +80,7 @@ <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
       <button type="submit" (click)="saveSettings()" class="btn btn-primary me-2">
         {{ 'info.accessibility-settings.submit' | translate }}
       </button>
-      <button (click)="resetSettings()" class="btn btn-warning">
+      <button type="button" (click)="resetSettings()" class="btn btn-warning">
         {{ 'info.accessibility-settings.reset' | translate }}
       </button>
     </div>
diff --git a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
index 3ba6d00fc2c..1740d7ae4f6 100644
--- a/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
+++ b/src/app/item-page/bitstreams/request-a-copy/bitstream-request-a-copy-page.component.html
@@ -101,6 +101,7 @@ <h1 class="mb-4">{{'bitstream-request-a-copy.header' | translate}}</h1>
         </a>
 
         <button
+          type="button"
           [dsBtnDisabled]="requestCopyForm.invalid"
           class="btn btn-default btn-primary"
         (click)="onSubmit()">{{'bitstream-request-a-copy.submit' | translate}}</button>
diff --git a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
index a0f25a9d3ce..3b7b837b7d3 100644
--- a/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
+++ b/src/app/item-page/bitstreams/upload/upload-bitstream.component.html
@@ -27,7 +27,7 @@ <h1>{{'item.bitstreams.upload.title' | translate}}</h1>
           ngDefaultControl>
         </ds-dso-input-suggestions>
         @if (!selectedBundleId && selectedBundleName?.length > 0) {
-          <button class="btn btn-success me-2" (click)="createBundle()">
+          <button  type="button" class="btn btn-success me-2" (click)="createBundle()">
             <i class="fa fa-plus"></i> {{ 'item.bitstreams.upload.bundle.new' | translate }}
           </button>
         }
@@ -40,7 +40,7 @@ <h1>{{'item.bitstreams.upload.title' | translate}}</h1>
             (onCompleteItem)="onCompleteItem($event)"
           (onUploadError)="onUploadError()"></ds-uploader>
         }
-        <button class="btn btn-outline-secondary" (click)="onCancel()">{{'item.bitstreams.upload.cancel' | translate}}</button>
+        <button  type="button" class="btn btn-outline-secondary" (click)="onCancel()">{{'item.bitstreams.upload.cancel' | translate}}</button>
       </div>
     </div>
   }
diff --git a/src/app/item-page/edit-item-page/edit-item-page.component.html b/src/app/item-page/edit-item-page/edit-item-page.component.html
index 0d3907c4313..f3ac01b6029 100644
--- a/src/app/item-page/edit-item-page/edit-item-page.component.html
+++ b/src/app/item-page/edit-item-page/edit-item-page.component.html
@@ -21,6 +21,7 @@ <h1 class="border-bottom">{{'item.edit.head' | translate}}</h1>
                 <span [ngbTooltip]="'item.edit.tabs.disabled.tooltip' | translate">
                   @if ((page.enabled | async) !== true) {
                     <button
+                      type="button"
                       class="nav-link disabled">
                       {{'item.edit.tabs.' + page.page + '.head' | translate}}
                     </button>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
index 15d713bdafc..274679a38ba 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.html
@@ -4,35 +4,35 @@
   </div>
 
   <div class="button-row top d-flex mt-2 space-children-mr">
-    <button class="me-auto btn btn-success"
+    <button type="button" class="me-auto btn btn-success"
       [attr.aria-label]="'item.edit.bitstreams.upload-button' | translate"
       [routerLink]="[itemPageRoute, 'bitstreams', 'new']"><i
     class="fas fa-upload"></i>
     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.upload-button" | translate}}</span>
   </button>
   @if (isReinstatable$ | async) {
-    <button class="btn btn-warning"
+    <button type="button" class="btn btn-warning"
       [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
       (click)="reinstate()"><i
     class="fas fa-undo-alt"></i>
     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
   </button>
-}
-<button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
-  [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
-  (click)="submit()"><i
-class="fas fa-save"></i>
-<span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
-</button>
-@if ((isReinstatable$ | async) !== true) {
-  <button class="btn btn-danger"
-    [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-    [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
-    (click)="discard()"><i
-  class="fas fa-times"></i>
-  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
-</button>
-}
+  }
+  <button type="button"class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+    [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
+    (click)="submit()"><i
+  class="fas fa-save"></i>
+  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
+  </button>
+  @if ((isReinstatable$ | async) !== true) {
+    <button type="button"class="btn btn-danger"
+      [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+      [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+      (click)="discard()"><i
+    class="fas fa-times"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
+  </button>
+  }
 </div>
 
 @if (item && bundles?.length > 0) {
@@ -48,7 +48,7 @@
     }
     @if (showLoadMoreLink$ | async) {
       <div class="d-flex justify-content-center">
-        <button class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
+        <button type="button" class="btn btn-link my-3" (click)="loadBundles()"> {{'item.edit.bitstreams.load-more.link' | translate}}</button>
       </div>
     }
   </div>
@@ -66,28 +66,28 @@
 <div class="button-row bottom">
   <div class="mt-4 float-end space-children-mr ms-gap">
     @if (isReinstatable$ | async) {
-      <button class="btn btn-warning"
+      <button type="button" class="btn btn-warning"
         [attr.aria-label]="'item.edit.bitstreams.reinstate-button' | translate"
         (click)="reinstate()"><i
       class="fas fa-undo-alt"></i>
       <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.reinstate-button" | translate}}</span>
     </button>
   }
-  <button class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+  <button type="button" class="btn btn-primary" [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
     [attr.aria-label]="'item.edit.bitstreams.save-button' | translate"
     (click)="submit()"><i
   class="fas fa-save"></i>
   <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.save-button" | translate}}</span>
-</button>
-@if ((isReinstatable$ | async) !== true) {
-  <button class="btn btn-danger"
-    [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
-    [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
-    (click)="discard()"><i
-  class="fas fa-times"></i>
-  <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
-</button>
-}
+  </button>
+  @if ((isReinstatable$ | async) !== true) {
+    <button type="button" class="btn btn-danger"
+      [attr.aria-label]="'item.edit.bitstreams.discard-button' | translate"
+      [dsBtnDisabled]="(hasChanges$ | async) !== true || submitting"
+      (click)="discard()"><i
+    class="fas fa-times"></i>
+    <span class="d-none d-sm-inline">&nbsp;{{"item.edit.bitstreams.discard-button" | translate}}</span>
+  </button>
+  }
 </div>
 </div>
 </div>
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
index 40a5286ffe4..7b5d73d8261 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-edit-bitstream-bundle/item-edit-bitstream-bundle.component.html
@@ -36,16 +36,16 @@
               </th>
               <td class="text-center row-element">
                 <div class="btn-group">
-                  <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
+                  <button type="button" [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
                     [queryParams]="{bundle: bundle.id}"
                     [attr.aria-label]="'item.edit.bitstreams.bundle.edit.buttons.upload' | translate"
                     class="btn btn-outline-success btn-sm"
                     title="{{'item.edit.bitstreams.bundle.edit.buttons.upload' | translate}}">
                     <i class="fas fa-upload fa-fw"></i>
                   </button>
-                  <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-end p-0"
-                       container="body" placement="bottom-right">
-                    <button class="btn btn-outline-secondary btn-sm" id="paginationControls" ngbDropdownToggle
+                  <div ngbDropdown #paginationControls="ngbDropdown" class="btn-group float-right btn-sm p-0"
+                    placement="bottom-right">
+                    <button type="button" class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
                       [title]="'pagination.options.description' | translate"
                       [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
                       aria-expanded="false">
@@ -60,7 +60,7 @@
                           @for (size of paginationOptions.pageSizeOptions; track size) {
                             <li role="option"
                               [attr.aria-selected]="size === (pageSize$ | async)">
-                              <button (click)="doPageSizeChange(size)" class="dropdown-item">
+                              <button type="button" (click)="doPageSizeChange(size)" class="dropdown-item">
                                 <i [ngClass]="{'invisible': size !== (pageSize$ | async) }" class="fas fa-check"
                                 aria-hidden="true"></i> {{size}}
                               </button>
@@ -104,18 +104,18 @@
                           [attr.data-test]="'download-button' | dsBrowserOnly">
                           <i class="fas fa-download fa-fw"></i>
                         </a>
-                        <button [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
+                        <button type="button" [routerLink]="['/bitstreams/', entry.id, 'edit']" class="btn btn-outline-primary btn-sm"
                           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.edit' | translate"
                           title="{{'item.edit.bitstreams.edit.buttons.edit' | translate}}">
                           <i class="fas fa-edit fa-fw"></i>
                         </button>
-                        <button [dsBtnDisabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
+                        <button type="button" [dsBtnDisabled]="!canRemove(update)" (click)="remove(entry.bitstream)"
                           [attr.aria-label]=" 'item. edit bitstreams.edit.buttons.remove' | translate"
                           class="btn btn-outline-danger btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.remove' | translate}}">
                           <i class="fas fa-trash-alt fa-fw"></i>
                         </button>
-                        <button [dsBtnDisabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
+                        <button type="button" [dsBtnDisabled]="!canUndo(update)" (click)="undo(entry.bitstream)"
                           [attr.aria-label]="'item.edit.bitstreams.edit.buttons.undo' | translate"
                           class="btn btn-outline-warning btn-sm"
                           title="{{'item.edit.bitstreams.edit.buttons.undo' | translate}}">
diff --git a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
index 7aeae2bb1f1..c891bada62d 100644
--- a/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
+++ b/src/app/item-page/edit-item-page/item-delete/item-delete.component.html
@@ -36,7 +36,7 @@ <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
                           }
                           <div class="ms-auto">
                             <div class="btn-group">
-                              <button class="btn btn-outline-info btn-sm"
+                              <button type="button" class="btn btn-outline-info btn-sm"
                                 (click)="openVirtualMetadataModal(virtualMetadataModal)">
                                 <i class="fas fa-info fa-fw"></i>
                               </button>
@@ -85,10 +85,10 @@ <h5 (click)="setSelected(typeDto.relationshipType, !selected)">
       </ng-container>
 
       <div class="space-children-mr">
-        <button [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
-          class="btn btn-danger perform-action">{{confirmMessage | translate}}
+        <button type="button" [dsBtnDisabled]="isDeleting$ | async" (click)="performAction()"
+          class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
         </button>
-        <button [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
+        <button type="button" [dsBtnDisabled]="isDeleting$ | async" [routerLink]="[itemPageRoute, 'edit']"
           class="btn btn-outline-secondary cancel">
           {{cancelMessage| translate}}
         </button>
diff --git a/src/app/item-page/edit-item-page/item-move/item-move.component.html b/src/app/item-page/edit-item-page/item-move/item-move.component.html
index e2cd2d88af0..918856adb33 100644
--- a/src/app/item-page/edit-item-page/item-move/item-move.component.html
+++ b/src/app/item-page/edit-item-page/item-move/item-move.component.html
@@ -37,10 +37,10 @@ <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle
 
       <div class="button-row bottom">
         <div class="float-end space-children-mr">
-          <button [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
+          <button type="button" [routerLink]="[(itemPageRoute$ | async), 'edit']" class="btn btn-outline-secondary">
             <i class="fas fa-arrow-left"></i> {{'item.edit.move.cancel' | translate}}
           </button>
-          <button class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
+          <button type="button" class="btn btn-primary" [dsBtnDisabled]="!canMove" (click)="moveToCollection()">
             @if (!processing) {
               <span>
                 <i class="fas fa-save"></i> {{'item.edit.move.save-button' | translate}}
@@ -52,7 +52,7 @@ <h1>{{'item.edit.move.head' | translate: {id: (itemRD$ | async)?.payload?.handle
               </span>
             }
           </button>
-          <button class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
+          <button type="button" class="btn btn-danger" [dsBtnDisabled]="!canSubmit" (click)="discard()">
             <i class="fas fa-times"></i> {{"item.edit.move.discard-button" | translate}}
           </button>
         </div>
diff --git a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
index f5a2c6159d1..9e87fd49d01 100644
--- a/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
+++ b/src/app/item-page/edit-item-page/item-operation/item-operation.component.html
@@ -6,14 +6,14 @@
 <div class="col-12 col-md-9 float-start action-button">
   @if (operation.authorized) {
     <span>
-      <button class="btn btn-outline-primary" [dsBtnDisabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+      <button type="button" class="btn btn-outline-primary" [dsBtnDisabled]="operation.disabled" [routerLink]="operation.operationUrl" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
       </button>
     </span>
   }
   @if (!operation.authorized) {
     <span [ngbTooltip]="'item.edit.tabs.status.buttons.unauthorized' | translate">
-      <button class="btn btn-outline-primary" [dsBtnDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
+      <button type="button" class="btn btn-outline-primary" [dsBtnDisabled]="true" [attr.aria-label]="'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate">
         {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.button' | translate}}
       </button>
     </span>
diff --git a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
index 2b08842e6d8..3e5c5273817 100644
--- a/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
+++ b/src/app/item-page/edit-item-page/item-register-doi/item-register-doi-component.html
@@ -16,9 +16,9 @@ <h2>{{headerMessage | translate: {id: item.handle} }}</h2>
       }
       <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
       <div class="space-children-mr">
-        <button (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
+        <button type="button" (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
         </button>
-        <button [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">
+        <button type="button" [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">
           {{cancelMessage| translate}}
         </button>
       </div>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
index 4f0de1a789d..014715e12e3 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship-list/edit-relationship-list.component.html
@@ -1,6 +1,6 @@
 <h2 class="h4">
   {{relationshipMessageKey$ | async | translate}}
-  <button class="ms-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
+  <button type="button" class="ms-2 btn btn-success" [dsBtnDisabled]="(hasChanges | async)" (click)="openLookup()">
     <i class="fas fa-plus"></i>
     <span class="d-none d-sm-inline">&nbsp;{{"item.edit.relationships.edit.buttons.add" | translate}}</span>
   </button>
diff --git a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
index 68539d8dc61..a5b8ac2f775 100644
--- a/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/edit-relationship/edit-relationship.component.html
@@ -10,12 +10,12 @@
     </div>
     <div class="col-2 position-relative">
       <div class="btn-group relationship-action-buttons">
-        <button [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
+        <button type="button" [dsBtnDisabled]="!canRemove()" (click)="openVirtualMetadataModal(virtualMetadataModal)"
           class="btn btn-outline-danger btn-sm"
           title="{{'item.edit.metadata.edit.buttons.remove' | translate}}">
           <i class="fas fa-trash-alt fa-fw"></i>
         </button>
-        <button [dsBtnDisabled]="!canUndo()" (click)="undo()"
+        <button type="button" [dsBtnDisabled]="!canUndo()" (click)="undo()"
           class="btn btn-outline-warning btn-sm"
           title="{{'item.edit.metadata.edit.buttons.undo' | translate}}">
           <i class="fas fa-undo-alt fa-fw"></i>
diff --git a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
index b62256e18ed..533f4b5ef40 100644
--- a/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
+++ b/src/app/item-page/edit-item-page/item-relationships/item-relationships.component.html
@@ -37,7 +37,7 @@
 <ng-template #buttons>
   <div class="d-flex space-children-mr justify-content-end">
     @if ((isReinstatable$ | async) !== true) {
-      <button class="btn btn-danger"
+      <button type="button" class="btn btn-danger"
         [dsBtnDisabled]="(hasChanges$ | async) !== true"
         (click)="discard()">
         <i aria-hidden="true" class="fas fa-times"></i>
@@ -45,12 +45,12 @@
       </button>
     }
     @if (isReinstatable$ | async) {
-      <button class="btn btn-warning" (click)="reinstate()">
+      <button type="button" class="btn btn-warning" (click)="reinstate()">
         <i aria-hidden="true" class="fas fa-undo-alt"></i>
         <span class="d-none d-sm-inline">&nbsp;{{ 'item.edit.metadata.reinstate-button' | translate }}</span>
       </button>
     }
-    <button class="btn btn-primary"
+    <button type="button" class="btn btn-primary"
       [dsBtnDisabled]="(hasChanges$ | async) !== true || (isSaving$ | async) === true"
       (click)="submit()">
       @if (isSaving$ | async) {
diff --git a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
index 67249b085ad..7934f73a6b5 100644
--- a/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
+++ b/src/app/item-page/edit-item-page/simple-item-action/abstract-simple-item-action.component.html
@@ -5,9 +5,9 @@ <h1>{{headerMessage | translate: {id: item.handle} }}</h1>
             <p>{{descriptionMessage | translate}}</p>
             <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
           <div class="space-children-mr">
-            <button (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
+            <button type="button" (click)="performAction()" class="btn btn-outline-secondary perform-action">{{confirmMessage | translate}}
             </button>
-            <button [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">
+            <button type="button" [routerLink]="[itemPageRoute, 'edit']" class="btn btn-outline-secondary cancel">
               {{cancelMessage| translate}}
             </button>
           </div>
diff --git a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
index e1fc018ace3..a978d25be6c 100644
--- a/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
+++ b/src/app/item-page/edit-item-page/virtual-metadata/virtual-metadata.component.html
@@ -30,7 +30,7 @@
       </div>
     }
     <div class="d-flex flex-row-reverse m-2">
-      <button class="btn btn-primary save"
+      <button type="button" class="btn btn-primary save"
         (click)="save.emit()">
         <i aria-hidden="true" class="fas fa-save"></i> {{ 'item.edit.metadata.save-button' | translate }}
       </button>
diff --git a/src/app/item-page/full/full-item-page.component.html b/src/app/item-page/full/full-item-page.component.html
index 43ecae9f170..e9a1a6d24ce 100644
--- a/src/app/item-page/full/full-item-page.component.html
+++ b/src/app/item-page/full/full-item-page.component.html
@@ -39,7 +39,7 @@
               @if (fromSubmissionObject) {
                 <div class="button-row bottom">
                   <div class="text-end">
-                    <button class="btn btn-outline-secondary me-1" (click)="back()"><i
+                    <button type="button" class="btn btn-outline-secondary me-1" (click)="back()"><i
                     class="fas fa-arrow-left"></i> {{'item.page.return' | translate}}</button>
                   </div>
                 </div>
diff --git a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
index d9ddcbf6d99..7c292d5afaa 100644
--- a/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
+++ b/src/app/item-page/media-viewer/media-viewer-video/media-viewer-video.component.html
@@ -19,6 +19,7 @@
 @if (medias?.length > 1) {
   <div class="buttons">
     <button
+      type="button"
       class="btn btn-primary previous"
       [dsBtnDisabled]="currentIndex === 0"
       (click)="prevMedia()"
@@ -26,6 +27,7 @@
       {{ "media-viewer.previous" | translate }}
     </button>
     <button
+      type="button"
       class="btn btn-primary next"
       [dsBtnDisabled]="currentIndex === medias.length - 1"
       (click)="nextMedia()"
@@ -34,6 +36,7 @@
     </button>
     <div ngbDropdown class="d-inline-block">
       <button
+        type="button"
         class="btn btn-outline-primary playlist"
         id="dropdownBasic1"
         ngbDropdownToggle
@@ -43,6 +46,7 @@
       <div ngbDropdownMenu aria-labelledby="dropdownBasic1">
         @for (item of medias; track item; let indexOfelement = $index) {
           <button
+            type="button"
             ngbDropdownItem
             class="list-element"
             (click)="selectedMedia(indexOfelement)"
diff --git a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
index 6695226d5c5..1cefb844291 100644
--- a/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
+++ b/src/app/item-page/orcid-page/orcid-auth/orcid-auth.component.html
@@ -88,7 +88,7 @@ <h1>{{'person.orcid.registry.auth' | translate}}</h1>
       </div>
       <div class="row">
         <div class="col">
-          <button class="btn btn-primary float-end" (click)="linkOrcid()">
+          <button type="button" class="btn btn-primary float-end" (click)="linkOrcid()">
             <i class="fas fa-link"></i>
             {{'person.page.orcid.link' | translate}}
           </button>
@@ -97,3 +97,103 @@ <h1>{{'person.orcid.registry.auth' | translate}}</h1>
     </div>
   }
 </div>
+
+<ng-template #orcidLinked>
+  <div data-test="orcidLinked">
+    <div class="row">
+      @if ((hasOrcidAuthorizations() | async)) {
+        <div class="col-sm-6 mb-3" data-test="hasOrcidAuthorizations">
+          <div class="card h-100">
+            <div class="card-header">{{ 'person.page.orcid.granted-authorizations'| translate }}</div>
+            <div class="card-body">
+              <div class="container p-0">
+                <ul>
+                  @for (auth of (getOrcidAuthorizations() | async); track auth) {
+                    <li data-test="orcidAuthorization">
+                      {{getAuthorizationDescription(auth) | translate}}
+                    </li>
+                  }
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      }
+      <div class="col-sm-6 mb-3">
+        <div class="card h-100">
+          <div class="card-header">{{ 'person.page.orcid.missing-authorizations'| translate }}</div>
+          <div class="card-body">
+            <div class="container">
+              @if ((hasMissingOrcidAuthorizations() | async) !== true) {
+                <ds-alert [type]="'alert-success'" data-test="noMissingOrcidAuthorizations">
+                  {{'person.page.orcid.no-missing-authorizations-message' | translate}}
+                </ds-alert>
+              }
+              @if ((hasMissingOrcidAuthorizations() | async)) {
+                <ds-alert [type]="'alert-warning'" data-test="missingOrcidAuthorizations">
+                  {{'person.page.orcid.missing-authorizations-message' | translate}}
+                  <ul>
+                    @for (auth of (getMissingOrcidAuthorizations() | async); track auth) {
+                      <li data-test="missingOrcidAuthorization">
+                        {{getAuthorizationDescription(auth) | translate }}
+                      </li>
+                    }
+                  </ul>
+                </ds-alert>
+              }
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    @if ((onlyAdminCanDisconnectProfileFromOrcid() | async) && (ownerCanDisconnectProfileFromOrcid() | async) !== true) {
+      <ds-alert
+        [type]="'alert-warning'" data-test="unlinkOnlyAdmin">
+        {{ 'person.page.orcid.remove-orcid-message' | translate}}
+      </ds-alert>
+    }
+    @if ((ownerCanDisconnectProfileFromOrcid() | async)) {
+      <div class="row" data-test="unlinkOwner">
+        <div class="col">
+          <button type="submit" class="btn btn-danger float-end" (click)="unlinkOrcid()"
+            [dsBtnDisabled]="(unlinkProcessing | async)">
+            @if ((unlinkProcessing | async) !== true) {
+              <span><i
+              class="fas fa-unlink"></i> {{ 'person.page.orcid.unlink' | translate }}</span>
+            }
+            @if ((unlinkProcessing | async)) {
+              <span><i
+              class='fas fa-circle-notch fa-spin'></i> {{'person.page.orcid.unlink.processing' | translate}}</span>
+            }
+          </button>
+          @if ((hasMissingOrcidAuthorizations() | async)) {
+            <button type="submit"
+              class="btn btn-primary float-end" (click)="linkOrcid()">
+              <span><i class="fas fa-check"></i> {{ 'person.page.orcid.grant-authorizations' | translate }}</span>
+            </button>
+          }
+        </div>
+      </div>
+    }
+  </div>
+</ng-template>
+
+<ng-template #orcidNotLinked>
+  <div data-test="orcidNotLinked">
+    <div class="row">
+      <div class="col-2"><img alt="orcid-logo" src="../../../../assets/images/orcid.logo.icon.svg"/></div>
+      <div class="col">
+        <ds-alert [type]="'alert-info'">{{ getOrcidNotLinkedMessage() | async }}</ds-alert>
+      </div>
+    </div>
+    <div class="row">
+      <div class="col">
+        <button type="button" class="btn btn-primary float-end" (click)="linkOrcid()">
+          <i class="fas fa-link"></i>
+          {{'person.page.orcid.link' | translate}}
+        </button>
+      </div>
+    </div>
+  </div>
+</ng-template>
+
diff --git a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
index b86ddb4461e..e537556d44d 100644
--- a/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
+++ b/src/app/item-page/orcid-page/orcid-queue/orcid-queue.component.html
@@ -37,12 +37,12 @@ <h2>{{ 'person.orcid.registry.queue' | translate }}</h2>
                   </td>
                   <td style="width: 20%" class="text-center">
                     <div class="btn-group edit-field">
-                      <button [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
+                      <button type="button" [ngbTooltip]="getOperationTooltip(entry) | translate" container="body"
                         class="btn btn-outline-primary my-1 col-md" (click)="send(entry)">
                         <span [ngClass]="getOperationClass(entry)"></span>
                         <span class="sr-only">{{ getOperationTooltip(entry) | translate }}</span>
                       </button>
-                      <button [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
+                      <button type="button" [ngbTooltip]="'person.page.orcid.sync-queue.discard' | translate" container="body"
                         class="btn btn-outline-danger my-1 col-md" (click)="discardEntry(entry)">
                         <span class="fas fa-unlink"></span>
                         <span class="sr-only">{{ 'person.page.orcid.sync-queue.discard' | translate }}</span>
diff --git a/src/app/item-page/simple/field-components/file-section/file-section.component.html b/src/app/item-page/simple/field-components/file-section/file-section.component.html
index 79440ac6551..6924a241bb8 100644
--- a/src/app/item-page/simple/field-components/file-section/file-section.component.html
+++ b/src/app/item-page/simple/field-components/file-section/file-section.component.html
@@ -21,12 +21,12 @@
         }
         @if (!isLastPage) {
           <div class="mt-1" id="view-more">
-            <button class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</button>
+            <button type="button" class="bitstream-view-more btn btn-outline-secondary btn-sm" (click)="getNextPage()">{{'item.page.bitstreams.view-more' | translate}}</button>
           </div>
         }
         @if (isLastPage && currentPage !== 1) {
           <div class="mt-1" id="collapse">
-            <button class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</button>
+            <button type="button" class="bitstream-collapse btn btn-outline-secondary btn-sm" (click)="currentPage = undefined; getNextPage();">{{'item.page.bitstreams.collapse' | translate}}</button>
           </div>
         }
       </div>
diff --git a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
index 058dd96952b..982a6f9ca7a 100644
--- a/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
+++ b/src/app/item-page/simple/metadata-representation-list/metadata-representation-list.component.html
@@ -13,13 +13,13 @@
         <div class="d-inline-block w-100 mt-2">
           @if ((objects.length * incrementBy) < total) {
             <div class="float-start">
-              <button class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
+              <button type="button" class="btn btn-link btn-link-inline" (click)="increase()">{{'item.page.related-items.view-more' |
               translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</button>
             </div>
           }
           @if (objects.length > 1) {
             <div class="float-end">
-              <button class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
+              <button type="button" class="btn btn-link btn-link-inline" (click)="decrease()">{{'item.page.related-items.view-less' |
               translate:{ amount: representations?.length } }}</button>
             </div>
           }
diff --git a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
index afdb53b81d9..38457b80ef5 100644
--- a/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
+++ b/src/app/item-page/simple/qa-event-notification/qa-event-notification.component.html
@@ -12,7 +12,7 @@
             <div class="ps-4 align-self-center">
               {{'item.qa-event-notification.check.notification-info' | translate : {num: source.totalEvents } }}
             </div>
-            <button [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
+            <button type="button" [routerLink]="[ getQualityAssuranceRoute(), (source.id | dsSplit: ':')[0], 'target', item.id]"
               [queryParams]="{ forward: true }"
               class="btn btn-primary align-self-center">
             {{'item.qa-event-notification-info.check.button' | translate}}
diff --git a/src/app/item-page/simple/related-items/related-items.component.html b/src/app/item-page/simple/related-items/related-items.component.html
index 2bfe384bb40..0b7a94a07b1 100644
--- a/src/app/item-page/simple/related-items/related-items.component.html
+++ b/src/app/item-page/simple/related-items/related-items.component.html
@@ -13,13 +13,13 @@
         <div class="d-inline-block w-100 mt-2">
           @if (itemsRD?.payload?.totalPages > objects.length) {
             <div class="float-start" id="view-more">
-              <button class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
+              <button type="button" class="btn btn-link btn-link-inline text-capitalize" (click)="increase()">{{'item.page.related-items.view-more' |
               translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }} {{label}}</button>
             </div>
           }
           @if (objects.length > 1) {
             <div class="float-end" id="view-less">
-              <button class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
+              <button type="button" class="btn btn-link btn-link-inline text-capitalize" (click)="decrease()">{{'item.page.related-items.view-less' |
               translate:{ amount: itemsRD?.payload?.page?.length } }} {{label}}</button>
             </div>
           }
diff --git a/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
index b65883775b9..25b934e826a 100644
--- a/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
+++ b/src/app/item-page/versions/item-versions-delete-modal/item-versions-delete-modal.component.html
@@ -7,12 +7,12 @@
     <p class="pb-2">{{ "item.version.delete.modal.text" | translate : {version: versionNumber} }}</p>
   </div>
   <div class="modal-footer">
-    <button class="btn btn-outline-secondary btn-sm cancel"
+    <button type="button" class="btn btn-outline-secondary btn-sm cancel"
             (click)="onModalClose()"
             title="{{'item.version.delete.modal.button.cancel.tooltip' | translate}}">
       <i class="fas fa-times fa-fw"></i> {{'item.version.delete.modal.button.cancel' | translate}}
     </button>
-    <button class="btn btn-danger btn-sm confirm"
+    <button type="button" class="btn btn-danger btn-sm confirm"
             (click)="onModalSubmit()"
             title="{{'item.version.delete.modal.button.confirm.tooltip' | translate}}">
       <i class="fas fa-check fa-fw"></i> {{'item.version.delete.modal.button.confirm' | translate}}
diff --git a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
index 0608ee93cc8..c9d3bb4cc15 100644
--- a/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
+++ b/src/app/item-page/versions/item-versions-row-element-version/item-versions-row-element-version.component.html
@@ -28,7 +28,7 @@
     <div class="btn-group edit-field space-children-mr">
       <!--EDIT WORKSPACE ITEM-->
       @if (workspaceId$ | async) {
-        <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+        <button type="button" class="btn btn-outline-primary btn-sm version-row-element-edit"
           (click)="editWorkspaceItem(workspaceId$)"
           title="{{'item.version.history.table.action.editWorkspaceItem' | translate }}">
           <i class="fas fa-pencil-alt fa-fw"></i>
@@ -36,7 +36,7 @@
       }
       <!--CREATE-->
       @if (canCreateVersion$ | async) {
-        <button class="btn btn-outline-primary btn-sm version-row-element-create"
+        <button type="button" class="btn btn-outline-primary btn-sm version-row-element-create"
           [dsBtnDisabled]="isAnyBeingEdited() || hasDraftVersion"
           (click)="createNewVersion(version)"
           title="{{createVersionTitle | translate }}">
@@ -45,7 +45,7 @@
       }
       <!--DELETE-->
       @if (canDeleteVersion$ | async) {
-        <button class="btn btn-sm version-row-element-delete"
+        <button type="button" class="btn btn-sm version-row-element-delete"
           [ngClass]="isAnyBeingEdited() ? 'btn-outline-primary' : 'btn-outline-danger'"
           [dsBtnDisabled]="isAnyBeingEdited()"
           (click)="deleteVersion(version, version.id === itemVersion.id)"
diff --git a/src/app/item-page/versions/item-versions.component.html b/src/app/item-page/versions/item-versions.component.html
index 8df582fd1a8..bf604907bcf 100644
--- a/src/app/item-page/versions/item-versions.component.html
+++ b/src/app/item-page/versions/item-versions.component.html
@@ -68,20 +68,20 @@ <h2 class="h4">{{"item.version.history.head" | translate}}</h2>
                             <div class="float-end btn-group edit-field space-children-mr">
                               @if (isThisBeingEdited(versionDTO.version)) {
                                 <!--DISCARD EDIT-->
-                                <button class="btn btn-sm btn-outline-warning"
+                                <button type="button" class="btn btn-sm btn-outline-warning"
                                   (click)="disableVersionEditing()"
                                   title="{{'item.version.history.table.action.discardSummary' | translate}}">
                                   <i class="fas fa-undo-alt fa-fw"></i>
                                 </button>
                                 <!--SAVE-->
-                                <button class="btn btn-outline-success btn-sm"
+                                <button type="button" class="btn btn-outline-success btn-sm"
                                   (click)="onSummarySubmit()"
                                   title="{{'item.version.history.table.action.saveSummary' | translate}}">
                                   <i class="fas fa-check fa-fw"></i>
                                 </button>
                               } @else {
                                 <!--EDIT-->
-                                <button class="btn btn-outline-primary btn-sm version-row-element-edit"
+                                <button type="button" class="btn btn-outline-primary btn-sm version-row-element-edit"
                                   [dsBtnDisabled]="isAnyBeingEdited()"
                                   (click)="enableVersionEditing(versionDTO.version)"
                                   title="{{'item.version.history.table.action.editSummary' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
index 39565e6cdd8..5e20fec8feb 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-external-dropdown/my-dspace-new-external-dropdown.component.html
@@ -1,6 +1,6 @@
 @if ((moreThanOne$ | async) !== true) {
   <div class="add">
-    <button class="btn btn-lg btn-outline-primary mt-1 ms-2"
+    <button type="button" class="btn btn-lg btn-outline-primary mt-1 ms-2"
       [attr.aria-label]="'mydspace.new-submission-external' | translate" [dsBtnDisabled]="(initialized$ | async) !== true"
       (click)="openPage(singleEntity)" role="button"
       title="{{'mydspace.new-submission-external' | translate}}">
diff --git a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
index 0e167475bf4..37a42b35352 100644
--- a/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
+++ b/src/app/my-dspace-page/my-dspace-new-submission/my-dspace-new-submission-dropdown/my-dspace-new-submission-dropdown.component.html
@@ -1,6 +1,6 @@
 @if ((moreThanOne$ | async) !== true) {
   <div class="add">
-    <button class="btn btn-lg btn-primary mt-1 ms-2" [attr.aria-label]="'mydspace.new-submission' | translate"
+    <button type="button" class="btn btn-lg btn-primary mt-1 ms-2" [attr.aria-label]="'mydspace.new-submission' | translate"
       [dsBtnDisabled]="(initialized$ | async) !== true" (click)="openDialog(singleEntity)" role="button">
       <i class="fa fa-plus-circle" aria-hidden="true"></i>
     </button>
diff --git a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
index f2deb49c9fb..8dc6cb76c37 100644
--- a/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
+++ b/src/app/my-dspace-page/my-dspace-qa-events-notifications/my-dspace-qa-events-notifications.component.html
@@ -1,3 +1,4 @@
+
 @if ((sources$ | async)?.length > 0) {
   @for (source of sources$ | async; track source) {
     @if (source.totalEvents > 0) {
@@ -17,6 +18,7 @@
             {{ "mydspace.qa-event-notification.check.notification-info" | translate : { num: source.totalEvents } }}
           </div>
           <button
+            type="button"
             [routerLink]="[getQualityAssuranceRoute(), source.id]"
             [queryParams]="{ forward: true }"
             class="btn btn-primary align-self-center"
diff --git a/src/app/notifications/qa/events/quality-assurance-events.component.html b/src/app/notifications/qa/events/quality-assurance-events.component.html
index 7faca0876c7..5c7224d1c0c 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -121,7 +121,7 @@ <h2 class="border-bottom pb-2">
                             <span class="small">{{'quality-assurance.event.table.abstract' | translate}}</span><br>
                             <span class="text-ellipsis">{{eventElement.event.message.abstract}}</span>
                           </p>
-                          <button class="btn btn-outline-primary btn-sm" (click)="showMore = !showMore">
+                          <button type="button" class="btn btn-outline-primary btn-sm" (click)="showMore = !showMore">
                             @if (!showMore) {
                               <i class="fas fa-angle-down"></i>
                             }
@@ -187,6 +187,7 @@ <h2 class="border-bottom pb-2">
                               <div class="btn-group">
                                 @if (!eventElement.hasProject) {
                                   <button
+                                    type="button"
                                     class="btn btn-outline-primary btn-sm"
                                     [dsBtnDisabled]="eventElement.isRunning"
                                     (click)="openModalLookup(eventElement); $event.stopPropagation();"
@@ -197,6 +198,7 @@ <h2 class="border-bottom pb-2">
                                 }
                                 @if (eventElement.hasProject) {
                                   <button
+                                    type="button"
                                     class="btn btn-outline-danger btn-sm"
                                     [dsBtnDisabled]="eventElement.isRunning"
                                     (click)="removeProject(eventElement)"
@@ -214,6 +216,7 @@ <h2 class="border-bottom pb-2">
                             <div class="btn-group button-width">
                               @if (showTopic.indexOf('/PROJECT') !== -1) {
                                 <button
+                                  type="button"
                                   class="btn btn-outline-success btn-sm button-width"
                                   ngbTooltip="{{'quality-assurance.event.action.import' | translate}}"
                                   container="body"
@@ -226,6 +229,7 @@ <h2 class="border-bottom pb-2">
                               }
                               @if (showTopic.indexOf('/PROJECT') === -1) {
                                 <button
+                                  type="button"
                                   class="btn btn-outline-success btn-sm button-width"
                                   ngbTooltip="{{'quality-assurance.event.action.accept' | translate}}"
                                   container="body"
@@ -236,7 +240,7 @@ <h2 class="border-bottom pb-2">
                                   <i class="fas fa-check"></i>
                                 </button>
                               }
-                              <button class="btn btn-outline-dark btn-sm button-width"
+                              <button type="button" class="btn btn-outline-dark btn-sm button-width"
                                 ngbTooltip="{{'quality-assurance.event.action.ignore' | translate}}"
                                 container="body"
                                 [dsBtnDisabled]="eventElement.isRunning"
@@ -246,7 +250,7 @@ <h2 class="border-bottom pb-2">
                                 <i class="fas fa-ban"></i>
                               </button>
                               @if ((isAdmin$ | async)) {
-                                <button class="btn btn-outline-danger btn-sm button-width"
+                                <button type="button" class="btn btn-outline-danger btn-sm button-width"
                                   ngbTooltip="{{'quality-assurance.event.action.reject' | translate}}"
                                   container="body"
                                   [dsBtnDisabled]="eventElement.isRunning"
@@ -257,7 +261,7 @@ <h2 class="border-bottom pb-2">
                                 </button>
                               }
                               @if ((isAdmin$ | async) === false) {
-                                <button class="btn btn-outline-danger btn-sm button-width"
+                                <button type="button" class="btn btn-outline-danger btn-sm button-width"
                                   ngbTooltip="{{'quality-assurance.event.action.undo' | translate }}"
                                   container="body"
                                   [dsBtnDisabled]="eventElement.isRunning"
@@ -270,7 +274,7 @@ <h2 class="border-bottom pb-2">
                           }
                           @if ((isAdmin$ | async) !== true && isReinstateWithdrawnRequest) {
                             <div class="btn-group button-width">
-                              <button class="btn btn-outline-danger btn-sm button-width"
+                              <button type="button" class="btn btn-outline-danger btn-sm button-width"
                                 ngbTooltip="{{'quality-assurance.event.action.undo' | translate}}"
                                 container="body"
                                 [dsBtnDisabled]="eventElement.isRunning"
@@ -301,11 +305,11 @@ <h4 class="modal-title" id="acceptModal">{{'quality-assurance.event.sure' | tran
   <div class="modal-body">
     <p>{{'quality-assurance.event.accept.description' | translate}}</p>
 
-    <button class="btn btn-outline-success float-end" (click)="modal.close('do')">
+    <button type="button" class="btn btn-outline-success float-right" (click)="modal.close('do')">
       <i class="fas fa-check"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.import' | translate}}</span>
     </button>
-    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+    <button type="button" class="btn btn-outline-secondary" (click)="modal.close('cancel')">
       <i class="fas fa-close"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
     </button>
@@ -318,11 +322,11 @@ <h1 class="modal-title h4" id="ignoreModal">{{'quality-assurance.event.sure' | t
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.ignore.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-end" (click)="modal.close('do')">
+    <button type="button" class="btn btn-outline-danger float-right" (click)="modal.close('do')">
       <i class="fas fa-trash-alt"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.ignore' | translate}}</span>
     </button>
-    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+    <button type="button" class="btn btn-outline-secondary" (click)="modal.close('cancel')">
       <i class="fas fa-close"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
     </button>
@@ -335,11 +339,11 @@ <h1 class="modal-title h4" id="rejectModal">{{'quality-assurance.event.sure' | t
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.reject.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-end" (click)="modal.close('do')">
+    <button type="button" class="btn btn-outline-danger float-right" (click)="modal.close('do')">
       <i class="fas fa-trash-alt"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.reject' | translate}}</span>
     </button>
-    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+    <button type="button" class="btn btn-outline-secondary" (click)="modal.close('cancel')">
       <i class="fas fa-close"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
     </button>
@@ -352,11 +356,11 @@ <h1 class="modal-title h4" id="undoModal">{{'quality-assurance.event.sure' | tra
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.undo.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-end" (click)="modal.close('do')">
+    <button type="button" class="btn btn-outline-danger float-right" (click)="modal.close('do')">
       <i class="fas fa-trash-alt"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.undo' | translate}}</span>
     </button>
-    <button class="btn btn-outline-secondary" (click)="modal.close('cancel')">
+    <button type="button" class="btn btn-outline-secondary" (click)="modal.close('cancel')">
       <i class="fas fa-close"></i>
       <span class="d-none d-sm-inline"> {{'quality-assurance.event.action.cancel' | translate}}</span>
     </button>
diff --git a/src/app/notifications/qa/topics/quality-assurance-topics.component.html b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
index 84c91d21501..aa93eb9d0c0 100644
--- a/src/app/notifications/qa/topics/quality-assurance-topics.component.html
+++ b/src/app/notifications/qa/topics/quality-assurance-topics.component.html
@@ -54,6 +54,7 @@ <h2 class="border-bottom pb-2">{{'quality-assurance.topics'| translate}}</h2>
                         <td>
                           <div class="btn-group edit-field">
                             <button
+                              type="button"
                               class="btn btn-outline-primary btn-sm"
                               title="{{'quality-assurance.topics-list.button.detail' | translate : { param: topicElement.name } }}"
                               [routerLink]="[getQualityAssuranceRoute(), sourceId, topicElement.id]">
diff --git a/src/app/notifications/shared/source-list.component.html b/src/app/notifications/shared/source-list.component.html
index 5759ec5f1e7..e62fead5910 100644
--- a/src/app/notifications/shared/source-list.component.html
+++ b/src/app/notifications/shared/source-list.component.html
@@ -37,6 +37,7 @@ <h2 class="h4 border-bottom pb-2">{{'quality-assurance.source'| translate}}</h2>
                   <td>
                     <div class="btn-group edit-field">
                       <button
+                        type="button"
                         class="btn btn-outline-primary btn-sm"
                         title="{{'quality-assurance.source-list.button.detail' | translate : { param: sourceElement.id } }}"
                         (click)="sourceSelected.emit(sourceElement.id)">
diff --git a/src/app/notifications/suggestions/actions/suggestion-actions.component.html b/src/app/notifications/suggestions/actions/suggestion-actions.component.html
index 96a0eb82e59..c2fa3817b2f 100644
--- a/src/app/notifications/suggestions/actions/suggestion-actions.component.html
+++ b/src/app/notifications/suggestions/actions/suggestion-actions.component.html
@@ -19,10 +19,10 @@
     }
 
   </div>
-  <button (click)="ignoreSuggestion()" class="btn btn-danger ms-2"><i class="fa fa-ban"></i>
+  <button type="button" (click)="ignoreSuggestion()" class="btn btn-danger ms-2"><i class="fa fa-ban"></i>
 {{ ignoreSuggestionLabel() | translate}}</button>
 @if (!isBulk) {
-  <button (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ms-2">
+  <button type="button" (click)="toggleSeeEvidences()" [dsBtnDisabled]="!hasEvidence" class="btn btn-info ms-2">
     <i class="fa fa-eye"></i>
     @if (!seeEvidence) {
       {{ 'suggestion.seeEvidence' | translate}}
diff --git a/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.html b/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.html
index 25c1268dc5b..4e73bb8908b 100644
--- a/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.html
+++ b/src/app/notifications/suggestions/targets/publication-claim/publication-claim.component.html
@@ -39,7 +39,7 @@ <h1 id="header" class="border-bottom pb-2">{{'suggestion.title'| translate}}</h1
                         </td>
                         <td>
                           <div class="btn-group edit-field">
-                            <button (click)="redirectToSuggestions(targetElement.id)"
+                            <button type="button" (click)="redirectToSuggestions(targetElement.id)"
                               class="btn btn-outline-primary btn-sm"
                               title="{{('suggestion.button.review.title' | translate: { total: targetElement.total.toString() }) +
                                 targetElement.display}}">
diff --git a/src/app/process-page/detail/process-detail.component.html b/src/app/process-page/detail/process-detail.component.html
index 68a5877d0a4..763a4182e47 100644
--- a/src/app/process-page/detail/process-detail.component.html
+++ b/src/app/process-page/detail/process-detail.component.html
@@ -60,6 +60,7 @@ <h1 class="flex-grow-1">
       <ds-process-detail-field id="process-output" [title]="'process.detail.output'">
         @if (!showOutputLogs && process?._links?.output?.href !== undefined) {
           <button id="showOutputButton"
+            type="button"
             class="btn btn-primary" (click)="showProcessOutputLogs()">
             {{ 'process.detail.logs.button' | translate }}
           </button>
@@ -81,10 +82,10 @@ <h1 class="flex-grow-1">
       </ds-process-detail-field>
     }
     <ds-process-detail-field id="process-actions" [title]="'process.detail.actions'">
-      <button class="btn btn-success me-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
+      <button type="button" class="btn btn-success me-2" routerLink="/processes/new" [queryParams]="{id: process?.processId}"><i
       class="fas fa-plus pe-2"></i>{{'process.detail.create' | translate}}</button>
       @if (isProcessFinished(process)) {
-        <button id="delete" class="btn btn-danger"
+        <button type="button" id="delete" class="btn btn-danger"
           (click)="openDeleteModal(deleteModal)">
           <i class="fas fa-trash pe-2"></i>{{ 'process.detail.delete.button' | translate }}
         </button>
@@ -112,8 +113,8 @@ <h4>{{'process.detail.delete.header' | translate }}</h4>
       <div class="modal-body">
         <div>{{'process.detail.delete.body' | translate }}</div>
         <div class="mt-4">
-          <button class="btn btn-primary me-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
-          <button id="delete-confirm" class="btn btn-danger"
+          <button type="button" class="btn btn-primary me-2" (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
+          <button type="button" id="delete-confirm" class="btn btn-danger"
             (click)="deleteProcess(process)">{{ 'process.detail.delete.confirm' | translate }}
           </button>
         </div>
diff --git a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
index 1d82530f38f..9b39eace8fc 100644
--- a/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-select/parameter-select.component.html
@@ -14,7 +14,7 @@
   </select>
   <ds-parameter-value-input [initialValue]="parameterValue.value" [parameter]="selectedScriptParameter" (updateValue)="selectedParameterValue = $event" class="d-block col px-0" [index]="index"></ds-parameter-value-input>
   @if (removable) {
-    <button [attr.aria-label]="'process.new.delete-parameter' | translate"
+    <button type="button" [attr.aria-label]="'process.new.delete-parameter' | translate"
       (click)="removeParameter.emit(parameterValue);" class="btn btn-danger col-1 remove-button">
       <i class="fas fa-trash"></i>
     </button>
diff --git a/src/app/process-page/form/scripts-select/scripts-select.component.html b/src/app/process-page/form/scripts-select/scripts-select.component.html
index 88ca77b07ff..53ac9f3fc5f 100644
--- a/src/app/process-page/form/scripts-select/scripts-select.component.html
+++ b/src/app/process-page/form/scripts-select/scripts-select.component.html
@@ -29,7 +29,7 @@
           </button>
         }
         @if ((isLoading$ | async)) {
-          <button class="dropdown-item disabled" role="menuitem">
+          <button class="dropdown-item disabled" role="menuitem" type="button">
             <ds-loading message="{{'loading.default' | translate}}">
             </ds-loading>
           </button>
diff --git a/src/app/process-page/overview/process-overview.component.html b/src/app/process-page/overview/process-overview.component.html
index 76f21983b04..889e90f1493 100644
--- a/src/app/process-page/overview/process-overview.component.html
+++ b/src/app/process-page/overview/process-overview.component.html
@@ -31,18 +31,18 @@ <h1 class="flex-grow-1">{{'process.overview.title' | translate}}</h1>
 <ng-template #buttons>
   <div class="d-flex justify-content-end mb-2">
     @if (processBulkDeleteService.hasSelected()) {
-      <button class="btn btn-primary me-2"
+      <button type="button" class="btn btn-primary me-2"
         (click)="processBulkDeleteService.clearAllProcesses()"><i
       class="fas fa-undo pe-2"></i>{{'process.overview.delete.clear' | translate }}
     </button>
   }
   @if (processBulkDeleteService.hasSelected()) {
-    <button class="btn btn-danger me-2"
+    <button type="button" class="btn btn-danger me-2"
       (click)="openDeleteModal(deleteModal)"><i
     class="fas fa-trash pe-2"></i>{{'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}
   </button>
 }
-<button class="btn btn-success" routerLink="/processes/new"><i
+<button type="button" class="btn btn-success" routerLink="/processes/new"><i
 class="fas fa-plus pe-2"></i>{{'process.overview.new' | translate}}</button>
 </div>
 </ng-template>
@@ -72,10 +72,10 @@ <h4>{{'process.overview.delete.header' | translate }}</h4>
         <div>{{'process.overview.delete.body' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()} }}</div>
       }
       <div class="mt-4">
-        <button class="btn btn-primary me-2" [dsBtnDisabled]="isProcessing"
+        <button type="button" class="btn btn-primary me-2" [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
         (click)="closeModal()">{{'process.detail.delete.cancel' | translate}}</button>
-        <button id="delete-confirm" class="btn btn-danger"
-          [dsBtnDisabled]="isProcessing"
+        <button type="button" id="delete-confirm" class="btn btn-danger"
+          [dsBtnDisabled]="processBulkDeleteService.isProcessing$() |async"
           (click)="deleteSelected()">{{ 'process.overview.delete' | translate: {count: processBulkDeleteService.getAmountOfSelectedProcesses()}  }}
         </button>
       </div>
diff --git a/src/app/process-page/overview/table/process-overview-table.component.html b/src/app/process-page/overview/table/process-overview-table.component.html
index a9aa922977a..cdd8cfa7dc4 100644
--- a/src/app/process-page/overview/table/process-overview-table.component.html
+++ b/src/app/process-page/overview/table/process-overview-table.component.html
@@ -47,7 +47,7 @@ <h2 class="flex-grow-1">
                     <td>{{tableEntry.user}}</td>
                     <td>{{tableEntry.info}}</td>
                     <td>
-                      <button [attr.aria-label]="'process.overview.delete-process' | translate"
+                      <button type="button" [attr.aria-label]="'process.overview.delete-process' | translate"
                         (click)="processBulkDeleteService.toggleDelete(tableEntry.process.processId)"
                         class="btn btn-outline-danger">
                         <i class="fas fa-trash"></i>
diff --git a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
index 42a5267909f..21a59781074 100644
--- a/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
+++ b/src/app/profile-page/profile-claim-item-modal/profile-claim-item-modal.component.html
@@ -11,7 +11,7 @@
   <div class="scrollable-menu list-group container">
     @for (listEntry of (listEntries$ | async)?.payload.page; track listEntry) {
       <div class="row">
-        <button class="list-group-item list-group-item-action border-0 list-entry"
+        <button type="button" class="list-group-item list-group-item-action border-0 list-entry"
           title="{{ dsoNameService.getName(listEntry.indexableObject) }}"
           (click)="selectItem(listEntry.indexableObject)" #listEntryElement>
           <ds-listable-object-component-loader [object]="listEntry" [viewMode]="viewMode"
diff --git a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
index a1fa85a4bc1..e49ed7cf182 100644
--- a/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
+++ b/src/app/profile-page/profile-page-researcher-form/profile-page-researcher-form.component.html
@@ -17,9 +17,8 @@
     </div>
   }
   @if (!researcherProfile) {
-    @let processingCreate = (processingCreate$ | async);
-    <button class="btn btn-primary me-2"
-      [dsBtnDisabled]="processingCreate"
+    <button type="button" class="btn btn-primary me-2"
+      [dsBtnDisabled]="(isProcessingCreate() | async)"
       (click)="createProfile()">
       @if (processingCreate) {
         <span>
@@ -33,11 +32,11 @@
     </button>
   }
   @if (researcherProfile) {
-    <button class="btn btn-primary me-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
+    <button type="button" class="btn btn-primary me-2" [dsBtnDisabled]="!researcherProfile" (click)="viewProfile(researcherProfile)">
       <i class="fas fa-info-circle"></i> {{'researcher.profile.view' | translate}}
     </button>
-    <button class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
-      @if ((processingDelete$ | async)) {
+    <button type="button" class="btn btn-danger" [dsBtnDisabled]="!researcherProfile" (click)="deleteProfile(researcherProfile)">
+      @if ((isProcessingDelete() | async)) {
         <span>
           <i class='fas fa-circle-notch fa-spin'></i> {{'researcher.profile.action.processing' | translate}}
         </span>
diff --git a/src/app/profile-page/profile-page.component.html b/src/app/profile-page/profile-page.component.html
index 5d21b1578ab..abc5397237d 100644
--- a/src/app/profile-page/profile-page.component.html
+++ b/src/app/profile-page/profile-page.component.html
@@ -33,7 +33,7 @@ <h1>{{'profile.title' | translate}}</h1>
         </div>
       }
       <div class="col-12 text-end pe-0">
-        <button class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
+        <button type="button" class="btn btn-primary" (click)="updateProfile()"><i class="fas fa-edit"></i> {{'profile.form.submit' | translate}}</button>
       </div>
 
       <div class="card mb-4">
diff --git a/src/app/register-email-form/register-email-form.component.html b/src/app/register-email-form/register-email-form.component.html
index c333771e0ee..63d01959179 100644
--- a/src/app/register-email-form/register-email-form.component.html
+++ b/src/app/register-email-form/register-email-form.component.html
@@ -62,12 +62,12 @@ <h1>{{MESSAGE_PREFIX + '.header'|translate}}</h1>
       </div>
     }
 
-    @if ((!registrationVerification  || ((captchaVersion$ | async) !== 'v2' && (captchaMode$ | async) === 'invisible'))) {
-      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
+    @if ((!registrationVerification  || ((googleRecaptchaService.captchaVersion() | async) !== 'v2' && (googleRecaptchaService.captchaMode() | async) === 'invisible'))) {
+      <button type="submit" class="btn btn-primary" [dsBtnDisabled]="form.invalid || registrationVerification && !isRecaptchaCookieAccepted() || disableUntilChecked" (click)="register()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     } @else {
-      <button class="btn btn-primary" [dsBtnDisabled]="form.invalid" (click)="executeRecaptcha()">
+      <button type="submit" class="btn btn-primary" [dsBtnDisabled]="form.invalid" (click)="executeRecaptcha()">
         {{ MESSAGE_PREFIX + '.submit' | translate }}
       </button>
     }
diff --git a/src/app/register-page/create-profile/create-profile.component.html b/src/app/register-page/create-profile/create-profile.component.html
index 987863ef270..44d838f9994 100644
--- a/src/app/register-page/create-profile/create-profile.component.html
+++ b/src/app/register-page/create-profile/create-profile.component.html
@@ -85,6 +85,7 @@ <h3 class="mb-4">{{'register-page.create-profile.header' | translate}}</h3>
       <div class="row">
         <div class="col-12">
           <button
+            type="submit"
             [dsBtnDisabled]="isInValidPassword || userInfoForm.invalid"
             class="btn btn-default btn-primary"
           (click)="submitEperson()">{{'register-page.create-profile.submit' | translate}}</button>
diff --git a/src/app/request-copy/email-request-copy/email-request-copy.component.html b/src/app/request-copy/email-request-copy/email-request-copy.component.html
index 0b009b8d2b3..a6ebc4c391e 100644
--- a/src/app/request-copy/email-request-copy/email-request-copy.component.html
+++ b/src/app/request-copy/email-request-copy/email-request-copy.component.html
@@ -21,6 +21,7 @@
       <div ngbDropdown class="d-block">
         <!-- Show current selected access period (defaults to first in array) -->
         <button
+          type="button"
           class="btn btn-outline-primary playlist"
           id="accessPeriod"
           ngbDropdownToggle
@@ -30,6 +31,7 @@
         <div ngbDropdownMenu aria-labelledby="accessPeriod" class="dropdown-menu">
           @for (accessPeriod of (validAccessPeriods$ | async); track accessPeriod) {
             <button
+              type="button"
               ngbDropdownItem
               class="list-element"
               (click)="selectAccessPeriod(accessPeriod)"
@@ -44,12 +46,14 @@
   <ng-content></ng-content>
   <div class="d-flex flex-row-reverse">
     <button (click)="submit()"
+            type="submit"
             [dsBtnDisabled]="!subject || subject.length === 0"
             class="btn btn-primary"
             title="{{'grant-deny-request-copy.email.send' | translate }}">
       <i class="fas fa-envelope"></i> {{ 'grant-deny-request-copy.email.send' | translate }}
     </button>
-    <button (click)="return()"
+    <button type="button"
+            (click)="return()"
             class="btn btn-outline-secondary me-1"
             title="{{'grant-deny-request-copy.email.back' | translate }}">
       <i class="fas fa-arrow-left"></i> {{ 'grant-deny-request-copy.email.back' | translate }}
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index 91cb236abed..b8125a288fe 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -1,4 +1,4 @@
-<button (click)="skipToMainContent()" class="sr-only" id="skip-to-main-content">
+<button type="button" (click)="skipToMainContent()" class="sr-only" id="skip-to-main-content">
   {{ 'root.skip-to-content' | translate }}
 </button>
 
diff --git a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
index 5f5a89db4db..9696601c15c 100644
--- a/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
+++ b/src/app/shared/auth-nav-menu/auth-nav-menu.component.html
@@ -7,7 +7,7 @@
         class="nav-item"
         (click)="$event.stopPropagation();">
         <div ngbDropdown #loginDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
-          <button class="dropdownLogin btn btn-link px-0" [attr.aria-label]="'nav.login' |translate"
+          <button type="button" class="dropdownLogin btn btn-link px-0" [attr.aria-label]="'nav.login' |translate"
                   (click)="$event.preventDefault()" [attr.data-test]="'login-menu' | dsBrowserOnly"
                   role="button"
                   tabindex="0"
@@ -31,6 +31,7 @@
       <div class="nav-item">
         <div ngbDropdown #loggedInDrop="ngbDropdown" display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
           <button
+            type="button"
             role="button"
             tabindex="0"
             [attr.aria-label]="'nav.user-profile-menu-and-logout' | translate"
diff --git a/src/app/shared/collection-dropdown/collection-dropdown.component.html b/src/app/shared/collection-dropdown/collection-dropdown.component.html
index 985de3dfd70..2afd9c7ce88 100644
--- a/src/app/shared/collection-dropdown/collection-dropdown.component.html
+++ b/src/app/shared/collection-dropdown/collection-dropdown.component.html
@@ -45,7 +45,7 @@
   }
   @if ((isLoading | async)) {
     <li>
-      <button class="dropdown-item disabled">
+      <button type="button" class="dropdown-item disabled">
         <ds-loading message="{{'loading.default' | translate}}">
         </ds-loading>
       </button>
diff --git a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
index 0570691479a..6ea68819872 100644
--- a/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
+++ b/src/app/shared/comcol/comcol-forms/edit-comcol-page/comcol-role/comcol-role.component.html
@@ -35,21 +35,21 @@ <h2 class="h4 w-100">
 
       <div class="flex-shrink-0">
         @if (hasNoGroup$ | async) {
-          <button
+          <button type="button"
             class="btn btn-primary create"
             (click)="create()">
             <i class="fas fa-plus" aria-hidden="true"></i> {{'comcol-role.edit.create' | translate}}
           </button>
         }
         @if (hasAnonymousGroup$ | async) {
-          <button
+          <button type="button"
             class="btn btn-primary restrict"
             (click)="create()">
             {{'comcol-role.edit.restrict' | translate}}
           </button>
         }
         @if (hasCustomGroup$ | async) {
-          <button
+          <button type="button"
             class="btn btn-danger delete"
             (click)="confirmDelete(dsoNameService.getName(group))">
             <i class="fas fa-trash" aria-hidden="true"></i> {{'comcol-role.edit.delete' | translate}}
diff --git a/src/app/shared/disabled-directive.spec.ts b/src/app/shared/disabled-directive.spec.ts
index ce6dc2e7aab..18a846e1bf2 100644
--- a/src/app/shared/disabled-directive.spec.ts
+++ b/src/app/shared/disabled-directive.spec.ts
@@ -12,7 +12,7 @@ import { BtnDisabledDirective } from './btn-disabled.directive';
 
 @Component({
   template: `
-    <button [dsBtnDisabled]="isDisabled">Test Button</button>
+    <button type="button" [dsBtnDisabled]="isDisabled">Test Button</button>
   `,
   imports: [
     BtnDisabledDirective,
diff --git a/src/app/shared/ds-select/ds-select.component.html b/src/app/shared/ds-select/ds-select.component.html
index c5fa369ceb5..e7d3df43e1c 100644
--- a/src/app/shared/ds-select/ds-select.component.html
+++ b/src/app/shared/ds-select/ds-select.component.html
@@ -8,7 +8,7 @@
       </span>
     }
 
-    <button aria-describedby="dsSelectMenuLabel"
+    <button type="button" aria-describedby="dsSelectMenuLabel"
       id="dsSelectMenuButton"
       class="btn btn-outline-primary selection"
       (blur)="close.emit($event)"
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
index 923242c90f3..7ecef185a9b 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-expandable-menu-section/dso-edit-menu-expandable-section.component.html
@@ -2,7 +2,7 @@
   <div class="dso-button-menu mb-1" ngbDropdown container="body" placement="bottom-right">
     <div class="d-flex flex-row flex-nowrap"
       [ngbTooltip]="itemModel.text | translate" container="body">
-      <button [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled" role="menuitem" tabindex="0">
+      <button type="button" [attr.aria-label]="itemModel.text | translate" [title]="itemModel.text | translate" class="btn btn-dark btn-sm" ngbDropdownToggle [dsBtnDisabled]="section.model?.disabled" role="menuitem" tabindex="0">
         <i class="fas fa-{{section.icon}} fa-fw"></i>
       </button>
       <ul ngbDropdownMenu class="dso-edit-menu-dropdown p-1" role="menu">
diff --git a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
index b2c8ca84ce9..526c01738d7 100644
--- a/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
+++ b/src/app/shared/dso-page/dso-edit-menu/dso-edit-menu-section/dso-edit-menu-section.component.html
@@ -9,7 +9,7 @@
       </a>
     }
     @if (section.model.disabled) {
-      <button class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
+      <button type="button" class="btn btn-dark btn-sm" [dsBtnDisabled]="true">
         <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
         <span class="sr-only">{{itemModel.text | translate}}</span>
       </button>
@@ -20,7 +20,7 @@
 @if (canActivate) {
   <div class="dso-button-menu mb-1"
     [ngbTooltip]="itemModel.text | translate">
-    <button class="btn btn-dark btn-sm" [dsBtnDisabled]="section.model.disabled"
+    <button type="button" class="btn btn-dark btn-sm" [dsBtnDisabled]="section.model.disabled"
       (click)="activate($event)">
       <i class="fas fa-{{section.icon}} fa-fw" aria-hidden="true"></i>
       <span class="sr-only">{{itemModel.text | translate}}</span>
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
index cfe8da849ff..4dd71ebca43 100644
--- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
+++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html
@@ -17,13 +17,14 @@
     (scrolled)="onScrollDown()">
     @if (listEntries$ | async) {
       @if ((listEntries$ | async).length === 0) {
-        <button class="list-group-item list-group-item-action border-0 disabled"
+        <button type="button" class="list-group-item list-group-item-action border-0 disabled"
           >
           {{'dso-selector.no-results' | translate: { type: typesString } }}
         </button>
       }
       @for (listEntry of (listEntries$ | async); track listEntry) {
         <button
+          type="button"
           class="list-group-item list-group-item-action border-0 list-entry"
           [ngClass]="{'bg-primary': listEntry['id'] === currentDSOId}"
           title="{{ getName(listEntry) }}"
@@ -36,6 +37,7 @@
     }
     @if (loading) {
       <button
+        type="button"
         title="{{'loading.default' | translate}}"
         class="list-group-item list-group-item-action border-0 list-entry">
         <ds-loading [showMessage]="false"></ds-loading>
diff --git a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index b465c24e407..85b206b01e7 100644
--- a/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -6,7 +6,7 @@
   <div class="modal-body">
     @if ((isAdmin$ | async)) {
       <div data-test="admin-div">
-        <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
+        <button type="button" class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
         <div class="h3 position-relative py-1 my-3 fw-normal">
           <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
@@ -20,5 +20,4 @@
         [types]="selectorTypes"
         (onSelect)="selectObject($event)"></ds-authorized-community-selector>
     </div>
-  </div>
-
+  </div>
\ No newline at end of file
diff --git a/src/app/shared/entity-dropdown/entity-dropdown.component.html b/src/app/shared/entity-dropdown/entity-dropdown.component.html
index 4f09f883521..8e28d9c8f1e 100644
--- a/src/app/shared/entity-dropdown/entity-dropdown.component.html
+++ b/src/app/shared/entity-dropdown/entity-dropdown.component.html
@@ -10,14 +10,14 @@
   (scrolled)="onScrollDown()">
   @if (searchListEntity?.length === 0 && (isLoadingList | async) !== true) {
     <li>
-      <button class="dropdown-item disabled" role="menuitem">
+      <button type="button" class="dropdown-item disabled" role="menuitem">
         {{'submission.sections.general.no-entity' | translate}}
       </button>
     </li>
   }
   @for (listItem of searchListEntity; track listItem) {
     <li class="entity-item text-primary">
-      <button class="dropdown-item"
+      <button type="button" class="dropdown-item"
         role="menuitem"
         title="{{ listItem.label }}"
         (click)="onSelect(listItem)">
@@ -29,7 +29,7 @@
   }
   @if ((isLoadingList | async)) {
     <li>
-      <button class="dropdown-item disabled" role="menuitem">
+      <button type="button" class="dropdown-item disabled" role="menuitem">
         <ds-loading message="{{'loading.default' | translate}}">
         </ds-loading>
       </button>
diff --git a/src/app/shared/eperson-group-list/eperson-group-list.component.html b/src/app/shared/eperson-group-list/eperson-group-list.component.html
index 743d893f6c9..f20c27f6c22 100644
--- a/src/app/shared/eperson-group-list/eperson-group-list.component.html
+++ b/src/app/shared/eperson-group-list/eperson-group-list.component.html
@@ -27,7 +27,7 @@
                 <td>{{ entry.id }}</td>
                 <td>{{ dsoNameService.getName(entry) }}</td>
                 <td class="text-center">
-                  <button class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
+                  <button type="button" class="btn btn-sm btn-outline-primary" (click)="emitSelect(entry)">
                     {{'resource-policies.form.eperson-group-list.select.btn' | translate}}
                   </button>
                 </td>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
index 9e2a8fe5137..65341bb5d81 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -82,13 +82,13 @@ <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relat
       {{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
     </div>
     @if (isEditRelationship) {
-      <button class="btn btn-danger discard"
+      <button type="button" class="btn btn-danger discard"
         [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
         (click)="discardEv()">
         <i class="fas fa-times"></i>
         <span class="d-none d-sm-inline">&nbsp;{{"item.edit.metadata.discard-button" | translate}}</span>
       </button>
-      <button class="btn btn-primary submit"
+      <button type="button" class="btn btn-primary submit"
         [dsBtnDisabled]="(toAdd.length === 0 && toRemove.length === 0) || isPending"
         (click)="submitEv()">
         @if (isPending) {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
index 8b15eb25d6e..cfe8ebbffef 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -36,9 +36,9 @@
               <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.toggle-dropdown' | translate) }}</span>
             </button>
             <div ngbDropdownMenu aria-labelledby="resultdropdown" *ngVar="(resultsRD$ | async) as resultsRD">
-              <button class="dropdown-item"
+              <button type="button" class="dropdown-item"
               (click)="selectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-page' | translate) }}</button>
-              <button class="dropdown-item"
+              <button type="button" class="dropdown-item"
               (click)="deselectPage(resultsRD?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-page' | translate) }}</button>
             </div>
           </div>
diff --git a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
index 600e0f40772..931fe17700b 100644
--- a/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
+++ b/src/app/shared/form/vocabulary-treeview/vocabulary-treeview.component.html
@@ -44,7 +44,7 @@ <h2 class="h4 text-center text-muted mt-4" >
   <cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
     <!-- Leaf node -->
     <cdk-tree-node *cdkTreeNodeDef="let node" cdkTreeNodePadding class="d-flex">
-      <span aria-hidden="true" type="button" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle>
+      <span aria-hidden="true" class="btn btn-default px-2 me-1 btn-transparent" cdkTreeNodeToggle>
         <i class="fas fa-fw fa-angle-right invisible"></i>
       </span>
       @if (multiSelect) {
@@ -67,6 +67,7 @@ <h2 class="h4 text-center text-muted mt-4" >
       }
       @if (!multiSelect) {
         <button class="btn btn-outline-link btn-sm text-start"
+          type="button"
           [class.text-success]="node.isSelected"
           [dsBtnDisabled]="!node.item?.selectable"
           [ngbTooltip]="node.item?.otherInformation?.note"
@@ -111,6 +112,7 @@ <h2 class="h4 text-center text-muted mt-4" >
       }
       @if (!multiSelect) {
         <button class="btn btn-outline-link btn-sm text-start"
+          type="button"
           [class.text-success]="node.isSelected"
           [dsBtnDisabled]="!node.item?.selectable"
           [ngbTooltip]="node.item?.otherInformation?.note"
@@ -125,15 +127,15 @@ <h2 class="h4 text-center text-muted mt-4" >
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMore" cdkTreeNodePadding>
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMore(node.loadMoreParentItem)"
-        [attr.aria-label]="'vocabulary-treeview.load-more' | translate" role="button" tabindex="0">
+      <button class="btn btn-outline-secondary btn-sm" type="button" (click)="loadMore(node.loadMoreParentItem)"
+        [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
 
     <cdk-tree-node *cdkTreeNodeDef="let node; when: isLoadMoreRoot">
-      <button class="btn btn-outline-secondary btn-sm" (click)="loadMoreRoot(node)"
-        [attr.aria-label]="'vocabulary-treeview.load-more' | translate" role="button" tabindex="0">
+      <button class="btn btn-outline-secondary btn-sm" type="button" (click)="loadMoreRoot(node)"
+        [attr.aria-label]="'vocabulary-treeview.load-more' | translate">
         {{'vocabulary-treeview.load-more' | translate}}...
       </button>
     </cdk-tree-node>
@@ -143,13 +145,13 @@ <h2 class="h4 text-center text-muted mt-4" >
 @if ((showPreviousPage$ | async) || (showNextPage$ | async)) {
   <div class="mb-3 d-flex gap-2">
     @if (showPreviousPage$ | async) {
-      <button class="btn btn-outline-secondary"
+      <button type="button" class="btn btn-outline-secondary"
               (click)="loadPreviousPage()">
         {{ 'browse.taxonomy.show_previous_results' | translate }}
       </button>
     }
     @if (showNextPage$ | async) {
-      <button class="btn btn-outline-secondary"
+      <button type="button" class="btn btn-outline-secondary"
               (click)="loadNextPage()">
         {{ 'browse.taxonomy.show_next_results' | translate }}
       </button>
diff --git a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
index f751d60d756..4b0506f254a 100644
--- a/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
+++ b/src/app/shared/impersonate-navbar/impersonate-navbar.component.html
@@ -1,7 +1,7 @@
 @if (isImpersonating$ | async) {
   <ul class="navbar-nav">
     <li class="nav-item">
-      <button class="btn btn-sm btn-dark" ngbTooltip="{{'nav.stop-impersonating' | translate}}" (click)="stopImpersonating()">
+      <button type="button" class="btn btn-sm btn-dark" ngbTooltip="{{'nav.stop-impersonating' | translate}}" (click)="stopImpersonating()">
         <i class="fa fa-user-secret"></i>
       </button>
     </li>
diff --git a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
index dfa3e241fd0..b55710a7679 100644
--- a/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
+++ b/src/app/shared/input-suggestions/dso-input-suggestions/dso-input-suggestions.component.html
@@ -16,7 +16,7 @@
     <div class="dropdown-list">
       @for (suggestionOption of suggestions; track suggestionOption) {
         <div>
-          <button class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+          <button type="button" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
             <ds-listable-object-component-loader [object]="suggestionOption" [viewMode]="viewMode" [linkType]="linkTypes.None"></ds-listable-object-component-loader>
           </button>
         </div>
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 6daba932b8d..4f89d891622 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -1,6 +1,6 @@
 @if (moreThanOneLanguage) {
   <div ngbDropdown class="navbar-nav" display="dynamic" placement="bottom-right">
-    <button role="button"
+    <button type="button" role="button"
             [attr.aria-label]="'nav.language' |translate"
             aria-controls="language-menu-list"
             aria-haspopup="menu"
@@ -23,7 +23,7 @@
              [class.active]="lang === translate.getCurrentLang()">
           {{ langLabel(lang) }}
         </div>
-      }
+      } 
     </div>
   </div>
 }
diff --git a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
index 5a079f91a62..ddc3be345c9 100644
--- a/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
+++ b/src/app/shared/log-in/methods/log-in-external-provider/log-in-external-provider.component.html
@@ -1,3 +1,3 @@
-<button class="btn btn-lg btn-primary w-100 text-white" (click)="redirectToExternalProvider()" role="button" tabindex="0">
+<button type="button" class="btn btn-lg btn-primary w-100 text-white" (click)="redirectToExternalProvider()">
   <i class="fas fa-sign-in-alt"></i> {{getButtonLabel() | translate}}
 </button>
diff --git a/src/app/shared/log-out/log-out.component.html b/src/app/shared/log-out/log-out.component.html
index 86dd33fcc52..c1a3fb9e874 100644
--- a/src/app/shared/log-out/log-out.component.html
+++ b/src/app/shared/log-out/log-out.component.html
@@ -4,5 +4,5 @@
     <div class="alert alert-danger" role="alert" @fadeOut>{{ error | async }}</div>
   }
 
-  <button role="menuitem" class="btn btn-lg btn-primary w-100" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
+  <button type="button" role="menuitem" class="btn btn-lg btn-primary w-100" (click)="logOut()" [attr.data-test]="'logout-button' | dsBrowserOnly"><i class="fas fa-sign-out-alt"></i> {{"logout.form.submit" | translate}}</button>
 </div>
diff --git a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
index b3eb6b21652..d41fa1d54b4 100644
--- a/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/claimed-task-actions.component.html
@@ -10,7 +10,7 @@
       </ds-claimed-task-actions-loader>
     }
 
-    <button class="btn btn-primary workflow-view" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
+    <button type="button" class="btn btn-primary workflow-view" ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
       [routerLink]="[getWorkflowItemViewRoute(workflowitem)]">
       <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
     </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html
index 5b63aa381e7..2a809ad9a17 100644
--- a/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/rating/advanced-claimed-task-action-rating.component.html
@@ -1,4 +1,4 @@
-<button (click)="openAdvancedClaimedTaskTab()" class="ratingReviewerAction btn btn-primary"
+<button type="button" (click)="openAdvancedClaimedTaskTab()" class="ratingReviewerAction btn btn-primary"
         ngbTooltip="{{ 'submission.workflow.generic.' + option + '-help' | translate }}">
   <i class="fa fa-star-half-alt"></i> {{ 'submission.workflow.generic.' + option | translate}}
 </button>
diff --git a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
index 82721fb8287..d779170e799 100644
--- a/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/reject/claimed-task-actions-reject.component.html
@@ -1,5 +1,5 @@
 <ng-template #rejectTipContent><p [innerHTML]="'submission.workflow.tasks.claimed.reject_help' | translate"></p></ng-template>
-<button [className]="'btn btn-danger'"
+<button type="button" [className]="'btn btn-danger'"
   [ngbTooltip]="rejectTipContent"
   [dsBtnDisabled]="processing$ | async"
   (click)="openRejectModal(rejectModal)" >
diff --git a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html
index 6a45e7e02ce..565f302ad5d 100644
--- a/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html
+++ b/src/app/shared/mydspace-actions/claimed-task/select-reviewer/advanced-claimed-task-action-select-reviewer.component.html
@@ -1,4 +1,4 @@
-<button (click)="openAdvancedClaimedTaskTab()" class="selectReviewerAction btn btn-primary"
+<button type="button" (click)="openAdvancedClaimedTaskTab()" class="selectReviewerAction btn btn-primary"
         ngbTooltip="{{ 'submission.workflow.generic.' + option + '-help' | translate }}">
   <i class="fa fa-user"></i> {{ 'submission.workflow.generic.' + option | translate}}
 </button>
diff --git a/src/app/shared/mydspace-actions/item/item-actions.component.html b/src/app/shared/mydspace-actions/item/item-actions.component.html
index 0f085c453e1..0f073957fc8 100644
--- a/src/app/shared/mydspace-actions/item/item-actions.component.html
+++ b/src/app/shared/mydspace-actions/item/item-actions.component.html
@@ -1,4 +1,4 @@
-<button class="btn btn-primary mt-1 mb-3"
+<button type="button" class="btn btn-primary mt-1 mb-3"
             ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
             [routerLink]="[itemPageRoute]">
   <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
diff --git a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
index 7df692c69f8..ca202e8929e 100644
--- a/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
+++ b/src/app/shared/mydspace-actions/pool-task/pool-task-actions.component.html
@@ -10,7 +10,7 @@
 translate}}</span>
 }
 </button>
-<button class="btn btn-primary workflow-view ms-1 mt-1 mb-3" data-test="view-btn"
+<button type="button"class="btn btn-primary workflow-view ms-1 mt-1 mb-3" data-test="view-btn"
   ngbTooltip="{{'submission.workflow.generic.view-help' | translate}}"
   [routerLink]="[getWorkflowItemViewRoute(workflowitem)]">
   <i class="fa fa-info-circle"></i> {{"submission.workflow.generic.view" | translate}}
diff --git a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
index f6e5fecb501..e53b388599f 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.html
@@ -1,4 +1,4 @@
-<button class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn"
+<button type="button" class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn"
         ngbTooltip="{{'submission.workspace.generic.view-help' | translate}}"
         [routerLink]="[getWorkflowItemViewRoute(object)]">
   <i class="fa fa-info-circle"></i> {{"submission.workspace.generic.view" | translate}}
diff --git a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
index 21191ea0328..53251fe3f04 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.html
@@ -1,6 +1,6 @@
 <div class="space-children-mr">
 
-  <button class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn"
+  <button type="button" class="btn btn-primary workflow-view mt-1 mb-3" data-test="view-btn"
     ngbTooltip="{{'submission.workspace.generic.view-help' | translate}}"
     [attr.aria-label]="'submission.workspace.generic.view-help' | translate"
     [routerLink]="[getWorkspaceItemViewRoute(object)]">
diff --git a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
index 3d2ade646ec..f69d161163f 100644
--- a/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
+++ b/src/app/shared/object-collection/shared/importable-list-item-control/importable-list-item-control.component.html
@@ -1,5 +1,6 @@
 <div class="me-2">
-  <button (click)="importObject.emit(object)"
+  <button type="button"
+          (click)="importObject.emit(object)"
           class="btn btn-outline-primary btn-sm float-start"
           title="{{importConfig?.buttonLabel | translate}}">
     <i class="fas fa-cloud-download-alt fa-fw"></i>
diff --git a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
index 7fb7bad59a0..14311ca9203 100644
--- a/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
+++ b/src/app/shared/object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview.component.html
@@ -15,7 +15,7 @@
                 @if (bitstreams?.length > 0) {
                   <div class="file-section">
                     @for (file of bitstreams; track file; let last = $last) {
-                      <button class="btn btn-link" (click)="downloadBitstreamFile(file?.uuid)">
+                      <button type="button" class="btn btn-link" (click)="downloadBitstreamFile(file?.uuid)">
                         <span>{{ dsoNameService.getName(file) }}</span>
                         <span>({{(file?.sizeBytes) | dsFileSize }})</span>
                         @if (!last) {
diff --git a/src/app/shared/object-select/collection-select/collection-select.component.html b/src/app/shared/object-select/collection-select/collection-select.component.html
index ae579773102..ac49afa0082 100644
--- a/src/app/shared/object-select/collection-select/collection-select.component.html
+++ b/src/app/shared/object-select/collection-select/collection-select.component.html
@@ -38,10 +38,10 @@
     <ds-loading message="{{'loading.collections' | translate}}"></ds-loading>
   }
   <div class="space-children-mr float-end" *ngVar="(selectedIds$ | async) as selectedIds">
-    <button class="btn btn-outline-secondary collection-cancel" (click)="onCancel()">
+    <button type="button" class="btn btn-outline-secondary collection-cancel" (click)="onCancel()">
       <i class="fas fa-times"></i> {{cancelButton | translate}}
     </button>
-    <button class="btn collection-confirm"
+    <button type="button" class="btn collection-confirm"
       [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
       [dsBtnDisabled]="selectedIds?.length === 0"
       (click)="confirmSelected()">
diff --git a/src/app/shared/object-select/item-select/item-select.component.html b/src/app/shared/object-select/item-select/item-select.component.html
index 5c3a908038f..1639f6d8b3b 100644
--- a/src/app/shared/object-select/item-select/item-select.component.html
+++ b/src/app/shared/object-select/item-select/item-select.component.html
@@ -56,8 +56,8 @@
     <ds-loading message="{{'loading.items' | translate}}"></ds-loading>
   }
   <div *ngVar="(selectedIds$ | async) as selectedIds">
-    <button class="btn btn-outline-secondary item-cancel float-start" (click)="onCancel()">{{cancelButton | translate}}</button>
-    <button class="btn item-confirm float-end"
+    <button type="button" class="btn btn-outline-secondary item-cancel float-start" (click)="onCancel()">{{cancelButton | translate}}</button>
+    <button type="button"class="btn item-confirm float-end"
       [ngClass]="{'btn-danger': dangerConfirm, 'btn-primary': !dangerConfirm}"
       [dsBtnDisabled]="selectedIds?.length === 0"
       (click)="confirmSelected()">
diff --git a/src/app/shared/pagination/pagination.component.html b/src/app/shared/pagination/pagination.component.html
index 8a17b842b8c..d2d6c2cb63f 100644
--- a/src/app/shared/pagination/pagination.component.html
+++ b/src/app/shared/pagination/pagination.component.html
@@ -12,14 +12,14 @@
           <div class="col">
             @if (!hideGear) {
               <div ngbDropdown #paginationControls="ngbDropdown" placement="bottom-right" class="d-inline-block float-end">
-                <button class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false" role="button" tabindex="0"><i class="fas fa-cog" aria-hidden="true"></i></button>
+                <button type="button" class="btn btn-secondary" id="paginationControls" ngbDropdownToggle [title]="'pagination.options.description' | translate" [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true" aria-expanded="false"><i class="fas fa-cog" aria-hidden="true"></i></button>
                 <ul id="paginationControlsDropdownMenu" aria-labelledby="paginationControls" role="menu" ngbDropdownMenu>
                   <li role="menuitem">
                     <span class="dropdown-header" id="pagination-control_results-per-page" role="heading">{{ 'pagination.results-per-page' | translate}}</span>
                     <ul aria-labelledby="pagination-control_results-per-page" class="list-unstyled" role="listbox">
                       @for (item of pageSizeOptions; track item) {
                         <li role="option" [attr.aria-selected]="item === (pageSize$ | async)">
-                          <button (click)="doPageSizeChange(item)" class="dropdown-item" role="button" tabindex="0">
+                          <button type="button" (click)="doPageSizeChange(item)" class="dropdown-item">
                             <i [ngClass]="{'invisible': item !== (pageSize$ | async) }" class="fas fa-check" aria-hidden="true"></i> {{item}}
                           </button>
                         </li>
@@ -32,7 +32,7 @@
                       <ul aria-labelledby="pagination-control_sort-direction" class="list-unstyled" role="listbox">
                         @for (direction of (sortDirections | dsKeys); track direction) {
                           <li [attr.aria-selected]="direction.value === (sortDirection$ | async)" role="option">
-                            <button class="dropdown-item" (click)="doSortDirectionChange(direction.value)" role="button" tabindex="0">
+                            <button type="button" class="dropdown-item" (click)="doSortDirectionChange(direction.value)">
                               <i [ngClass]="{'invisible': direction.value !== (sortDirection$ |async)}" class="fas fa-check" aria-hidden="true"></i> {{'sorting.' + direction.key | translate}}
                             </button>
                           </li>
diff --git a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
index 9945c08e043..818ff1c1c0c 100644
--- a/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
+++ b/src/app/shared/resource-policies/entry/resource-policy-entry.component.html
@@ -27,13 +27,13 @@
 <td class="text-center">
 
   <div class="btn-group edit-field">
-    <button class="btn btn-outline-primary btn-sm"
+    <button type="button" class="btn btn-outline-primary btn-sm"
       [title]="'resource-policies.table.headers.edit.policy' | translate"
       (click)="redirectToResourcePolicyEditPage()">
       <i class="fas fa-edit fa-fw" aria-hidden="true"></i>
     </button>
     @if (groupName$ | async | dsHasValue) {
-      <button class="btn btn-outline-primary btn-sm"
+      <button type="button"class="btn btn-outline-primary btn-sm"
         [title]="'resource-policies.table.headers.edit.group' | translate"
         (click)="redirectToGroupEditPage()">
         <i class="fas fa-users fa-fw" aria-hidden="true"></i>
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index b839ebccfd6..3a4ac796f9c 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -12,7 +12,7 @@
               }
             </span>
             <div class="space-children-mr flex-shrink-0">
-              <button class="btn btn-danger p-1"
+              <button type="button" class="btn btn-danger p-1"
                 [dsBtnDisabled]="((canDelete() | async) !== true) || (isProcessingDelete() | async)"
                 [title]="'resource-policies.delete.btn.title' | translate"
                 (click)="deleteSelectedResourcePolicies()">
@@ -28,7 +28,7 @@
                   </span>
                 }
               </button>
-              <button class="btn btn-success p-1"
+              <button type="button" class="btn btn-success p-1"
                 [dsBtnDisabled]="(isProcessingDelete() | async)"
                 [title]="'resource-policies.add.for.' + resourceType | translate"
                 (click)="redirectToResourcePolicyCreatePage()">
diff --git a/src/app/shared/results-back-button/results-back-button.component.html b/src/app/shared/results-back-button/results-back-button.component.html
index aebe1584d4a..3c5842bad6e 100644
--- a/src/app/shared/results-back-button/results-back-button.component.html
+++ b/src/app/shared/results-back-button/results-back-button.component.html
@@ -1,4 +1,4 @@
-<button class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()" role="button" tabindex="0">
+<button  type="button" class="btn btn-secondary btn-sm mb-2 ng-tns-c242-28" (click)="back()">
   <i _ngcontent-dspace-angular-c242="" class="fas fa-arrow-left ng-tns-c242-3"></i>
   {{this.buttonLabel | async}}
 </button>
diff --git a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
index 60b6bd33240..a07f8f03a38 100644
--- a/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
+++ b/src/app/shared/search-form/scope-selector-modal/scope-selector-modal.component.html
@@ -4,7 +4,7 @@
         </button>
     </div>
     <div class="modal-body">
-        <button class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
+        <button  type="button" class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.' + action + '.' + objectType.toString().toLowerCase() + '.button'| translate }}</button>
         <div class="position-relative py-1 my-3 fw-normal h3">
             <hr>
             <div id="create-community-or-separator" class="text-center position-absolute w-100">
diff --git a/src/app/shared/search/advanced-search/advanced-search.component.html b/src/app/shared/search/advanced-search/advanced-search.component.html
index 761125fb908..ac925c254b8 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.html
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -34,7 +34,7 @@ <h4>{{ 'search.sidebar.advanced-search.filter-by' | translate }}</h4>
     (findSuggestions)="findSuggestions($event)"
     ngDefaultControl>
   </ds-filter-input-suggestions>
-  <button (click)="applyFilter()" [dsBtnDisabled]="currentValue === ''" class="btn btn-primary mt-2">
+  <button type="button" (click)="applyFilter()" [dsBtnDisabled]="currentValue === ''" class="btn btn-primary mt-2">
     {{ 'search.sidebar.advanced-search.add' | translate }}
   </button>
 </div>
diff --git a/src/app/shared/search/search-export-csv/search-export-csv.component.html b/src/app/shared/search/search-export-csv/search-export-csv.component.html
index 1cf8f6b663f..e2b3f1c600b 100644
--- a/src/app/shared/search/search-export-csv/search-export-csv.component.html
+++ b/src/app/shared/search/search-export-csv/search-export-csv.component.html
@@ -13,6 +13,7 @@
 
 @if (shouldShowButton$ | async) {
   <button
+    type="button"
     class="export-button btn btn-dark btn-sm"
     [ngbTooltip]="(shouldShowWarning$ | async) ? tipContentWarning : tipContent"
     (click)="export()"
diff --git a/src/app/shared/search/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
index e1083fc7abd..abfb118765f 100644
--- a/src/app/shared/search/search-filters/search-filter/search-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
@@ -1,7 +1,7 @@
 @if (active$ | async) {
   <div class="facet-filter d-block mb-3 p-3"
     [id]="regionId" [attr.aria-labelledby]="toggleId" [ngClass]="{ 'focus': focusBox }" role="region">
-    <button (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
+    <button type="button" (click)="toggle()" (focusin)="focusBox = true" (focusout)="focusBox = false"
       class="filter-name d-flex" [attr.aria-controls]="regionId" [id]="toggleId"
       [attr.aria-expanded]="(collapsed$ | async) !== true"
       [attr.aria-label]="(((collapsed$ | async) ? 'search.filters.filter.expand' : 'search.filters.filter.collapse') | translate) + ' ' + (('search.filters.filter.' + filter.name + '.head') | translate | lowercase)"
diff --git a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
index 7e3260aa0c4..3e6bc43650b 100644
--- a/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
+++ b/src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
@@ -46,7 +46,7 @@
         }
       </div>
     }
-    <button (click)="onSubmit()" class="btn btn-primary" role="button" tabindex="0">
+    <button type="submit" (click)="onSubmit()" class="btn btn-primary">
       {{'search.filters.search.submit' | translate}}
     </button>
   </div>
diff --git a/src/app/shared/search/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
index bea2ea94671..003946b9b0c 100644
--- a/src/app/shared/search/search-filters/search-filters.component.html
+++ b/src/app/shared/search/search-filters/search-filters.component.html
@@ -17,7 +17,7 @@ <h2>{{filterLabel+'.filters.head' | translate}}</h2>
 }
 
 @if (inPlaceSearch) {
-  <button class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" (click)="minimizeFilters()" queryParamsHandling="merge" role="button">
+  <button type="button" class="btn btn-primary" [routerLink]="[searchLink]" [queryParams]="clearParams | async" (click)="minimizeFilters()" queryParamsHandling="merge" role="button">
     <i class="fas fa-undo"></i> {{"search.filters.reset" | translate}}
   </button>
 }
diff --git a/src/app/shared/search/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
index 9c9e4a90019..01545c0e39b 100644
--- a/src/app/shared/search/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -1,7 +1,7 @@
 <div>
   <div id="sidebar-options" class="d-block d-md-none search-controls clearfix">
     <small class="results">{{resultCount}} {{"search.sidebar.results" | translate}}</small>
-    <button (click)="toggleSidebar.emit()"
+    <button type="button" (click)="toggleSidebar.emit()"
       [attr.aria-label]="'search.sidebar.close' | translate"
       aria-controls="search-content"
       class="btn btn-outline-primary float-end close-sidebar"><i
diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html
index e0f778e55da..b0c39f3003f 100644
--- a/src/app/shared/search/search.component.html
+++ b/src/app/shared/search/search.component.html
@@ -37,7 +37,7 @@
           <ds-view-mode-switch [viewModeList]="viewModeList"
           [inPlaceSearch]="inPlaceSearch"></ds-view-mode-switch>
         }
-        <button (click)="openSidebar()" aria-controls="#search-body"
+        <button type="button" (click)="openSidebar()" aria-controls="#search-body"
           class="btn btn-outline-primary float-end open-sidebar"><i
         class="fas fa-sliders"></i> {{"search.sidebar.open"
         | translate}}
diff --git a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
index 41e00be702b..b32e5b77f54 100644
--- a/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
+++ b/src/app/shared/subscriptions/subscription-view/subscription-view.component.html
@@ -27,12 +27,12 @@
 </td>
 <td class="subscription-actions">
   <div class="btn-group edit-field">
-    <button (click)="$event.preventDefault();openSubscriptionModal();" [dsBtnDisabled]="!dso"
+    <button type="button" (click)="$event.preventDefault();openSubscriptionModal();" [dsBtnDisabled]="!dso"
       [title]="'subscriptions.table.edit' | translate"
       class="btn btn-outline-primary btn-sm access-control-editEPersonButton">
       <i class="fas fa-edit fa-fw"></i>
     </button>
-    <button (click)="deleteSubscriptionPopup(subscription)"
+    <button type="button" (click)="deleteSubscriptionPopup(subscription)"
       [title]="'subscriptions.table.delete' | translate"
       class="btn btn-outline-danger btn-sm access-control-deleteEPersonButton">
       <i class="fas fa-trash-alt fa-fw"></i>
diff --git a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
index a0ec379f54f..cbbb6fd4a73 100644
--- a/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
+++ b/src/app/shared/truncatable/truncatable-part/truncatable-part.component.html
@@ -3,6 +3,7 @@
     <ng-content></ng-content>
   </div>
   <button
+    type="button"
     class="btn btn-link p-0 {{isExpanded ? 'collapseButton' : 'expandButton'}}"
     dsDragClick
     (actualClick)="toggle()"
diff --git a/src/app/shared/view-mode-switch/view-mode-switch.component.html b/src/app/shared/view-mode-switch/view-mode-switch.component.html
index 88ee41d53bb..e3246a7dc37 100644
--- a/src/app/shared/view-mode-switch/view-mode-switch.component.html
+++ b/src/app/shared/view-mode-switch/view-mode-switch.component.html
@@ -1,6 +1,7 @@
 <div class="btn-group" data-bs-toggle="buttons">
   @if (isToShow(viewModeEnum.ListElement)) {
     <button
+      type="button"
       [attr.aria-current]="currentMode === viewModeEnum.ListElement"
       [attr.aria-label]="'search.view-switch.show-list' | translate"
       [title]="'search.view-switch.show-list' | translate"
@@ -16,6 +17,7 @@
   }
   @if (isToShow(viewModeEnum.GridElement)) {
     <button
+      type="button"
       [attr.aria-current]="currentMode === viewModeEnum.GridElement"
       [attr.aria-label]="'search.view-switch.show-grid' | translate"
       [title]="'search.view-switch.show-grid' | translate"
@@ -31,6 +33,7 @@
   }
   @if (isToShow(viewModeEnum.DetailedListElement)) {
     <button
+      type="button"
       [attr.aria-current]="currentMode === viewModeEnum.DetailedListElement"
       [attr.aria-label]="'search.view-switch.show-detail' | translate"
       [title]="'search.view-switch.show-detail' | translate"
@@ -46,6 +49,7 @@
   }
   @if (isToShow(viewModeEnum.GeospatialMap)) {
     <button
+      type="button"
       [attr.aria-current]="currentMode === viewModeEnum.GeospatialMap"
       [attr.aria-label]="'search.view-switch.show-geospatialMap' | translate"
       [title]="'search.view-switch.show-geospatialMap' | translate"
diff --git a/src/app/submission/form/collection/submission-form-collection.component.html b/src/app/submission/form/collection/submission-form-collection.component.html
index 4888ecad0f9..fde1a97b129 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.html
+++ b/src/app/submission/form/collection/submission-form-collection.component.html
@@ -15,7 +15,7 @@
       <span id="collectionControlsMenuLabel" class="input-group-text">
         {{ 'submission.sections.general.collection' | translate }}
       </span>
-      <button aria-describedby="collectionControlsMenuLabel"
+      <button type="button" aria-describedby="collectionControlsMenuLabel"
         id="collectionControlsMenuButton"
         class="btn btn-outline-primary"
         (blur)="onClose()"
diff --git a/src/app/submission/form/section-add/submission-form-section-add.component.html b/src/app/submission/form/section-add/submission-form-section-add.component.html
index 21c6322700e..4f899db84ec 100644
--- a/src/app/submission/form/section-add/submission-form-section-add.component.html
+++ b/src/app/submission/form/section-add/submission-form-section-add.component.html
@@ -4,7 +4,7 @@
   class="d-inline-block"
   [ngClass]="{'w-100': isXs$}">
   @if (hasSections$ | async) {
-    <button class="btn btn-outline-primary dropdown-toggle"
+    <button type="button" class="btn btn-outline-primary dropdown-toggle"
       id="sectionControls"
       [dsBtnDisabled]="(hasSections$ | async) !== true"
       [ngClass]="{'w-100': (isXs$ | async)}"
@@ -17,12 +17,12 @@
     aria-labelledby="sectionControls"
     [ngClass]="{'w-100': (isXs$ | async)}">
     @if ((hasSections$ | async) !== true) {
-      <button class="dropdown-item disabled">
+      <button type="button"class="dropdown-item disabled">
         {{ 'submission.sections.general.no-sections' | translate }}
       </button>
     }
     @for (listItem of (sectionList$ | async); track listItem) {
-      <button class="dropdown-item" (click)="addSection(listItem.id)">
+      <button type="button" class="dropdown-item" (click)="addSection(listItem.id)">
         {{'submission.sections.'+listItem.header | translate }}
       </button>
     }
diff --git a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
index 02bcc78bf49..6025417d844 100644
--- a/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
+++ b/src/app/submission/import-external/import-external-preview/submission-import-external-preview.component.html
@@ -33,7 +33,7 @@ <h2>{{'submission.import-external.preview.title.' + labelPrefix | translate}}</h
         </div>
         <div class="row">
           <div class="col-md-12 text-end">
-            <button class="btn btn-success" (click)="import()" role="button">
+            <button type="button" class="btn btn-success" (click)="import()" role="button">
               <i class="fa fa-file-import" aria-hidden="true"></i> {{'submission.import-external.preview.button.import' | translate}}
             </button>
           </div>
diff --git a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
index 3dfbea992b7..92ebbb8db57 100644
--- a/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
+++ b/src/app/submission/import-external/import-external-searchbar/submission-import-external-searchbar.component.html
@@ -9,7 +9,7 @@
     <input type="text" class="form-control" (keyup.enter)="(searchString === '')?null:search()" [(ngModel)]="searchString" placeholder="{{'submission.import-external.search.placeholder' | translate}}" [attr.aria-label]="'submission.import-external.search.placeholder' | translate">
   }
   <div [ngClass]="{'input-group-append': (isXsOrSm$ | async) !== true}" ngbDropdown role="group">
-    <button [attr.aria-label]="'submission.import-external.search.source.hint' |translate"
+    <button type="button" [attr.aria-label]="'submission.import-external.search.source.hint' |translate"
       class="btn btn-outline-secondary w-fx"
       title="{{'submission.import-external.search.source.hint' |translate}}"
       ngbDropdownToggle>
@@ -25,7 +25,7 @@
         (scrolled)="onScroll()"
         [scrollWindow]="false">
         @for (source of sourceList; track source) {
-          <button ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)"
+          <button type="button"ngbDropdownItem class="dropdown-item text-truncate" (click)="makeSourceSelection(source)"
             >{{ 'submission.import-external.source.' + source?.name | translate }}
           </button>
         }
diff --git a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
index 93251f5a2d1..0b1badcf2b9 100644
--- a/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
+++ b/src/app/submission/sections/cc-license/submission-section-cc-licenses.component.html
@@ -20,12 +20,12 @@
         [scrollWindow]="false">
 
         @if(submissionCcLicenses?.length === 0) {
-          <button class="dropdown-item disabled">
+          <button type="button" class="dropdown-item disabled">
             {{ 'submission.sections.ccLicense.none' | translate }}
           </button>
         } @else {
           @for(license of submissionCcLicenses; track license.id) {
-            <button class="dropdown-item" (click)="selectCcLicense(license)">
+            <button type="button"class="dropdown-item" (click)="selectCcLicense(license)">
               {{ license.name }}
             </button>
           }
@@ -44,6 +44,7 @@
           {{ field.label }}
         </div>
         <button
+          type="button"
           class="btn btn-outline-info btn-sm ms-2"
           (click)="openInfoModal(infoModal)">
           <i class="fas fa-question"></i>
@@ -93,6 +94,7 @@ <h5>
             <div class="options-select-menu overflow-auto">
               @for (option of field.enums; track option) {
                 <button
+                  type="button"
                   class="dropdown-item"
                   (click)="selectOption(getSelectedCcLicense(), field, option)">
                   {{ option.label }}
diff --git a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
index ecd66f1d4db..4257b491995 100644
--- a/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
+++ b/src/app/submission/sections/section-coar-notify/section-coar-notify.component.html
@@ -47,6 +47,7 @@
                               >
                               @if ((filterServices(ldnPattern.pattern) | async)?.length === 0) {
                                 <button
+                                  type="button"
                                   class="dropdown-item collection-item text-truncate w-100"
                                   >
                                   {{'submission.section.section-coar-notify.dropdown.no-data' | translate}}
@@ -54,6 +55,7 @@
                               }
                               @if ((filterServices(ldnPattern.pattern ) | async)?.length > 0) {
                                 <button
+                                  type="button"
                                   class="dropdown-item collection-item text-truncate w-100"
                                   (click)="onChange(ldnPattern.pattern, serviceIndex, null)"
                                   >
@@ -62,6 +64,7 @@
                               }
                               @for (serviceOption of filterServices(ldnPattern.pattern ) | async; track serviceOption) {
                                 <button
+                                  type="button"
                                   [ngClass]="{'bg-light': ldnServiceByPattern[ldnPattern.pattern ].services[serviceIndex]?.id === serviceOption.id}"
                                   class="dropdown-item collection-item text-truncate w-100"
                                   (click)="onChange(ldnPattern.pattern, serviceIndex, serviceOption)"
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 c1cdf266aaf..fecb5f748d5 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
@@ -30,15 +30,15 @@
             [bitstream]="getBitstream()" [enableRequestACopy]="false" [showAccessStatusBadge]="false">
             <i class="fa fa-download fa-2x text-normal" aria-hidden="true"></i>
           </ds-file-download-link>
-          <button class="btn btn-link-focus"
-                  attr.aria-label="{{'submission.sections.upload.edit.title' | translate}} {{fileName}}"
-                  title="{{ 'submission.sections.upload.edit.title' | translate }} {{fileName}}"
+          <button type="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();editBitstreamData();">
             <i class="fa fa-edit fa-2x text-normal"></i>
           </button>
-          <button class="btn btn-link-focus"
-            attr.aria-label="{{'submission.sections.upload.delete.confirm.title' | translate}} {{fileName}}"
-                  title="{{ 'submission.sections.upload.delete.confirm.title' | translate }} {{fileName}}"
+          <button type="button" class="btn btn-link-focus"
+            [attr.aria-label]="'submission.sections.upload.delete.confirm.title' | translate"
+            title="{{ 'submission.sections.upload.delete.confirm.title' | translate }}"
             [dsBtnDisabled]="(processingDelete$ | async)"
             (click)="$event.preventDefault();confirmDelete(content);">
             @if ((processingDelete$ | async)) {
diff --git a/src/app/suggestions-page/suggestions-page.component.html b/src/app/suggestions-page/suggestions-page.component.html
index 452f47f9b6f..fa7ae41f0d6 100644
--- a/src/app/suggestions-page/suggestions-page.component.html
+++ b/src/app/suggestions-page/suggestions-page.component.html
@@ -13,7 +13,7 @@ <h1>
               {{'suggestion.from.source' | translate}} {{ translateSuggestionSource() | translate }}
             </h1>
             <div class="mb-3 mt-3">
-              <button class="btn me-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
+              <button type="button" class="btn me-2 btn-light" (click)="onToggleSelectAll(suggestionsRD.page)">Select / Deselect All</button>
               <em>({{ getSelectedSuggestionsCount() }})</em>
               @if (getSelectedSuggestionsCount() > 0) {
                 <ds-suggestion-actions
diff --git a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
index f6a5573a744..0e6f95e01a3 100644
--- a/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
+++ b/src/app/system-wide-alert/alert-form/system-wide-alert-form.component.html
@@ -100,10 +100,10 @@ <h1 id="header">{{'system-wide-alert.form.header' | translate}}</h1>
     </div>
   }
   <div class="btn-row float-end space-children-mr mt-2">
-    <button (click)="back()" class="btn btn-outline-secondary">
+    <button type="button" (click)="back()" class="btn btn-outline-secondary">
       <i class="fas fa-arrow-left"></i> {{ 'system-wide-alert.form.cancel' | translate }}
     </button>
-    <button class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
+    <button type="button" class="btn btn-primary" [dsBtnDisabled]="alertForm.invalid" (click)="save()">
       <i class="fa fa-save"></i> {{ 'system-wide-alert.form.save' | translate }}
     </button>
   </div>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
index 4fe2049d975..ae9778f6094 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-rating/advanced-workflow-action-rating.component.html
@@ -53,10 +53,10 @@
   }
 
   <div class="d-flex flex-wrap justify-content-end">
-    <button (click)="previousPage()" class="btn btn-default">
+    <button type="button" (click)="previousPage()" class="btn btn-default">
       {{'workflow-item.' + getType() + '.button.cancel' | translate}}
     </button>
-    <button (click)="performAction()" class="btn btn-primary">
+    <button type="button" (click)="performAction()" class="btn btn-primary">
       {{'workflow-item.' + getType() + '.button.confirm' | translate}}
     </button>
   </div>
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
index 2d7a7ff8cd2..26a3f3661dc 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.html
@@ -29,10 +29,10 @@
   }
 
   <div class="d-flex flex-wrap justify-content-end">
-    <button class="btn btn-default" (click)="previousPage()">
+    <button type="button" class="btn btn-default" (click)="previousPage()">
       {{'workflow-item.' + getType() + '.button.cancel' | translate}}
     </button>
-    <button class="btn btn-primary" (click)="performAction()">
+    <button type="button" class="btn btn-primary" (click)="performAction()">
       {{'workflow-item.' + getType() + '.button.confirm' | translate}}
     </button>
   </div>
diff --git a/src/app/workflowitems-edit-page/workflow-item-action-page.component.html b/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
index cd858b01e43..776f93397a1 100644
--- a/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
+++ b/src/app/workflowitems-edit-page/workflow-item-action-page.component.html
@@ -3,6 +3,6 @@ <h2>{{'workflow-item.' + type + '.header' | translate}}</h2>
   @if (item) {
     <ds-modify-item-overview [item]="item"></ds-modify-item-overview>
   }
-  <button class="btn btn-default" (click)="previousPage()">{{'workflow-item.' + type + '.button.cancel' | translate}}</button>
-  <button class="btn btn-danger" (click)="performAction()">{{'workflow-item.' + type + '.button.confirm' | translate}}</button>
+  <button type="button" class="btn btn-default" (click)="previousPage()">{{'workflow-item.' + type + '.button.cancel' | translate}}</button>
+  <button type="button" class="btn btn-danger" (click)="performAction()">{{'workflow-item.' + type + '.button.confirm' | translate}}</button>
 </div>
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
index 8b8dda97b7b..a1578c2d3e3 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html
@@ -3,8 +3,8 @@ <h1>{{ 'workspace-item.delete.header' | translate }}</h1>
   @if ((dso$ | async)) {
     <ds-modify-item-overview [item]="$any(dso$ | async)"></ds-modify-item-overview>
   }
-  <button class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
-  <button class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
+  <button type="button"class="btn btn-default" (click)="previousPage()">{{ 'workspace-item.delete.button.cancel' | translate }}</button>
+  <button type="button"class="btn btn-danger" (click)="$event.preventDefault();confirmDelete(content)">{{ 'workspace-item.delete.button.confirm' | translate }}</button>
 </div>
 
 <ng-template #content let-c="close" let-d="dismiss" id="delete-modal">
diff --git a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
index e69de29bb2d..adb004b9f6a 100644
--- a/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
+++ b/src/themes/custom/app/shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component.html
@@ -0,0 +1,18 @@
+<div>
+    <div class="modal-header">{{'dso-selector.'+ action + '.' + objectType.toString().toLowerCase() + '.head' | translate}}
+        <button type="button" class="btn-close" (click)="close()" aria-label="Close">
+        </button>
+    </div>
+    <div class="modal-body">
+        <button type="button" class="btn btn-outline-primary btn-lg btn-block w-100" (click)="selectObject(undefined)">{{'dso-selector.create.community.top-level' | translate}}</button>
+        <h3 class="position-relative py-1 my-3 fw-normal">
+            <hr>
+            <div id="create-community-or-separator" class="text-center position-absolute w-100">
+                <span class="px-4 bg-white">{{'dso-selector.create.community.or-divider' | translate}}</span>
+            </div>
+        </h3>
+
+        <h5 class="px-2">{{'dso-selector.create.community.sub-level' | translate}}</h5>
+        <ds-dso-selector [currentDSOId]="dsoRD?.payload.uuid" [types]="selectorTypes" [sort]="defaultSort" (onSelect)="selectObject($event)"></ds-dso-selector>
+    </div>
+</div>