diff --git a/projects/sbb-esta/angular-public/src/lib/datepicker/datepicker/datepicker.component.html b/projects/sbb-esta/angular-public/src/lib/datepicker/datepicker/datepicker.component.html
index d57bde57df..adb22ec4a6 100644
--- a/projects/sbb-esta/angular-public/src/lib/datepicker/datepicker/datepicker.component.html
+++ b/projects/sbb-esta/angular-public/src/lib/datepicker/datepicker/datepicker.component.html
@@ -1,6 +1,7 @@
 <button
-  class="sbb-datepicker-arrow sbb-datepicker-arrow-left"
   *ngIf="prevDayActive"
+  type="button"
+  class="sbb-datepicker-arrow sbb-datepicker-arrow-left"
   [disabled]="disabled"
   (click)="prevDay()"
 >
@@ -9,8 +10,9 @@
 <sbb-datepicker-toggle *ngIf="toggle"></sbb-datepicker-toggle>
 <ng-content></ng-content>
 <button
-  class="sbb-datepicker-arrow sbb-datepicker-arrow-right"
   *ngIf="nextDayActive"
+  type="button"
+  class="sbb-datepicker-arrow sbb-datepicker-arrow-right"
   [disabled]="disabled"
   (click)="nextDay()"
 >
diff --git a/projects/sbb-esta/angular-public/src/lib/datepicker/datepicker/datepicker.component.ts b/projects/sbb-esta/angular-public/src/lib/datepicker/datepicker/datepicker.component.ts
index 8ade1ffb28..6c255c531e 100644
--- a/projects/sbb-esta/angular-public/src/lib/datepicker/datepicker/datepicker.component.ts
+++ b/projects/sbb-esta/angular-public/src/lib/datepicker/datepicker/datepicker.component.ts
@@ -521,27 +521,4 @@ export class DatepickerComponent<D> implements OnDestroy {
   private _getValidDateOrNull(obj: any): D | null {
     return this._dateAdapter.isDateInstance(obj) && this._dateAdapter.isValid(obj) ? obj : null;
   }
-
-  /**
-  * Manages the 2nd datepicker linked to this instance.
-  * If the 2nd datepicker has no value, its calendar will open up when filling this datepicker value.
-  private handleRangeDatepicker(beginDate: D, arrowClick: boolean = false) {
-    if (this.slave || !beginDate || !this.dateAdapter.isValid(beginDate)) {
-      return;
-    }
-
-    this.dateRange.begin = beginDate;
-    this.slave.datepickerInput.min = beginDate;
-    if (!this.slave.datepickerInput.value && !arrowClick) {
-      this.slave.open();
-    } else if (this.dateAdapter.compareDate(beginDate, this.slave.datepickerInput.value) > 0) {
-      this.slave.datepickerInput.value = null;
-      if (!arrowClick) {
-        this.slave.open();
-      }
-    } else {
-      this.dateRange.end = this.slave.datepickerInput.value;
-    }
-  }
-  */
 }
diff --git a/projects/sbb-esta/angular-public/src/lib/file-selector/file-selector/file-selector.component.html b/projects/sbb-esta/angular-public/src/lib/file-selector/file-selector/file-selector.component.html
index 85cabf8397..00aa427521 100644
--- a/projects/sbb-esta/angular-public/src/lib/file-selector/file-selector/file-selector.component.html
+++ b/projects/sbb-esta/angular-public/src/lib/file-selector/file-selector/file-selector.component.html
@@ -41,7 +41,7 @@
         }}</span
         >, {{ file | fileSizeFormatted }})</span
       >
-      <button class="sbb-file-selector-list-remove-icon" (click)="removeFile(file)">
+      <button type="button" class="sbb-file-selector-list-remove-icon" (click)="removeFile(file)">
         <span
           i18n="Hidden button label to remove a file from the selection list@@sbbFileSelectorRemoveFile"
           class="cdk-visually-hidden"
diff --git a/projects/sbb-esta/angular-public/src/lib/lightbox/lightbox/lightbox-content.ts b/projects/sbb-esta/angular-public/src/lib/lightbox/lightbox/lightbox-content.ts
index ded89eaedf..b9958fddc6 100644
--- a/projects/sbb-esta/angular-public/src/lib/lightbox/lightbox/lightbox-content.ts
+++ b/projects/sbb-esta/angular-public/src/lib/lightbox/lightbox/lightbox-content.ts
@@ -69,11 +69,12 @@ export class LightboxCloseDirective implements OnInit {
   selector: 'sbb-lightbox-header, [sbbLightboxHeader]',
   template: `
     <ng-content></ng-content>
-    <button sbbLightboxClose *ngIf="!isCloseDisabled" class="sbb-lightbox-close-btn">
+    <button type="button" sbbLightboxClose *ngIf="!isCloseDisabled" class="sbb-lightbox-close-btn">
       <sbb-icon-cross></sbb-icon-cross>
     </button>
     <button
       *ngIf="isCloseDisabled"
+      type="button"
       (click)="emitManualCloseAction()"
       class="sbb-lightbox-close-btn"
     >
diff --git a/projects/sbb-esta/angular-public/src/lib/pagination/navigation/navigation.component.html b/projects/sbb-esta/angular-public/src/lib/pagination/navigation/navigation.component.html
index bb0acbd6f0..eeb74ab02f 100644
--- a/projects/sbb-esta/angular-public/src/lib/pagination/navigation/navigation.component.html
+++ b/projects/sbb-esta/angular-public/src/lib/pagination/navigation/navigation.component.html
@@ -1,6 +1,7 @@
 <ul class="sbb-navigation">
   <li class="sbb-navigation-item sbb-navigation-item-left" *ngIf="previousPage">
     <button
+      type="button"
       i18n-aria-label="@@navigationPreviousPage"
       aria-label="Vorherige Seite"
       (click)="pageChange.emit('previous')"
@@ -16,6 +17,7 @@
   </li>
   <li class="sbb-navigation-item sbb-navigation-item-right" *ngIf="nextPage">
     <button
+      type="button"
       i18n-aria-label="@@navigationNextPage"
       aria-label="Nächste Seite"
       (click)="pageChange.emit('next')"
diff --git a/projects/sbb-esta/angular-public/src/lib/pagination/pagination/pagination.component.html b/projects/sbb-esta/angular-public/src/lib/pagination/pagination/pagination.component.html
index f2fd93c756..b9c21dce27 100644
--- a/projects/sbb-esta/angular-public/src/lib/pagination/pagination/pagination.component.html
+++ b/projects/sbb-esta/angular-public/src/lib/pagination/pagination/pagination.component.html
@@ -1,6 +1,7 @@
 <ul class="sbb-pagination">
   <li class="sbb-pagination-item">
     <button
+      type="button"
       i18n-aria-label="@@paginationPreviousPage"
       aria-label="Vorherige Seite"
       class="sbb-pagination-item-boundary"
@@ -19,6 +20,7 @@
     <ng-container *ngIf="page !== null">
       <button
         #pageButton
+        type="button"
         [attr.tabindex]="page === pageIndex ? '-1' : null"
         [class.sbb-pagination-item-selected]="page === pageIndex"
         [attr.aria-current]="page === pageIndex"
@@ -30,6 +32,7 @@
   </li>
   <li class="sbb-pagination-item">
     <button
+      type="button"
       i18n-aria-label="@@paginationNextPage"
       aria-label="Nächste Seite"
       class="sbb-pagination-item-boundary"
diff --git a/projects/sbb-esta/angular-public/src/lib/processflow/processflow/processflow.component.html b/projects/sbb-esta/angular-public/src/lib/processflow/processflow/processflow.component.html
index bc27a3a2e5..c3d8b44fcc 100644
--- a/projects/sbb-esta/angular-public/src/lib/processflow/processflow/processflow.component.html
+++ b/projects/sbb-esta/angular-public/src/lib/processflow/processflow/processflow.component.html
@@ -1,6 +1,7 @@
 <ol class="sbb-processflow-header">
   <li *ngFor="let step of steps; let i = index; let isLast = last" class="sbb-processflow-step">
     <button
+      type="button"
       [class.sbb-active]="step.active"
       [class.sbb-disabled]="step.disabled"
       [disabled]="step.disabled"
diff --git a/projects/sbb-esta/angular-public/src/lib/tabs/tabs/tabs.component.html b/projects/sbb-esta/angular-public/src/lib/tabs/tabs/tabs.component.html
index 40cde260e3..865b1ca037 100644
--- a/projects/sbb-esta/angular-public/src/lib/tabs/tabs/tabs.component.html
+++ b/projects/sbb-esta/angular-public/src/lib/tabs/tabs/tabs.component.html
@@ -7,6 +7,7 @@
     >
       <button
         #label
+        type="button"
         (click)="selectTab(tab)"
         (keyup)="onKeyUp($event)"
         role="tab"
diff --git a/projects/sbb-esta/angular-public/src/lib/textexpand/textexpand/textexpand.component.html b/projects/sbb-esta/angular-public/src/lib/textexpand/textexpand/textexpand.component.html
index 1c598464d8..755cee8404 100644
--- a/projects/sbb-esta/angular-public/src/lib/textexpand/textexpand/textexpand.component.html
+++ b/projects/sbb-esta/angular-public/src/lib/textexpand/textexpand/textexpand.component.html
@@ -1,6 +1,7 @@
 <ng-content></ng-content>
 
 <button
+  type="button"
   class="sbb-textexpand-button"
   [attr.aria-controls]="id"
   [attr.aria-expanded]="isExpanded"
diff --git a/projects/sbb-esta/angular-public/src/lib/tooltip/tooltip/tooltip.component.html b/projects/sbb-esta/angular-public/src/lib/tooltip/tooltip/tooltip.component.html
index 881dfda19d..59ae3e776d 100644
--- a/projects/sbb-esta/angular-public/src/lib/tooltip/tooltip/tooltip.component.html
+++ b/projects/sbb-esta/angular-public/src/lib/tooltip/tooltip/tooltip.component.html
@@ -14,7 +14,7 @@
     <ng-content></ng-content>
   </div>
   <div class="sbb-tooltip-shadow"></div>
-  <button class="sbb-tooltip-icon" (click)="onClick($event)">
+  <button type="button" class="sbb-tooltip-icon" (click)="onClick($event)">
     <sbb-icon-cross></sbb-icon-cross>
   </button>
 </ng-template>