From b4d694e0c0cf47fdb40a2e0f6c29847d7898f0fb Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Mon, 7 Jul 2025 19:36:16 +0200
Subject: [PATCH 1/2] 132007: Bootstrap fixes

---
 .../members-list/members-list.component.html  |  2 +-
 .../ldn-service-form.component.html           | 30 +++++++++----------
 .../ldn-services-directory.component.html     |  5 ++--
 .../admin-notify-detail-modal.component.html  |  7 ++---
 .../admin-notify-logs-result.component.html   |  2 +-
 .../filtered-items.component.html             | 24 +++++++--------
 ...-item-metadata-list-element.component.html |  2 +-
 .../confirm-email.component.html              |  6 ++--
 .../provide-email.component.html              |  6 ++--
 .../orcid-confirmation.component.html         |  8 ++---
 .../review-account-info.component.html        |  8 ++---
 .../home-news/home-news.component.html        |  2 +-
 .../home-news/home-news.component.scss        |  2 +-
 .../accessibility-settings.component.html     |  8 ++---
 ...tstream-request-a-copy-page.component.html |  4 +--
 .../item-edit-bitstream-bundle.component.html | 14 ++++-----
 .../item-operation.component.html             |  2 +-
 .../item-status/item-status.component.html    |  8 ++---
 .../quality-assurance-events.component.html   |  8 ++---
 .../project-entry-import-modal.component.html |  3 +-
 .../popup/suggestions-popup.component.html    |  5 ++--
 .../file-value-input.component.html           |  2 +-
 .../email-request-copy.component.html         |  2 +-
 .../search-navbar.component.html              |  2 +-
 src/app/shared/alert/alert.component.html     |  2 +-
 ...m-withdrawn-reinstate-modal.component.html |  8 ++---
 .../file-download-link.component.html         |  4 +--
 .../custom-switch.component.html              |  4 +--
 .../custom-switch.component.scss              | 16 ----------
 ...-lookup-relation-search-tab.component.html |  2 +-
 .../lang-switch/lang-switch.component.html    |  2 +-
 .../notification-box.component.html           |  4 +--
 .../notification/notification.component.html  |  2 +-
 .../resource-policy-entry.component.html      |  6 ++--
 .../resource-policies.component.html          |  6 ++--
 .../advanced-search.component.html            |  4 +--
 .../search-filter.component.html              |  2 +-
 .../search-label-range.component.html         |  4 +--
 .../search-label/search-label.component.html  |  2 +-
 .../subscription-modal.component.html         |  2 +-
 .../file-dropzone-no-uploader.component.html  |  2 +-
 .../view-mode-switch.component.html           |  2 +-
 .../section-duplicates.component.html         |  2 +-
 .../file/section-upload-file.component.html   |  6 ++--
 .../upload/section-upload.component.html      |  2 +-
 .../home-news/home-news.component.html        |  2 +-
 .../home-news/home-news.component.scss        |  2 +-
 47 files changed, 113 insertions(+), 137 deletions(-)

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 44a3775c05..072b836d23 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
@@ -83,7 +83,7 @@
 
   <form [formGroup]="searchForm" (ngSubmit)="search(searchForm.value)" class="d-flex justify-content-between">
     <div class="flex-grow-1 me-3">
-      <div class="form-group input-group me-3">
+      <div class="mb-3 input-group me-3">
         <input type="text" name="query" id="query" formControlName="query"
           class="form-control" aria-label="Search input">
         <span class="input-group-append">
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 e07396c5e0..92d015b25e 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
@@ -6,7 +6,7 @@
     <!-- In the toggle section -->
     @if (!isNewService) {
       <div class="toggle-switch-container">
-        <label class="status-label font-weight-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
+        <label class="status-label fw-bold" for="enabled">{{ 'ldn-service-status' | translate }}</label>
         <div>
           <input formControlName="enabled" hidden id="enabled" name="enabled" type="checkbox">
           <div (click)="toggleEnabled()" [class.checked]="formModel.get('enabled').value" class="toggle-switch">
@@ -17,7 +17,7 @@
     }
     <!-- In the Name section -->
     <div class="mb-5">
-      <label for="name" class="font-weight-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
+      <label for="name" class="fw-bold">{{ 'ldn-new-service.form.label.name' | translate }}</label>
       <input [class.invalid-field]="formModel.get('name').invalid && formModel.get('name').touched"
         [placeholder]="'ldn-new-service.form.placeholder.name' | translate" class="form-control"
         formControlName="name"
@@ -33,7 +33,7 @@
 
     <!-- In the description section -->
     <div class="mb-5 mt-5 d-flex flex-column">
-      <label for="description" class="font-weight-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
+      <label for="description" class="fw-bold">{{ 'ldn-new-service.form.label.description' | translate }}</label>
       <textarea [placeholder]="'ldn-new-service.form.placeholder.description' | translate"
       class="form-control" formControlName="description" id="description" name="description"></textarea>
     </div>
@@ -42,7 +42,7 @@
       <!-- In the url section -->
       <div class="d-flex align-items-center">
         <div class="d-flex flex-column w-50 me-2">
-          <label for="url" class="font-weight-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
+          <label for="url" class="fw-bold">{{ 'ldn-new-service.form.label.url' | translate }}</label>
           <input [class.invalid-field]="formModel.get('url').invalid && formModel.get('url').touched"
             [placeholder]="'ldn-new-service.form.placeholder.url' | translate" class="form-control"
             formControlName="url"
@@ -57,7 +57,7 @@
         </div>
 
         <div class="d-flex flex-column w-50">
-          <label for="score" class="font-weight-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
+          <label for="score" class="fw-bold">{{ 'ldn-new-service.form.label.score' | translate }}</label>
           <input [class.invalid-field]="formModel.get('score').invalid && formModel.get('score').touched"
             [placeholder]="'ldn-new-service.form.placeholder.score' | translate" formControlName="score"
             id="score"
@@ -78,7 +78,7 @@
 
     <!-- In the IP range section -->
     <div class="mb-5 mt-5">
-      <label for="lowerIp" class="font-weight-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
+      <label for="lowerIp" class="fw-bold">{{ 'ldn-new-service.form.label.ip-range' | translate }}</label>
       <div class="d-flex">
         <input [class.invalid-field]="formModel.get('lowerIp').invalid && formModel.get('lowerIp').touched"
           [placeholder]="'ldn-new-service.form.placeholder.lowerIp' | translate" class="form-control me-2"
@@ -105,7 +105,7 @@
 
     <!-- In the ldnUrl section -->
     <div class="mb-5 mt-5">
-      <label for="ldnUrl" class="font-weight-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
+      <label for="ldnUrl" class="fw-bold">{{ 'ldn-new-service.form.label.ldnUrl' | translate }}</label>
       <input [class.invalid-field]="formModel.get('ldnUrl').invalid && formModel.get('ldnUrl').touched"
         [placeholder]="'ldn-new-service.form.placeholder.ldnUrl' | translate" class="form-control"
         formControlName="ldnUrl"
@@ -130,7 +130,7 @@
 
     <!-- In the usesActorEmailId section -->
     <div class="mb-5 mt-5">
-      <label class="status-label font-weight-bold" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
+      <label class="status-label fw-bold" for="usesActorEmailId">{{ 'ldn-service-usesActorEmailId' | translate }}</label>
       <div>
         <input formControlName="usesActorEmailId" hidden id="usesActorEmailId"
                name="usesActorEmailId" type="checkbox">
@@ -149,14 +149,14 @@
     @if (areControlsInitialized) {
       <div class="row mb-1 mt-5">
         <div class="col">
-          <label class="font-weight-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
+          <label class="fw-bold">{{ 'ldn-new-service.form.label.inboundPattern' | translate }} </label>
         </div>
         @if (formModel.get('notifyServiceInboundPatterns')['controls'][0]?.value?.pattern) {
           <div class="col">
-            <label class="font-weight-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
+            <label class="fw-bold">{{ 'ldn-new-service.form.label.ItemFilter' | translate }}</label>
           </div>
           <div class="col-sm-1">
-            <label class="font-weight-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
+            <label class="fw-bold">{{ 'ldn-new-service.form.label.automatic' | translate }}</label>
           </div>
         }
         <div class="col-sm-2">
@@ -295,8 +295,8 @@
     <span (click)="addInboundPattern()"
     class="add-pattern-link mb-2">{{ 'ldn-new-service.form.label.addPattern' | translate }}</span>
     <hr>
-      <div class="form-group row">
-        <div class="col text-right space-children-mr">
+      <div class="mb-3 row">
+        <div class="col text-end space-children-mr">
           <ng-content select="[before]"></ng-content>
           <button (click)="resetFormAndLeave()" class="btn btn-outline-secondary" type="button">
             <span>&nbsp;{{ 'submission.general.back.submit' | translate }}</span>
@@ -317,9 +317,7 @@
       @if (isNewService) {
         <h4>{{'service.overview.create.modal' | translate }}</h4>
       }
-      <button (click)="closeModal()" aria-label="Close"
-        class="close" type="button">
-        <span aria-hidden="true">×</span>
+      <button (click)="closeModal()" aria-label="Close" class="btn-close" type="button">
       </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 bd156cc0af..28e592ebfc 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
@@ -77,8 +77,7 @@
       </div>
       <button (click)="closeModal()" aria-label="Close"
         [attr.aria-label]="'ldn-service-overview-close-modal' | translate"
-        class="close" type="button">
-        <span aria-hidden="true">×</span>
+        class="btn-close" type="button">
       </button>
     </div>
 
@@ -86,7 +85,7 @@
       <div>
         {{ 'service.overview.delete.body' | translate }}
       </div>
-      <div class="mt-4 text-right">
+      <div class="mt-4 text-end">
         <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>
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 3760dc341d..4aae014174 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
@@ -1,15 +1,14 @@
 <div class="modal-header">
   <h4 class="modal-title">{{'notify-message-modal.title' | translate}}</h4>
-  <button type="button" class="close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
-    <span aria-hidden="true">&times;</span>
+  <button type="button" class="btn-close" aria-label="Close" (click)="activeModal.dismiss('Cross click')">
   </button>
 </div>
 <div class="modal-body p-4">
   @for (key of notifyMessageKeys; track key) {
     <div>
       <div class="row mb-4">
-        <div class="font-weight-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
-        <div class="col text-right">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
+        <div class="fw-bold col">{{ key + '.notify-detail-modal' | translate}}</div>
+        <div class="col text-end">{{'notify-detail-modal.' + notifyMessage[key] | translate: {default: notifyMessage[key] ?? "n/a" } }}</div>
       </div>
     </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 ce394175c3..981455d743 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
@@ -1,6 +1,6 @@
 <div class="container my-4">
   <div class="row">
-    <div class="col-12 col-md-3 text-left h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
+    <div class="col-12 col-md-3 text-start h4">{{((isInbound$ | async) ? 'admin.notify.dashboard.inbound'  : 'admin.notify.dashboard.outbound') | translate}}</div>
     <div class="col-md-9">
       <div class="h4">
         @if ((selectedSearchConfig$ | async) !== defaultConfiguration) {
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 dd3f45c216..e515999003 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
@@ -15,7 +15,7 @@
                 <ds-loading></ds-loading>
               }
               @if ((loadingCollections$ | async) !== true) {
-                <select id="collSel" name="collSel" class="form-control" multiple="multiple" size="10" formControlName="collections">
+                <select id="collSel" name="collSel" class="form-select" multiple="multiple" size="10" formControlName="collections">
                   @for (item of collections; track item) {
                     <option [value]="item.id" [disabled]="item.disabled">{{item.name$ | async}}</option>
                   }
@@ -32,11 +32,11 @@
               {{'admin.reports.items.section.metadataFieldQueries' | translate}}
             </ng-template>
             <ng-template ngbPanelContent>
-              <fieldset id="predefqueries" class="form-group">
+              <fieldset id="predefqueries" class="mb-3">
                 <label>
                   {{'admin.reports.items.predefinedQueries' | translate}}
                 </label>
-                <select id="predefselect" formControlName="presetQuery" class="form-control" (change)="setPresetQuery()">
+                <select id="predefselect" formControlName="presetQuery" class="form-select" (change)="setPresetQuery()">
                   @for (item of presetQueries; track item.id) {
                     <option [value]="item.id" [selected]="item.isDefault">{{item.label | translate}}</option>
                   }
@@ -46,17 +46,17 @@
               <div id="queries">
                 @for (pred of queryPredicatesArray().controls; track pred; let i = $index) {
                   <div class="metadata">
-                    <div [formGroup]="pred" class="form-group">
-                      <div class="form-row">
+                    <div [formGroup]="pred" class="mb-3">
+                      <div class="row">
                         <div class="col-4">
-                          <select class="query-tool" formControlName="field" class="form-control">
+                          <select class="query-tool" formControlName="field" class="form-select">
                             @for (item of metadataFieldsWithAny; track item) {
                               <option [value]="item.id">{{item.name$ | async}}</option>
                             }
                           </select>
                         </div>
                         <div class="col-auto">
-                          <select class="query-tool" formControlName="operator" class="form-control">
+                          <select class="query-tool" formControlName="operator" class="form-select">
                             @for (item of predicates; track item) {
                               <option [value]="item.id">{{item.name$ | async | translate}}</option>
                             }
@@ -86,17 +86,17 @@
               {{'admin.reports.items.section.limitPaginateQueries' | translate}}
             </ng-template>
             <ng-template ngbPanelContent>
-              <div class="row align-items-center">
+              <div class="row align-items-center mb-3">
                 <label for="limit" class="col-sm-2 col-form-label">{{'admin.reports.items.limit' | translate}}:</label>
                 <div class="col-6">
-                  <select id="limit" name="limit" formControlName="pageLimit" class="form-control col-6">
+                  <select id="limit" name="limit" formControlName="pageLimit" class="form-select col-6">
                     @for (item of pageLimits; track item) {
                       <option value="{{item.id}}" [selected]="item.isDefault">{{item.name$ | async}}</option>
                     }
                   </select>
                 </div>
               </div>
-              <div class="row align-items-center">
+              <div class="row align-items-center mb-3">
                 <label for="offset" class="col-sm-2 col-form-label">{{'admin.reports.items.offset' | translate}}:</label>
                 <div class="col-6">
                   <input id="offset" name="offset" value="0" class="form-control col-6">
@@ -104,7 +104,7 @@
               </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 class="btn btn-primary col-6" (click)="submit()">{{'admin.reports.items.run' | translate}}</button>
               </div>
             </ng-template>
           </ngb-panel>
@@ -130,7 +130,7 @@
             </ng-template>
             <ng-template ngbPanelContent>
               <div id="show-fields">
-                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-control" formControlName="additionalFields">
+                <select class="query-tool" name="show_fields" multiple="multiple" size="8" class="form-select" formControlName="additionalFields">
                   @for (item of metadataFields; track item) {
                     <option [value]="item.id">{{item.name$ | async}}</option>
                   }
diff --git a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
index edb3aa7834..9c09c78c11 100644
--- a/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
+++ b/src/app/entity-groups/research-entities/metadata-representations/person/person-item-metadata-list-element.component.html
@@ -19,7 +19,7 @@
     [innerHTML]="mdRepresentation.getValue()"
   [ngbTooltip]="mdRepresentation.allMetadata(['person.jobTitle']).length > 0 ? descTemplate : null"></a>
   @if (mdRepresentation.firstMetadata('person.identifier.orcid')) {
-    <ds-orcid-badge-and-tooltip class="ml-1"
+    <ds-orcid-badge-and-tooltip class="ms-1"
       [orcid]="mdRepresentation.firstMetadata('person.identifier.orcid')"
       [authenticatedTimestamp]="mdRepresentation.firstMetadata('dspace.orcid.authenticated')">
     </ds-orcid-badge-and-tooltip>
diff --git a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html
index 98ef01da29..fc6a24df9e 100644
--- a/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html
+++ b/src/app/external-log-in/email-confirmation/confirm-email/confirm-email.component.html
@@ -3,8 +3,8 @@
 </h4>
 
 <form [formGroup]="emailForm" (ngSubmit)="submitForm()">
-  <div class="form-group">
-    <div class="form-row">
+  <div class="mb-3">
+    <div class="row">
       <div class="col-12 my-2">
         <input
           type="email"
@@ -26,7 +26,7 @@
         }
       </div>
     </div>
-    <div class="form-row">
+    <div class="row">
       <div class="col-12">
         <button type="submit" class="btn btn-lg btn-primary w-100">
           {{ "external-login.confirm.button.label" | translate }}
diff --git a/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html
index 1b89ab54b6..c438220548 100644
--- a/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html
+++ b/src/app/external-log-in/email-confirmation/provide-email/provide-email.component.html
@@ -3,8 +3,8 @@
 </h4>
 
 <form [formGroup]="emailForm" (ngSubmit)="submitForm()">
-  <div class="form-group">
-    <div class="form-row">
+  <div class="mb-3">
+    <div class="row">
       <div class="col-12 my-2">
         <input
           type="email"
@@ -26,7 +26,7 @@
         }
       </div>
     </div>
-    <div class="form-row">
+    <div class="row">
       <div class="col-12">
         <button type="submit" class="btn btn-lg btn-primary w-100">
           {{ "external-login.provide-email.button.label" | translate }}
diff --git a/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.html b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.html
index 68812b81e6..aeff07a1e7 100644
--- a/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.html
+++ b/src/app/external-log-in/registration-types/orcid-confirmation/orcid-confirmation.component.html
@@ -1,6 +1,6 @@
 <form class="form-login"
       [formGroup]="form" novalidate>
-  <label class="font-weight-bold mb-0 text-uppercase">{{ registrationData.registrationType }}</label>
+  <label class="fw-bold mb-0 text-uppercase">{{ registrationData.registrationType }}</label>
   <input [attr.aria-label]="'external-login-page.orcid-confirmation.netid.label' | translate"
          autocomplete="off"
          autofocus
@@ -9,14 +9,14 @@
          [placeholder]="'external-login-page.orcid-confirmation.netid.placeholder' | translate"
          type="text"
          [attr.data-test]="'netId' | dsBrowserOnly">
-  <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.lastname" | translate}}</label>
+  <label class="fw-bold mb-0">{{"external-login-page.orcid-confirmation.lastname" | translate}}</label>
   <input [attr.aria-label]="'external-login-page.orcid-confirmation.lastname.label' | translate"
          autocomplete="off"
          class="form-control form-control-lg position-relative mb-2"
          formControlName="lastname"
          type="text"
          [attr.data-test]="'lastname' | dsBrowserOnly">
-  <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.firstname" | translate}}</label>
+  <label class="fw-bold mb-0">{{"external-login-page.orcid-confirmation.firstname" | translate}}</label>
   <input [attr.aria-label]="'external-login-page.orcid-confirmation.firstname.label' | translate"
         autocomplete="off"
         class="form-control form-control-lg position-relative mb-2"
@@ -24,7 +24,7 @@
         type="text"
         [attr.data-test]="'firstname' | dsBrowserOnly">
   @if (registrationData?.email) {
-    <label class="font-weight-bold mb-0">{{"external-login-page.orcid-confirmation.email" | translate}}</label>
+    <label class="fw-bold mb-0">{{"external-login-page.orcid-confirmation.email" | translate}}</label>
     <input [attr.aria-label]="'external-login-page.orcid-confirmation.email.label' | translate"
           autocomplete="off"
           class="form-control form-control-lg position-relative"
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 7976ec7296..8dd11ed3d7 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
@@ -6,15 +6,15 @@
     <thead class="thead-light">
       <tr>
         <th scope="col">
-          <span class="h5 font-weight-bold">{{ 'external-login-validation.review-account-info.table.header.information' | translate }}</span>
+          <span class="h5 fw-bold">{{ 'external-login-validation.review-account-info.table.header.information' | translate }}</span>
         </th>
         <th scope="col">
-          <span class="h5 font-weight-bold">{{'external-login-validation.review-account-info.table.header.received-value' | translate }}</span>
+          <span class="h5 fw-bold">{{'external-login-validation.review-account-info.table.header.received-value' | translate }}</span>
         </th>
         <th scope="col">
-          <span class="h5 font-weight-bold">{{'external-login-validation.review-account-info.table.header.current-value' | translate }}</span>
+          <span class="h5 fw-bold">{{'external-login-validation.review-account-info.table.header.current-value' | translate }}</span>
         </th>
-        <th scope="col"><span class="h5 font-weight-bold">{{'external-login-validation.review-account-info.table.header.action' | translate }}</span></th>
+        <th scope="col"><span class="h5 fw-bold">{{'external-login-validation.review-account-info.table.header.action' | translate }}</span></th>
       </tr>
     </thead>
     <tbody>
diff --git a/src/app/home-page/home-news/home-news.component.html b/src/app/home-page/home-news/home-news.component.html
index 06656b9f5b..007c7354ad 100644
--- a/src/app/home-page/home-news/home-news.component.html
+++ b/src/app/home-page/home-news/home-news.component.html
@@ -1,4 +1,4 @@
-<div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-ncs mb-4">
+<div class="home-news-content py-4 px-2 py-sm-5 px-sm-0 mt-ncs mb-4">
   <div class="container">
     <div class="d-flex flex-wrap">
       <div>
diff --git a/src/app/home-page/home-news/home-news.component.scss b/src/app/home-page/home-news/home-news.component.scss
index 0306555522..5ef2ff60f2 100644
--- a/src/app/home-page/home-news/home-news.component.scss
+++ b/src/app/home-page/home-news/home-news.component.scss
@@ -6,7 +6,7 @@
     word-break: break-word;
 }
 
-.jumbotron {
+.home-news-content {
   background-color: var(--ds-home-news-background-color);
 }
 
diff --git a/src/app/info/accessibility-settings/accessibility-settings.component.html b/src/app/info/accessibility-settings/accessibility-settings.component.html
index 25c9d708a7..57695d588c 100644
--- a/src/app/info/accessibility-settings/accessibility-settings.component.html
+++ b/src/app/info/accessibility-settings/accessibility-settings.component.html
@@ -2,7 +2,7 @@
   <h2>{{ 'info.accessibility-settings.title' | translate }}</h2>
 
   <form>
-    <div class="form-group row">
+    <div class="mb-3 row">
       <label [for]="'disableNotificationTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.disableNotificationTimeOut.label' | translate }}
       </label>
@@ -23,7 +23,7 @@
       </div>
     </div>
 
-    <div class="form-group row">
+    <div class="mb-3 row">
       <label [for]="'notificationTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.notificationTimeOut.label' | translate }}
       </label>
@@ -50,7 +50,7 @@
       </div>
     </div>
 
-    <div class="form-group row">
+    <div class="mb-3 row">
       <label [for]="'liveRegionTimeOutInput'" class="col-sm-4 col-form-label">
         {{ 'info.accessibility-settings.liveRegionTimeOut.label' | translate }}
       </label>
@@ -77,7 +77,7 @@
     </div>
 
     <div role="group">
-      <button type="submit" (click)="saveSettings()" class="btn btn-primary mr-2">
+      <button type="submit" (click)="saveSettings()" class="btn btn-primary me-2">
         {{ 'info.accessibility-settings.submit' | translate }}
       </button>
       <button (click)="resetSettings()" class="btn btn-warning">
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 38b144b442..3ba6d00fc2 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
@@ -58,13 +58,13 @@
       <div class="row mb-4">
         <div class="col-12">
           <div>{{'bitstream-request-a-copy.allfiles.label' |translate}}</div>
-          <div class="ms-4 form-check">
+          <div class="ms-2 form-check">
             <input [className]="'form-check-input'" type="radio"
               id="allfiles-true" formControlName="allfiles" value="true">
             <label class="form-check-label"
             for="allfiles-true">{{'bitstream-request-a-copy.files-all-true.label' | translate}}</label>
           </div>
-          <div class="ms-4">
+          <div class="ms-2 form-check">
             <input [className]="'form-check-input'" type="radio"
               id="allfiles-false" formControlName="allfiles" value="false" [attr.disabled]="bitstream === undefined ? true : null ">
             <label class="form-check-label"
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 8075bc3b03..607cad0d89 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
@@ -14,7 +14,7 @@
         <table class="table" [class.mt-n1]="!isFirstTable"
           [attr.aria-label]="'item.edit.bitstreams.bundle.table.aria-label' | translate: { bundle: bundleName } ">
           <thead [class.visually-hidden]="!isFirstTable">
-            <tr class="header-row font-weight-bold">
+            <tr class="header-row fw-bold">
               <th id="name" scope="col" class="{{ columnSizes.columns[0].buildClasses() }}">
                 {{'item.edit.bitstreams.headers.name' | translate}}
               </th>
@@ -31,10 +31,10 @@
           </thead>
           <tbody cdkDropList (cdkDropListDropped)="drop($event)">
             <tr class="bundle-row">
-              <th id="{{ bundleName }}" class="span" colspan="3" scope="colgroup">
+              <th id="{{ bundleName }}" class="row-element" colspan="3" scope="colgroup">
                 {{'item.edit.bitstreams.bundle.name' | translate:{ name: bundleName } }}
               </th>
-              <td class="text-center">
+              <td class="text-center row-element">
                 <div class="btn-group">
                   <button [routerLink]="[itemPageRoute, 'bitstreams', 'new']"
                     [queryParams]="{bundle: bundle.id}"
@@ -43,9 +43,9 @@
                     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-right btn-sm p-0"
-                    placement="bottom-right">
-                    <button class="btn btn-outline-secondary" id="paginationControls" ngbDropdownToggle
+                  <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
                       [title]="'pagination.options.description' | translate"
                       [attr.aria-label]="'pagination.options.description' | translate" aria-haspopup="true"
                       aria-expanded="false">
@@ -79,7 +79,7 @@
                   (cdkDragStarted)="dragStart()" (cdkDragEnded)="dragEnd()">
                   <th class="bitstream-name row-element {{ columnSizes.columns[0].buildClasses() }}"
                     scope="row" id="{{ entry.nameStripped }}" headers="{{ bundleName }} name">
-                    <div class="drag-handle text-muted float-left p-1 mr-2 d-inline" tabindex="0" cdkDragHandle
+                    <div class="drag-handle text-muted float-start p-1 me-2 d-inline" tabindex="0" cdkDragHandle
                       (keydown.enter)="select($event, entry)" (keydown.space)="select($event, entry)" (click)="select($event, entry)">
                       <i class="fas fa-grip-vertical fa-fw"
                       [title]="'item.edit.bitstreams.edit.buttons.drag' | translate"></i>
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 4948bb282c..f5a2c6159d 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
@@ -1,5 +1,5 @@
 <div class="col-12 col-md-3 h-auto float-start d-flex action-label">
-  <span class="justify-content-center align-self-center font-weight-bold">
+  <span class="justify-content-center align-self-center fw-bold">
     {{'item.edit.tabs.status.buttons.' + operation.operationKey + '.label' | translate}}
   </span>
 </div>
diff --git a/src/app/item-page/edit-item-page/item-status/item-status.component.html b/src/app/item-page/edit-item-page/item-status/item-status.component.html
index ee3004f315..570bd6144f 100644
--- a/src/app/item-page/edit-item-page/item-status/item-status.component.html
+++ b/src/app/item-page/edit-item-page/item-status/item-status.component.html
@@ -2,7 +2,7 @@
 <div class="row">
   @for (statusKey of statusDataKeys; track statusKey) {
     <div class="w-100 pt-1">
-      <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+      <div class="col-12 col-md-3 float-start status-label fw-bold">
         {{'item.edit.tabs.status.labels.' + statusKey | translate}}:
       </div>
       <div class="col-12 col-md-9 float-start status-data" id="status-{{statusKey}}">
@@ -15,17 +15,17 @@
     <div class="w-100 pt-1">
       @if ((identifier.identifierType==='doi')) {
         <div>
-          <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+          <div class="col-12 col-md-3 float-start status-label fw-bold">
             {{identifier.identifierType.toLocaleUpperCase()}}
           </div>
-          <div class="col-12 col-md-9 float-start status-label font-weight-bold">{{identifier.value}}
+          <div class="col-12 col-md-9 float-start status-label fw-bold">{{identifier.value}}
           ({{"item.edit.identifiers.doi.status."+identifier.identifierStatus|translate}})</div>
         </div>
       }
     </div>
   }
 
-  <div class="col-12 col-md-3 float-start status-label font-weight-bold">
+  <div class="col-12 col-md-3 float-start status-label fw-bold">
     {{'item.edit.tabs.status.labels.itemPage' | translate}}:
   </div>
   <div class="col-12 col-md-9 float-start status-data" id="status-itemPage">
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 d44fb29e7d..7faca0876c 100644
--- a/src/app/notifications/qa/events/quality-assurance-events.component.html
+++ b/src/app/notifications/qa/events/quality-assurance-events.component.html
@@ -301,7 +301,7 @@
   <div class="modal-body">
     <p>{{'quality-assurance.event.accept.description' | translate}}</p>
 
-    <button class="btn btn-outline-success float-right" (click)="modal.close('do')">
+    <button class="btn btn-outline-success float-end" (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>
@@ -318,7 +318,7 @@
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.ignore.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+    <button class="btn btn-outline-danger float-end" (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>
@@ -335,7 +335,7 @@
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.reject.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+    <button class="btn btn-outline-danger float-end" (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>
@@ -352,7 +352,7 @@
   </div>
   <div class="modal-body">
     <p>{{'quality-assurance.event.undo.description' | translate}}</p>
-    <button class="btn btn-outline-danger float-right" (click)="modal.close('do')">
+    <button class="btn btn-outline-danger float-end" (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>
diff --git a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
index 36ac863cf4..63f5166dbc 100644
--- a/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
+++ b/src/app/notifications/qa/project-entry-import-modal/project-entry-import-modal.component.html
@@ -1,8 +1,7 @@
 <div class="modal-header">
   <h4 class="modal-title" id="modal-title">{{ (labelPrefix + label + '.title') | translate }}</h4>
-  <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
+  <button type="button" class="btn-close" aria-label="Close button" aria-describedby="modal-title"
     (click)="close()">
-    <span aria-hidden="true">&times;</span>
   </button>
 </div>
 <div class="modal-body">
diff --git a/src/app/notifications/suggestions/popup/suggestions-popup.component.html b/src/app/notifications/suggestions/popup/suggestions-popup.component.html
index b04d3deaef..bd7a228ac5 100644
--- a/src/app/notifications/suggestions/popup/suggestions-popup.component.html
+++ b/src/app/notifications/suggestions/popup/suggestions-popup.component.html
@@ -2,14 +2,13 @@
   <div class="notifications-wrapper position-fixed top right">
     <div class="notification alert alert-success alert-dismissible m-3 shadow" role="alert">
       <button (click)="removePopup()"
-        type="button" class="close pt-0 pe-1 pe-0 pb-0" data-dismiss="alert" aria-label="Close">
-        <span aria-hidden="true">&times;</span>
+        type="button" class="close pt-0 pe-1 pe-0 pb-0" data-bs-dismiss="alert" aria-label="Close">
       </button>
       <div class="d-flex flex-row">
         <div class="d-flex flex-column justify-content-center align-items-center">
           <div class="notification-icon d-flex justify-content-center"><i class="fas fa-2x fa-check-circle"></i></div>
         </div>
-        <div class="d-flex flex-column justify-content-center align-content-stretch text-left p-2">
+        <div class="d-flex flex-column justify-content-center align-content-stretch text-start p-2">
           @if ((suggestionsRD$ | async); as suggestions) {
             @for (suggestion of suggestions; track suggestion) {
               <ng-container class="alert alert-info">
diff --git a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
index 101df27b69..53e4e71132 100644
--- a/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
+++ b/src/app/process-page/form/process-parameters/parameter-value-input/file-value-input/file-value-input.component.html
@@ -4,7 +4,7 @@
   </span>
   <span class="file-name ms-1">{{fileObject?.name}}</span>
 </label>
-<input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control-file d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
+<input requireFile #file="ngModel" type="file" name="file-upload-{{index}}" id="file-upload-{{index}}" class="form-control d-none" [ngModel]="fileObject" (ngModelChange)="setFile($event)"/>
 @if (file.invalid && (file.dirty || file.touched)) {
   <div
     class="alert alert-danger validation-error">
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 b08e18ecb2..0b009b8d2b 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
@@ -16,7 +16,7 @@
   <!-- Display access periods if more than one was bound to input. The parent component (grant-request-copy)
        sends an empty list if the feature is not enabled or applicable to this request. -->
   @if (hasValue(validAccessPeriods$ | async) && (validAccessPeriods$ | async).length > 0) {
-    <div class="form-group">
+    <div class="mb-3">
       <label for="accessPeriod">{{ 'grant-request-copy.access-period.header' | translate }}</label>
       <div ngbDropdown class="d-block">
         <!-- Show current selected access period (defaults to first in array) -->
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
index d3148cf37f..ba7430bd18 100644
--- a/src/app/search-navbar/search-navbar.component.html
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -3,7 +3,7 @@
     <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on" class="d-flex">
       <input #searchInput [@toggleAnimation]="isExpanded" [attr.aria-label]="('nav.search' | translate)" name="query"
              formControlName="query" type="text" placeholder="{{searchExpanded ? ('nav.search' | translate) : ''}}"
-             class="d-inline-block bg-transparent position-absolute form-control dropdown-menu-right p1"
+             class="d-inline-block bg-transparent position-absolute form-control dropdown-menu-end p1"
              [class.display]="searchExpanded ? 'inline-block' : 'none'"
              [tabIndex]="searchExpanded ? 0 : -1"
              [attr.data-test]="'header-search-box' | dsBrowserOnly">
diff --git a/src/app/shared/alert/alert.component.html b/src/app/shared/alert/alert.component.html
index ae5732b25a..d761e1bdd4 100644
--- a/src/app/shared/alert/alert.component.html
+++ b/src/app/shared/alert/alert.component.html
@@ -5,7 +5,7 @@
     }
     <ng-content></ng-content>
     @if (dismissible) {
-      <button type="button" class="btn-close" data-dismiss="alert" aria-label="Close" (click)="dismiss()">
+      <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close" (click)="dismiss()">
       </button>
     }
   </div>
diff --git a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
index 7b299e8a37..65ddd16f61 100644
--- a/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
+++ b/src/app/shared/correction-suggestion/item-withdrawn-reinstate-modal.component.html
@@ -3,22 +3,20 @@
     @if (this.canWithdraw) {
       <div class="modal-header">
         {{ 'item.qa.withdrawn.modal.header' | translate }}
-        <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-          <span aria-hidden="true">×</span>
+        <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
         </button>
       </div>
     } @else {
       @if (!this.canWithdraw) {
         <div class="modal-header">
           {{'item.qa.reinstate.modal.header' | translate}}
-          <button type="button" class="close" (click)="onModalClose()" aria-label="Close">
-            <span aria-hidden="true">×</span>
+          <button type="button" class="btn-close" (click)="onModalClose()" aria-label="Close">
           </button>
         </div>
       }
     }
     <div class="modal-body">
-      <div class="form-group">
+      <div class="mb-3">
         <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary.label' | translate)
         : ('qa-reinstate.create.modal.form.summary.label' | translate) }}</label>
         <label for="reason">{{ this.canWithdraw ? ('qa-withdrawn.create.modal.form.summary2.label' | translate)
diff --git a/src/app/shared/file-download-link/file-download-link.component.html b/src/app/shared/file-download-link/file-download-link.component.html
index 422bb2ce3d..43926113f6 100644
--- a/src/app/shared/file-download-link/file-download-link.component.html
+++ b/src/app/shared/file-download-link/file-download-link.component.html
@@ -14,7 +14,7 @@
     <span role="img"
     [attr.aria-label]="'file-download-link.restricted' | translate"
     [title]="'file-download-link.restricted' | translate"
-    class="pr-1">
+    class="pe-1">
       <i class="fas fa-lock"></i>
     </span>
   } @else if ((canDownloadWithToken$ | async) && (canDownload$ | async) === false) {
@@ -22,7 +22,7 @@
     <span role="img"
     [attr.aria-label]="'file-download-link.secure-access' | translate"
     [title]="'file-download-link.secure-access' | translate"
-    class="pr-1 request-a-copy-access-icon">
+    class="pe-1 request-a-copy-access-icon">
       <i class="fa-solid fa-lock-open"></i>
     </span>
   } @else if (showIcon) {
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
index 90e8ff3060..f358b53a78 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.html
@@ -1,5 +1,5 @@
 <div [formGroup]="group" [ngClass]="getClass('element', 'container')" class="form-check custom-control form-switch" [class.disabled]="model.disabled">
-  <input type="checkbox" class="form-check-input custom-control-input"
+  <input type="checkbox" class="form-check-input form-check-input"
          [checked]="model.checked"
          [class.is-invalid]="showErrorMessages"
          [id]="id"
@@ -13,7 +13,7 @@
          (blur)="onBlur($event)"
          (change)="onChange($event)"
          (focus)="onFocus($event)"/>
-  <label class="form-check-label custom-control-label" [for]="bindId && model.id">
+  <label class="form-check-label form-check-label" [for]="bindId && model.id">
     <span [innerHTML]="model.label | translate"
           [ngClass]="[getClass('element', 'label'), getClass('grid', 'label')]"></span>
   </label>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
index 206ad17492..e69de29bb2 100644
--- a/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/custom-switch/custom-switch.component.scss
@@ -1,16 +0,0 @@
-div.custom-switch {
-  &.custom-control-right {
-    margin-left: 0;
-    margin-right: 0;
-
-    &::after {
-      right: -1.5rem;
-      left: auto;
-    }
-
-    &::before {
-      right: -2.35rem;
-      left: auto;
-    }
-  }
-}
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 b99c2f93da..8b15eb25d6 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
@@ -30,7 +30,7 @@
             <button id="resultdropdown" type="button"
               ngbDropdownToggle
               class="btn btn-outline-secondary dropdown-toggle-split"
-              data-toggle="dropdown" aria-haspopup="true"
+              data-bs-toggle="dropdown" aria-haspopup="true"
               aria-expanded="false"
               [hidden]="selectAllLoading">
               <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.toggle-dropdown' | translate) }}</span>
diff --git a/src/app/shared/lang-switch/lang-switch.component.html b/src/app/shared/lang-switch/lang-switch.component.html
index 1565974f98..3a82d7c49b 100644
--- a/src/app/shared/lang-switch/lang-switch.component.html
+++ b/src/app/shared/lang-switch/lang-switch.component.html
@@ -6,7 +6,7 @@
             aria-haspopup="menu"
             class="dropdown-toggle btn btn-link px-0"
             [title]="'nav.language' | translate"
-            (click)="$event.preventDefault()" data-toggle="dropdown" ngbDropdownToggle
+            (click)="$event.preventDefault()" data-bs-toggle="dropdown" ngbDropdownToggle
             data-test="lang-switch"
             tabindex="0">
       <i class="fas fa-globe-asia fa-lg fa-fw"></i>
diff --git a/src/app/shared/notification-box/notification-box.component.html b/src/app/shared/notification-box/notification-box.component.html
index c10e5c6649..626e51cbbf 100644
--- a/src/app/shared/notification-box/notification-box.component.html
+++ b/src/app/shared/notification-box/notification-box.component.html
@@ -7,8 +7,8 @@
     [title]="boxConfig.description | translate"
     >
     <div [ngStyle]="{'color': boxConfig.textColor}" class="d-flex flex-column justify-content-center align-items-center">
-      <div class="mb-3 font-weight-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
-      <div class="font-weight-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
+      <div class="mb-3 fw-bold box-counter">{{ boxConfig.count ?? 0 }}</div>
+      <div class="fw-bold d-flex justify-content-center w-100">{{ boxConfig.title | translate }}</div>
     </div>
   </div>
 }
diff --git a/src/app/shared/notifications/notification/notification.component.html b/src/app/shared/notifications/notification/notification.component.html
index dac3e03f7a..3135d6dda6 100644
--- a/src/app/shared/notifications/notification/notification.component.html
+++ b/src/app/shared/notifications/notification/notification.component.html
@@ -10,7 +10,7 @@
   @if (notification.options.clickToClose) {
     <button
       (click)="remove()"
-      type="button" class="btn-close pt-0 pe-1 ps-0 pb-0 mt-1 me-1" data-dismiss="alert" aria-label="Close">
+      type="button" class="btn-close pt-0 pe-1 ps-0 pb-0 mt-1 me-1" data-bs-dismiss="alert" aria-label="Close">
     </button>
   }
 
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 49f94970c5..9945c08e04 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
@@ -1,11 +1,11 @@
 <td class="text-center">
-  <div class="custom-control custom-checkbox">
+  <div>
     <input type="checkbox"
-      class="custom-control-input"
+      class="form-check-input"
       [id]="entry.id"
       [ngModel]="entry.checked"
       (ngModelChange)="this.toggleCheckbox.emit($event);">
-    <label class="custom-control-label" [for]="entry.id">
+    <label class="form-check-label" [for]="entry.id">
       <span class="sr-only">{{(entry.checked ? 'resource-policies.table.headers.deselect' : 'resource-policies.table.headers.select') | translate}}</span>
     </label>
   </div>
diff --git a/src/app/shared/resource-policies/resource-policies.component.html b/src/app/shared/resource-policies/resource-policies.component.html
index b560e25267..b839ebccfd 100644
--- a/src/app/shared/resource-policies/resource-policies.component.html
+++ b/src/app/shared/resource-policies/resource-policies.component.html
@@ -42,12 +42,12 @@
       @if ((getResourcePolicies() | async)?.length > 0) {
         <tr class="text-center">
           <th>
-            <div class="custom-control custom-checkbox">
+            <div>
               <input #selectAllBtn type="checkbox"
-                class="custom-control-input"
+                class="form-check-input"
                 [id]="'selectAll_' + resourceUUID"
                 (change)="selectAllCheckbox($event)">
-              <label class="custom-control-label" [for]="'selectAll_' + resourceUUID">
+              <label class="form-check-label" [for]="'selectAll_' + resourceUUID">
                 <span class="sr-only">{{(selectAllBtn.checked ? 'resource-policies.table.headers.deselect-all' : 'resource-policies.table.headers.select-all') | translate}}</span>
               </label>
             </div>
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 64b4a0197f..761125fb90 100644
--- a/src/app/shared/search/advanced-search/advanced-search.component.html
+++ b/src/app/shared/search/advanced-search/advanced-search.component.html
@@ -6,7 +6,7 @@
   </label>
   <select [(ngModel)]="currentFilter" (keyup.enter)="applyFilter()"
     (ngModelChange)="currentOperator = advancedFilterMap.get(currentFilter).operators[0].operator"
-    class="form-control mb-2" id="advanced-search-filters">
+    class="form-select mb-2" id="advanced-search-filters">
     @for (advancedFilter of (advancedFilters$ | async); track advancedFilter.filter) {
       <option [value]="advancedFilter.filter">
         {{ 'search.filters.filter.' + advancedFilter.filter + '.head' | translate }}
@@ -17,7 +17,7 @@
     {{ 'search.sidebar.advanced-search.operators' | translate }}
   </label>
   <select [(ngModel)]="currentOperator" (keyup.enter)="applyFilter()"
-    class="form-control mb-2" id="advanced-search-operators">
+    class="form-select mb-2" id="advanced-search-operators">
     @for (operator of advancedFilterMap.get(currentFilter)?.operators; track operator) {
       <option [value]="operator.operator">
         {{ 'search.filters.operator.' + operator.operator + '.text' | translate }}
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 d71ec2f598..e1083fc7ab 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
@@ -9,7 +9,7 @@
       role="button"
       tabindex="0"
       >
-      <span class="h4 d-inline-block text-left mt-auto mb-auto dark:text-white text-dark">
+      <span class="h4 d-inline-block text-start mt-auto mb-auto dark:text-white text-dark">
         {{'search.filters.filter.' + filter.name + '.head'| translate}}
       </span>
       <i class="filter-toggle flex-grow-1 fas p-auto"
diff --git a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
index 1eb83e071b..b0b38dd27a 100644
--- a/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
+++ b/src/app/shared/search/search-labels/search-label-range/search-label-range.component.html
@@ -6,7 +6,7 @@
     (click)="searchFilterService.minimizeAll()"
     class="badge bg-primary">
     <span class="d-flex">
-      <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
+      <span class="flex-grow-1 text-start">{{('search.filters.applied.f.' + appliedFilter.filter + '.min') | translate}}: {{ min }}</span>
       <span class="ps-1" aria-hidden="true">×</span>
     </span>
   </a>
@@ -19,7 +19,7 @@
     (click)="searchFilterService.minimizeAll()"
     class="badge bg-primary">
     <span class="d-flex">
-      <span class="flex-grow-1 text-left">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
+      <span class="flex-grow-1 text-start">{{('search.filters.applied.f.' + appliedFilter.filter + '.max') | translate}}: {{ max }}</span>
       <span class="ps-1" aria-hidden="true">×</span>
     </span>
   </a>
diff --git a/src/app/shared/search/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
index 4550d41c21..1f6e45850c 100644
--- a/src/app/shared/search/search-labels/search-label/search-label.component.html
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.html
@@ -4,7 +4,7 @@
    [queryParams]="(removeParameters$ | async)"
    (click)="searchFilterService.minimizeAll()">
   <span class="d-flex">
-    <span class="flex-grow-1 text-left">{{ ('search.filters.applied.f.' + appliedFilter.filter) | translate}}{{'search.filters.applied.operator.' + appliedFilter.operator | translate}}: {{'search.filters.' + appliedFilter.filter + '.' + appliedFilter.label | translate: { default: appliedFilter.label } }}</span>
+    <span class="flex-grow-1 text-start">{{ ('search.filters.applied.f.' + appliedFilter.filter) | translate}}{{'search.filters.applied.operator.' + appliedFilter.operator | translate}}: {{'search.filters.' + appliedFilter.filter + '.' + appliedFilter.label | translate: { default: appliedFilter.label } }}</span>
     <span class="ps-1" aria-hidden="true">×</span>
   </span>
 </a>
diff --git a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
index 0037f44092..9ecf824bba 100644
--- a/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
+++ b/src/app/shared/subscriptions/subscription-modal/subscription-modal.component.html
@@ -16,7 +16,7 @@
     <div>
       @for (subscriptionType of subscriptionForm?.controls | keyvalue; track subscriptionType) {
         <fieldset formGroupName="{{subscriptionType.key}}" class="mb-3 row">
-          <legend class="col-md-4 col-form-label float-md-left pt-0">
+          <legend class="col-md-4 col-form-label float-md-start pt-0">
             {{ 'subscriptions.modal.new-subscription-form.type.' + subscriptionType.key | translate }}:
           </legend>
           <div class="col-md-8">
diff --git a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
index 79d3b2ca90..f40fa58b94 100644
--- a/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
+++ b/src/app/shared/upload/file-dropzone-no-uploader/file-dropzone-no-uploader.component.html
@@ -23,7 +23,7 @@
     <span><i class="fas fa-cloud-upload"
     aria-hidden="true"></i> {{ ((fileObject === null || fileObject === undefined) ? dropMessageLabel : dropMessageLabelReplacement) | translate}} {{'uploader.or' | translate}}</span>
     <label class="btn btn-link m-0 p-0 ms-1">
-      <input class="form-control-file d-none" type="file" name="file-upload"
+      <input class="form-control d-none" type="file" name="file-upload"
         id="file-upload"
         (change)="handleFileInput($event)">
       {{'uploader.browse' | translate}}
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 ea79111f3e..88ee41d53b 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,4 +1,4 @@
-<div class="btn-group" data-toggle="buttons">
+<div class="btn-group" data-bs-toggle="buttons">
   @if (isToShow(viewModeEnum.ListElement)) {
     <button
       [attr.aria-current]="currentMode === viewModeEnum.ListElement"
diff --git a/src/app/submission/sections/duplicates/section-duplicates.component.html b/src/app/submission/sections/duplicates/section-duplicates.component.html
index d8c9467efe..f273540801 100644
--- a/src/app/submission/sections/duplicates/section-duplicates.component.html
+++ b/src/app/submission/sections/duplicates/section-duplicates.component.html
@@ -2,7 +2,7 @@
 Template for the detect duplicates submission section component
 @author Kim Shepherd
 -->
-<div class="text-sm-left" *ngVar="(this.getDuplicateData() | async) as data">
+<div class="text-sm-start" *ngVar="(this.getDuplicateData() | async) as data">
   @if (data?.potentialDuplicates.length === 0) {
     <div class="alert alert-success w-100">{{ 'submission.sections.duplicates.none' | translate }}</div>
   }
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 ebddd53816..1cb6aa12ca 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
@@ -2,15 +2,15 @@
   <div class="row">
     <!-- Default switch -->
     <div class="col-md-2 d-flex justify-content-center align-items-center" >
-      <div class="custom-control custom-switch">
+      <div class="form-check form-switch">
         <input
           type="checkbox"
-          class="custom-control-input"
+          class="form-check-input"
           id="primaryBitstream{{fileIndex}}"
           [disabled]="processingSaveStatus$ | async"
           [checked]="isPrimary"
           (change)="togglePrimaryBitstream($event)">
-        <label class="custom-control-label" for="primaryBitstream{{fileIndex}}">
+        <label class="form-check-label" for="primaryBitstream{{fileIndex}}">
           @if (!isPrimary) {
             <span class="sr-only">{{'submission.sections.upload.primary.make' | translate:{ fileName: fileName } }}</span>
           }
diff --git a/src/app/submission/sections/upload/section-upload.component.html b/src/app/submission/sections/upload/section-upload.component.html
index a9fd762f89..7bcfa1d242 100644
--- a/src/app/submission/sections/upload/section-upload.component.html
+++ b/src/app/submission/sections/upload/section-upload.component.html
@@ -21,7 +21,7 @@
   }
   <div class="row">
     <div class="col-md-2">
-      <span class="text-left font-weight-bold">{{ 'bitstream.edit.form.primaryBitstream.label' | translate }}</span>
+      <span class="text-start fw-bold">{{ 'bitstream.edit.form.primaryBitstream.label' | translate }}</span>
     </div>
   </div>
   <div class="row">
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.html b/src/themes/dspace/app/home-page/home-news/home-news.component.html
index 7ccf4fe74f..d98da7be07 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.html
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.html
@@ -1,6 +1,6 @@
 <div class="background-image-container mt-ncs">
   <div class="container">
-    <div class="jumbotron py-4 px-2 py-sm-5 px-sm-0 mt-0 mb-4">
+    <div class="home-news-content py-4 px-2 py-sm-5 px-sm-0 mt-0 mb-4">
       <div class="d-flex flex-wrap">
         <div>
           <h1 class="display-2">DSpace 9</h1>
diff --git a/src/themes/dspace/app/home-page/home-news/home-news.component.scss b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
index ba9d31a85b..ea24ae2264 100644
--- a/src/themes/dspace/app/home-page/home-news/home-news.component.scss
+++ b/src/themes/dspace/app/home-page/home-news/home-news.component.scss
@@ -58,7 +58,7 @@
     }
   }
 
-  .jumbotron {
+  .home-news-content {
     background-color: transparent;
   }
 

From e3b54056982e8ca120a7a99456a5fc53ef8c8eb9 Mon Sep 17 00:00:00 2001
From: Alexandre Vryghem <alexandre@atmire.com>
Date: Tue, 8 Jul 2025 11:58:35 +0200
Subject: [PATCH 2/2] 132007: Auto-fixed the ng generate
 @angular/core:control-flow issues

---
 .../browse-by-geospatial-data.component.ts    |  2 --
 .../altcha-captcha.component.ts               | 11 -------
 .../item-bitstreams.component.ts              |  4 +--
 .../orcid-page/orcid-page.component.ts        |  4 +--
 .../geospatial-item-page-field.component.ts   |  6 ++--
 .../grant-request-copy.component.ts           |  6 +---
 .../object-geospatial-map.component.ts        |  6 +---
 .../submission-form-footer.component.ts       |  8 ++---
 src/app/thumbnail/thumbnail.component.html    | 31 +++++++++----------
 src/app/thumbnail/thumbnail.component.ts      | 10 ++----
 ...rkflow-action-select-reviewer.component.ts |  6 ++--
 .../workflow-item-delete.component.ts         |  8 ++---
 .../workspaceitems-delete-page.component.ts   |  4 +--
 .../grant-request-copy.component.ts           |  6 +---
 .../submission-form-footer.component.ts       |  8 ++---
 .../app/thumbnail/thumbnail.component.ts      |  6 ++--
 .../workflow-item-delete.component.ts         |  8 ++---
 .../workspaceitems-delete-page.component.ts   |  7 +++--
 18 files changed, 56 insertions(+), 85 deletions(-)

diff --git a/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts b/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts
index 333cb28e4f..b7beef3727 100644
--- a/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts
+++ b/src/app/browse-by/browse-by-geospatial-data/browse-by-geospatial-data.component.ts
@@ -1,7 +1,6 @@
 import {
   AsyncPipe,
   isPlatformBrowser,
-  NgIf,
 } from '@angular/common';
 import {
   ChangeDetectionStrategy,
@@ -47,7 +46,6 @@ import { PaginatedSearchOptions } from '../../shared/search/models/paginated-sea
   imports: [
     AsyncPipe,
     GeospatialMapComponent,
-    NgIf,
     TranslateModule,
   ],
   standalone: true,
diff --git a/src/app/item-page/bitstreams/request-a-copy/altcha-captcha.component.ts b/src/app/item-page/bitstreams/request-a-copy/altcha-captcha.component.ts
index 2b02a233fb..0fa6185c4d 100644
--- a/src/app/item-page/bitstreams/request-a-copy/altcha-captcha.component.ts
+++ b/src/app/item-page/bitstreams/request-a-copy/altcha-captcha.component.ts
@@ -1,7 +1,3 @@
-import {
-  AsyncPipe,
-  NgIf,
-} from '@angular/common';
 import {
   Component,
   CUSTOM_ELEMENTS_SCHEMA,
@@ -11,21 +7,14 @@ import {
   Output,
 } from '@angular/core';
 import { ReactiveFormsModule } from '@angular/forms';
-import { RouterLink } from '@angular/router';
 import { TranslateModule } from '@ngx-translate/core';
 
-import { VarDirective } from '../../../shared/utils/var.directive';
-
 @Component({
   selector: 'ds-altcha-captcha',
   templateUrl: './altcha-captcha.component.html',
   imports: [
-    AsyncPipe,
-    NgIf,
     ReactiveFormsModule,
-    RouterLink,
     TranslateModule,
-    VarDirective,
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA],
   standalone: true,
diff --git a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
index 4cdb5367fa..27105b7972 100644
--- a/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
+++ b/src/app/item-page/edit-item-page/item-bitstreams/item-bitstreams.component.ts
@@ -1,6 +1,6 @@
 import {
   AsyncPipe,
-  CommonModule,
+  NgClass,
 } from '@angular/common';
 import {
   ChangeDetectorRef,
@@ -72,8 +72,8 @@ import { ItemEditBitstreamBundleComponent } from './item-edit-bitstream-bundle/i
     AlertComponent,
     AsyncPipe,
     BtnDisabledDirective,
-    CommonModule,
     ItemEditBitstreamBundleComponent,
+    NgClass,
     RouterLink,
     ThemedLoadingComponent,
     TranslateModule,
diff --git a/src/app/item-page/orcid-page/orcid-page.component.ts b/src/app/item-page/orcid-page/orcid-page.component.ts
index 857e27285e..762efb7380 100644
--- a/src/app/item-page/orcid-page/orcid-page.component.ts
+++ b/src/app/item-page/orcid-page/orcid-page.component.ts
@@ -1,5 +1,5 @@
 import {
-  CommonModule,
+  AsyncPipe,
   isPlatformBrowser,
 } from '@angular/common';
 import {
@@ -54,7 +54,7 @@ import { OrcidSyncSettingsComponent } from './orcid-sync-settings/orcid-sync-set
   styleUrls: ['./orcid-page.component.scss'],
   imports: [
     AlertComponent,
-    CommonModule,
+    AsyncPipe,
     OrcidAuthComponent,
     OrcidQueueComponent,
     OrcidSyncSettingsComponent,
diff --git a/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts b/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts
index 7e4a0b8b15..232237fbc0 100644
--- a/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts
+++ b/src/app/item-page/simple/field-components/specific-field/geospatial/geospatial-item-page-field.component.ts
@@ -1,10 +1,9 @@
-import { NgIf } from '@angular/common';
 import {
   Component,
   Input,
   OnInit,
 } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 
 import { Item } from '../../../../../core/shared/item.model';
 import {
@@ -21,8 +20,7 @@ import { ItemPageFieldComponent } from '../item-page-field.component';
   imports: [
     GeospatialMapComponent,
     MetadataFieldWrapperComponent,
-    NgIf,
-    TranslateModule,
+    TranslatePipe,
   ],
   standalone: true,
 })
diff --git a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index c548457b47..bea4c453f3 100644
--- a/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  CommonModule,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   OnInit,
@@ -49,7 +46,6 @@ import { ThemedEmailRequestCopyComponent } from '../email-request-copy/themed-em
   standalone: true,
   imports: [
     AsyncPipe,
-    CommonModule,
     FormsModule,
     RouterLink,
     ThemedEmailRequestCopyComponent,
diff --git a/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts b/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts
index b194b5e9c8..4156c92edb 100644
--- a/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts
+++ b/src/app/shared/object-geospatial-map/object-geospatial-map.component.ts
@@ -1,7 +1,4 @@
-import {
-  isPlatformBrowser,
-  NgIf,
-} from '@angular/common';
+import { isPlatformBrowser } from '@angular/common';
 import {
   ChangeDetectionStrategy,
   Component,
@@ -35,7 +32,6 @@ import { parseGeoJsonFromMetadataValue } from '../utils/geospatial.functions';
   standalone: true,
   imports: [
     GeospatialMapComponent,
-    NgIf,
   ],
 })
 
diff --git a/src/app/submission/form/footer/submission-form-footer.component.ts b/src/app/submission/form/footer/submission-form-footer.component.ts
index a6a5f2099a..5b92b7087f 100644
--- a/src/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/app/submission/form/footer/submission-form-footer.component.ts
@@ -1,4 +1,4 @@
-import { CommonModule } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import {
   Component,
   Input,
@@ -6,7 +6,7 @@ import {
   SimpleChanges,
 } from '@angular/core';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 import {
   Observable,
   of,
@@ -29,10 +29,10 @@ import { SubmissionService } from '../../submission.service';
   templateUrl: './submission-form-footer.component.html',
   standalone: true,
   imports: [
+    AsyncPipe,
     BrowserOnlyPipe,
     BtnDisabledDirective,
-    CommonModule,
-    TranslateModule,
+    TranslatePipe,
   ],
 })
 export class SubmissionFormFooterComponent implements OnChanges {
diff --git a/src/app/thumbnail/thumbnail.component.html b/src/app/thumbnail/thumbnail.component.html
index e13105431a..bbbd21eaee 100644
--- a/src/app/thumbnail/thumbnail.component.html
+++ b/src/app/thumbnail/thumbnail.component.html
@@ -1,30 +1,29 @@
 <div class="thumbnail" [class.limit-width]="limitWidth">
   @if (isLoading()) {
-  <div class="thumbnail-content outer">
-    <div class="inner">
-      <div class="centered">
-        <ds-loading [spinner]="true"></ds-loading>
+    <div class="thumbnail-content outer">
+      <div class="inner">
+        <div class="centered">
+          <ds-loading [spinner]="true"></ds-loading>
+        </div>
       </div>
     </div>
-  </div>
   }
   <!-- don't use *ngIf="!isLoading" so the thumbnail can load in while the animation is playing -->
   @if (src() !== null) {
-  <img
-    class="thumbnail-content img-fluid"
-    [ngClass]="{ 'd-none': isLoading ()}"
+    <img class="thumbnail-content img-fluid"
+         [class.d-none]="isLoading"
          [src]="src() | dsSafeUrl"
          [alt]="alt | translate"
          (error)="errorHandler()"
-         (load)="successHandler()"
-  />
-  } @if (src() === null && isLoading() === false) {
-  <div class="thumbnail-content outer">
-    <div class="inner">
-      <div class="thumbnail-placeholder centered">
-        {{ placeholder | translate }}
+         (load)="successHandler()"/>
+  }
+  @if (src() === null && isLoading() === false) {
+    <div class="thumbnail-content outer">
+      <div class="inner">
+        <div class="thumbnail-placeholder centered">
+          {{ placeholder | translate }}
+        </div>
       </div>
     </div>
-  </div>
   }
 </div>
diff --git a/src/app/thumbnail/thumbnail.component.ts b/src/app/thumbnail/thumbnail.component.ts
index d0fb308adf..295902231f 100644
--- a/src/app/thumbnail/thumbnail.component.ts
+++ b/src/app/thumbnail/thumbnail.component.ts
@@ -1,7 +1,4 @@
-import {
-  CommonModule,
-  isPlatformBrowser,
-} from '@angular/common';
+import { isPlatformBrowser } from '@angular/common';
 import {
   Component,
   Inject,
@@ -12,7 +9,7 @@ import {
   SimpleChanges,
   WritableSignal,
 } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 import { of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 
@@ -40,10 +37,9 @@ import { SafeUrlPipe } from '../shared/utils/safe-url-pipe';
   templateUrl: './thumbnail.component.html',
   standalone: true,
   imports: [
-    CommonModule,
     SafeUrlPipe,
     ThemedLoadingComponent,
-    TranslateModule,
+    TranslatePipe,
   ],
 })
 export class ThumbnailComponent implements OnChanges {
diff --git a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
index b14feb2f22..f5134d19f0 100644
--- a/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
+++ b/src/app/workflowitems-edit-page/advanced-workflow-action/advanced-workflow-action-select-reviewer/advanced-workflow-action-select-reviewer.component.ts
@@ -1,6 +1,7 @@
 import {
-  CommonModule,
+  AsyncPipe,
   Location,
+  NgClass,
 } from '@angular/common';
 import {
   Component,
@@ -44,8 +45,9 @@ export const ADVANCED_WORKFLOW_ACTION_SELECT_REVIEWER = 'selectrevieweraction';
   templateUrl: './advanced-workflow-action-select-reviewer.component.html',
   styleUrls: ['./advanced-workflow-action-select-reviewer.component.scss'],
   imports: [
-    CommonModule,
+    AsyncPipe,
     ModifyItemOverviewComponent,
+    NgClass,
     ReviewersListComponent,
     TranslateModule,
   ],
diff --git a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 1a30d0cedf..67908b4fb1 100644
--- a/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -1,5 +1,5 @@
 import {
-  CommonModule,
+  AsyncPipe,
   Location,
 } from '@angular/common';
 import { Component } from '@angular/core';
@@ -8,7 +8,7 @@ import {
   Router,
 } from '@angular/router';
 import {
-  TranslateModule,
+  TranslatePipe,
   TranslateService,
 } from '@ngx-translate/core';
 import { Observable } from 'rxjs';
@@ -30,9 +30,9 @@ import { WorkflowItemActionPageDirective } from '../workflow-item-action-page.co
   templateUrl: '../workflow-item-action-page.component.html',
   standalone: true,
   imports: [
-    CommonModule,
+    AsyncPipe,
     ModifyItemOverviewComponent,
-    TranslateModule,
+    TranslatePipe,
     VarDirective,
   ],
 })
diff --git a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
index 41e0d5f051..79d002dbec 100644
--- a/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
+++ b/src/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
@@ -1,5 +1,5 @@
 import {
-  CommonModule,
+  AsyncPipe,
   Location,
 } from '@angular/common';
 import {
@@ -42,7 +42,7 @@ import { NotificationsService } from '../../shared/notifications/notifications.s
   templateUrl: './workspaceitems-delete-page.component.html',
   styleUrls: ['./workspaceitems-delete-page.component.scss'],
   imports: [
-    CommonModule,
+    AsyncPipe,
     ModifyItemOverviewComponent,
     TranslateModule,
   ],
diff --git a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
index a128a99ee4..455173cfd6 100644
--- a/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
+++ b/src/themes/custom/app/request-copy/grant-request-copy/grant-request-copy.component.ts
@@ -1,7 +1,4 @@
-import {
-  AsyncPipe,
-  CommonModule,
-} from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { RouterLink } from '@angular/router';
@@ -21,7 +18,6 @@ import { VarDirective } from '../../../../../app/shared/utils/var.directive';
   standalone: true,
   imports: [
     AsyncPipe,
-    CommonModule,
     FormsModule,
     RouterLink,
     ThemedEmailRequestCopyComponent,
diff --git a/src/themes/custom/app/submission/form/footer/submission-form-footer.component.ts b/src/themes/custom/app/submission/form/footer/submission-form-footer.component.ts
index 346a122b13..0dcea30d8c 100644
--- a/src/themes/custom/app/submission/form/footer/submission-form-footer.component.ts
+++ b/src/themes/custom/app/submission/form/footer/submission-form-footer.component.ts
@@ -1,6 +1,6 @@
-import { CommonModule } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 
 import { BtnDisabledDirective } from '../../../../../../app/shared/btn-disabled.directive';
 import { BrowserOnlyPipe } from '../../../../../../app/shared/utils/browser-only.pipe';
@@ -14,10 +14,10 @@ import { SubmissionFormFooterComponent as BaseComponent } from '../../../../../.
   templateUrl: '../../../../../../app/submission/form/footer/submission-form-footer.component.html',
   standalone: true,
   imports: [
+    AsyncPipe,
     BrowserOnlyPipe,
     BtnDisabledDirective,
-    CommonModule,
-    TranslateModule,
+    TranslatePipe,
   ],
 })
 export class SubmissionFormFooterComponent extends BaseComponent {
diff --git a/src/themes/custom/app/thumbnail/thumbnail.component.ts b/src/themes/custom/app/thumbnail/thumbnail.component.ts
index 65da2c4c50..5bc2dcf50a 100644
--- a/src/themes/custom/app/thumbnail/thumbnail.component.ts
+++ b/src/themes/custom/app/thumbnail/thumbnail.component.ts
@@ -1,6 +1,5 @@
-import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 
 import { ThemedLoadingComponent } from '../../../../app/shared/loading/themed-loading.component';
 import { SafeUrlPipe } from '../../../../app/shared/utils/safe-url-pipe';
@@ -14,10 +13,9 @@ import { ThumbnailComponent as BaseComponent } from '../../../../app/thumbnail/t
   templateUrl: '../../../../app/thumbnail/thumbnail.component.html',
   standalone: true,
   imports: [
-    CommonModule,
     SafeUrlPipe,
     ThemedLoadingComponent,
-    TranslateModule,
+    TranslatePipe,
   ],
 })
 export class ThumbnailComponent extends BaseComponent {
diff --git a/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
index 9105ef9f30..74911cf0b2 100644
--- a/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
+++ b/src/themes/custom/app/workflowitems-edit-page/workflow-item-delete/workflow-item-delete.component.ts
@@ -1,6 +1,6 @@
-import { CommonModule } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
-import { TranslateModule } from '@ngx-translate/core';
+import { TranslatePipe } from '@ngx-translate/core';
 
 import { ModifyItemOverviewComponent } from '../../../../../app/item-page/edit-item-page/modify-item-overview/modify-item-overview.component';
 import { VarDirective } from '../../../../../app/shared/utils/var.directive';
@@ -13,9 +13,9 @@ import { WorkflowItemDeleteComponent as BaseComponent } from '../../../../../app
   templateUrl: '../../../../../app/workflowitems-edit-page/workflow-item-action-page.component.html',
   standalone: true,
   imports: [
-    CommonModule,
+    AsyncPipe,
     ModifyItemOverviewComponent,
-    TranslateModule,
+    TranslatePipe,
     VarDirective,
   ],
 })
diff --git a/src/themes/custom/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts b/src/themes/custom/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
index 91d1c05add..498884f469 100644
--- a/src/themes/custom/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
+++ b/src/themes/custom/app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.ts
@@ -1,4 +1,4 @@
-import { CommonModule } from '@angular/common';
+import { AsyncPipe } from '@angular/common';
 import { Component } from '@angular/core';
 import { TranslateModule } from '@ngx-translate/core';
 
@@ -7,10 +7,13 @@ import { WorkspaceItemsDeletePageComponent as BaseComponent } from '../../../../
 
 @Component({
   selector: 'ds-themed-workspaceitems-delete-page',
+  // styleUrls: ['./workspaceitems-delete-page.component.scss'],
+  styleUrls: ['../../../../../app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.scss'],
+  // templateUrl: './workspaceitems-delete-page.component.html',
   templateUrl: '../../../../../app/workspaceitems-edit-page/workspaceitems-delete-page/workspaceitems-delete-page.component.html',
   standalone: true,
   imports: [
-    CommonModule,
+    AsyncPipe,
     ModifyItemOverviewComponent,
     TranslateModule,
   ],