diff --git a/projects/angular-formio/grid/src/form/FormGridFooter.component.html b/projects/angular-formio/grid/src/form/FormGridFooter.component.html
index 5e5bedb4..6b92ed87 100644
--- a/projects/angular-formio/grid/src/form/FormGridFooter.component.html
+++ b/projects/angular-formio/grid/src/form/FormGridFooter.component.html
@@ -11,7 +11,7 @@
   <tr>
     <td *ngIf="header" [colSpan]="header.numHeaders">
       <button *ngIf="actionAllowed('formCreate')" class="btn btn-primary form-btn-use float-start" (click)="createItem.emit('form')"><em class="fa fa-plus bi bi-plus-lg"></em> {{ createText }}</button>
-      <span class="pull-right item-counter"><span class="page-num">{{ body.firstItem }} - {{ body.lastItem }}</span> / {{ body.total }} total</span>
+      <span class="pull-right float-end item-counter"><span class="page-num">{{ body.firstItem }} - {{ body.lastItem }}</span> / {{ body.total }} total</span>
       <span [attr.aria-label]="label" role="navigation">
         <pagination [totalItems]="body.total" [itemsPerPage]="body.limit" [(ngModel)]="body.skip" (pageChanged)="pageChanged.emit($event)" [maxSize]="size" class="justify-content-center pagination-sm">
         </pagination>
diff --git a/projects/angular-formio/manager/src/submission/submission/submission.component.html b/projects/angular-formio/manager/src/submission/submission/submission.component.html
index d841be5e..208b7349 100644
--- a/projects/angular-formio/manager/src/submission/submission/submission.component.html
+++ b/projects/angular-formio/manager/src/submission/submission/submission.component.html
@@ -1,4 +1,4 @@
-<a *ngIf="downloadUrl" [href]="downloadUrl" target="_blank" class="pull-right"><img src="https://pro.formview.io/assets/pdf.png" alt="pdfImage" style="height: 2em;" /></a>
+<a *ngIf="downloadUrl" [href]="downloadUrl" target="_blank" class="pull-right float-end"><img src="https://pro.formview.io/assets/pdf.png" alt="pdfImage" style="height: 2em;" /></a>
 <ul aria-label="Submission" role="navigation" class="nav nav-tabs" style="margin-bottom:10px">
   <li class="nav-item"><a class="nav-link" routerLink="../"><em class="fa fa-chevron-left bi bi-chevron-left"></em></a></li>
   <li class="nav-item" routerLinkActive="active"><a class="nav-link" routerLink="view" routerLinkActive="active"><em class="fa fa-eye bi bi-eye"></em> View</a></li>