diff --git a/src/app/features/auth/pages/sign-up/sign-up.component.html b/src/app/features/auth/pages/sign-up/sign-up.component.html
index 8f44b82aa..e24464c60 100644
--- a/src/app/features/auth/pages/sign-up/sign-up.component.html
+++ b/src/app/features/auth/pages/sign-up/sign-up.component.html
@@ -4,11 +4,17 @@ <h2>{{ 'auth.signUp.title' | translate }}</h2>
 
     <form [formGroup]="signUpForm" (ngSubmit)="onSubmit()">
       <div class="btn-group">
-        <p-button [label]="'auth.signUp.social.orcid' | translate" class="btn-icon-text btn-full-width">
+        <p-button class="btn-full-width" [label]="'auth.signUp.social.orcid' | translate" variant="text" raised>
           <img ngSrc="assets/images/orcid.svg" alt="Orchid icon" height="20" width="20" />
         </p-button>
-        <p-button [label]="'auth.signUp.social.institution' | translate" class="btn-icon-text btn-full-width">
-          <i class="osf-icon-institutions"></i>
+
+        <p-button
+          class="btn-full-width"
+          [label]="'auth.signUp.social.institution' | translate"
+          variant="text"
+          raised
+          icon="fas fa-landmark fa-lg"
+        >
         </p-button>
       </div>
 
diff --git a/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts b/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts
index b4524bce7..2d8a090ac 100644
--- a/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts
+++ b/src/app/features/collections/components/collections-main-content/collections-main-content.component.ts
@@ -19,7 +19,6 @@ import { CollectionsSearchResultsComponent } from '../collections-search-results
 
 @Component({
   selector: 'osf-collections-main-content',
-  standalone: true,
   imports: [
     NgOptimizedImage,
     Select,
diff --git a/src/app/features/moderation/components/collection-moderators-list/collection-moderators-list.component.html b/src/app/features/moderation/components/collection-moderators-list/collection-moderators-list.component.html
index 02cb0065f..591d85b4f 100644
--- a/src/app/features/moderation/components/collection-moderators-list/collection-moderators-list.component.html
+++ b/src/app/features/moderation/components/collection-moderators-list/collection-moderators-list.component.html
@@ -78,7 +78,7 @@
           </div>
         </td>
         <td>
-          <p-button variant="text" [severity]="'danger'" icon="fas fa-trash" (click)="removeModerator(item)">
+          <p-button class="danger-icon-btn" icon="fas fa-trash" severity="danger" text (click)="removeModerator(item)">
           </p-button>
         </td>
       </tr>
diff --git a/src/app/features/project/contributors/components/contributors-list/contributors-list.component.html b/src/app/features/project/contributors/components/contributors-list/contributors-list.component.html
index 60fedef2d..1453eaa9e 100644
--- a/src/app/features/project/contributors/components/contributors-list/contributors-list.component.html
+++ b/src/app/features/project/contributors/components/contributors-list/contributors-list.component.html
@@ -19,7 +19,7 @@
       <th>
         <div class="flex align-items-center">
           <span>{{ 'project.contributors.table.headers.permissions' | translate }}</span>
-          <i class="osf-icon-information blue-icon ml-1" [pTooltip]="permissionsTooltip" tooltipPosition="top"></i>
+          <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="permissionsTooltip" tooltipPosition="top"></i>
           <ng-template #permissionsTooltip>
             <div class="flex flex-column row-gap-3">
               <h2>{{ 'project.contributors.permissionInfo.title' | translate }}</h2>
@@ -57,7 +57,7 @@ <h2>{{ 'project.contributors.permissionInfo.title' | translate }}</h2>
       <th>
         <div class="flex align-items-center justify-content-center">
           <span>{{ 'project.contributors.table.headers.contributor' | translate }}</span>
-          <i class="osf-icon-information blue-icon ml-1" [pTooltip]="contributorTooltip" tooltipPosition="top"></i>
+          <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="contributorTooltip" tooltipPosition="top"></i>
           <ng-template #contributorTooltip>
             <div class="flex flex-column row-gap-3">
               <h2>{{ 'project.contributors.bibliographicContributorInfo.heading' | translate }}</h2>
@@ -73,7 +73,7 @@ <h2>{{ 'project.contributors.bibliographicContributorInfo.heading' | translate }
       <th>
         <div class="flex align-items-center justify-content-center">
           <span>{{ 'project.contributors.table.headers.curator' | translate }}</span>
-          <i class="osf-icon-information blue-icon ml-1" [pTooltip]="curatorTooltip" tooltipPosition="top"></i>
+          <i class="fas fa-circle-info blue-icon ml-1" [pTooltip]="curatorTooltip" tooltipPosition="top"></i>
           <ng-template #curatorTooltip>
             <div class="flex flex-column row-gap-3">
               <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
@@ -148,7 +148,13 @@ <h2>{{ 'project.contributors.curatorInfo.heading' | translate }}</h2>
           </div>
         </td>
         <td>
-          <p-button variant="text" [severity]="'danger'" icon="fas fa-trash" (click)="removeContributor(contributor)">
+          <p-button
+            class="danger-icon-btn"
+            icon="fas fa-trash"
+            severity="danger"
+            text
+            (click)="removeContributor(contributor)"
+          >
           </p-button>
         </td>
       </tr>
diff --git a/src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html b/src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html
index dca09e02d..135c3e6b5 100644
--- a/src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html
+++ b/src/app/features/project/contributors/components/create-view-link-dialog/create-view-link-dialog.component.html
@@ -55,7 +55,7 @@
       class="w-full"
       styleClass="w-full"
       (click)="dialogRef.close()"
-      [text]="true"
+      text
       severity="info"
       [label]="'project.contributors.addDialog.cancel' | translate"
     ></p-button>
diff --git a/src/app/features/project/contributors/contributors.component.html b/src/app/features/project/contributors/contributors.component.html
index 130383454..581e756be 100644
--- a/src/app/features/project/contributors/contributors.component.html
+++ b/src/app/features/project/contributors/contributors.component.html
@@ -75,7 +75,7 @@ <h1 class="py-5 px-3 md:px-5 xl:px-4">{{ 'navigation.project.contributors' | tra
         class="w-3"
         styleClass="w-full"
         (click)="cancel()"
-        [text]="true"
+        text
         severity="info"
         [label]="'common.buttons.cancel' | translate"
       >
diff --git a/src/app/features/project/files/components/file-detail/components/file-metadata/file-metadata.component.ts b/src/app/features/project/files/components/file-detail/components/file-metadata/file-metadata.component.ts
index d733d1cbe..98870b892 100644
--- a/src/app/features/project/files/components/file-detail/components/file-metadata/file-metadata.component.ts
+++ b/src/app/features/project/files/components/file-detail/components/file-metadata/file-metadata.component.ts
@@ -18,7 +18,6 @@ import { LANGUAGES, RESOURCE_TYPES } from '../../constants/files-details.constan
 
 @Component({
   selector: 'osf-file-metadata',
-  standalone: true,
   imports: [Button, Dialog, InputText, Select, FormsModule, ReactiveFormsModule, Skeleton, TranslateModule],
   templateUrl: './file-metadata.component.html',
   styleUrl: './file-metadata.component.scss',
diff --git a/src/app/features/project/files/components/file-detail/components/project-metadata/project-metadata.component.ts b/src/app/features/project/files/components/file-detail/components/project-metadata/project-metadata.component.ts
index f7832a276..a9dbe65b1 100644
--- a/src/app/features/project/files/components/file-detail/components/project-metadata/project-metadata.component.ts
+++ b/src/app/features/project/files/components/file-detail/components/project-metadata/project-metadata.component.ts
@@ -9,7 +9,6 @@ import { ProjectFilesSelectors } from '@osf/features/project/files/store';
 
 @Component({
   selector: 'osf-project-metadata',
-  standalone: true,
   imports: [DatePipe, TranslateModule],
   templateUrl: './project-metadata.component.html',
   styleUrl: './project-metadata.component.scss',
diff --git a/src/app/features/project/files/components/move-file-dialog/move-file-dialog.component.html b/src/app/features/project/files/components/move-file-dialog/move-file-dialog.component.html
index 010b5a3b3..dd0674e0d 100644
--- a/src/app/features/project/files/components/move-file-dialog/move-file-dialog.component.html
+++ b/src/app/features/project/files/components/move-file-dialog/move-file-dialog.component.html
@@ -57,12 +57,7 @@ <h3 class="font-normal text-no-transform">{{ 'project.files.emptyState' | transl
 }
 
 <div class="flex gap-2 ml-auto">
-  <p-button
-    (click)="dialogRef.close()"
-    [text]="true"
-    severity="info"
-    [label]="'common.buttons.cancel' | translate"
-  ></p-button>
+  <p-button (click)="dialogRef.close()" text severity="info" [label]="'common.buttons.cancel' | translate"></p-button>
 
   @if (this.config.data.action === 'move') {
     <p-button
diff --git a/src/app/features/project/files/project-files.component.html b/src/app/features/project/files/project-files.component.html
index 4849b332b..f3335c04a 100644
--- a/src/app/features/project/files/project-files.component.html
+++ b/src/app/features/project/files/project-files.component.html
@@ -300,9 +300,10 @@
 
             <p-button
               size="small"
-              severity="secondary"
-              class="btn-icon-text"
-              icon="pi pi-ellipsis-v"
+              severity="contrast"
+              variant="text"
+              raised
+              icon="fas fa-ellipsis-v"
               (click)="menu.toggle($event)"
             ></p-button>
           </div>
diff --git a/src/app/features/project/overview/components/linked-projects/linked-projects.component.html b/src/app/features/project/overview/components/linked-projects/linked-projects.component.html
index 732d95773..89b51d278 100644
--- a/src/app/features/project/overview/components/linked-projects/linked-projects.component.html
+++ b/src/app/features/project/overview/components/linked-projects/linked-projects.component.html
@@ -16,8 +16,13 @@ <h2 class="flex gap-2">
                 <a class="linked-project-title" [href]="'my-projects/' + linkedProject.id">{{ linkedProject.title }}</a>
               </h2>
               <div>
-                <p-button class="btn-icon" (click)="componentActionMenu.toggle($event)">
-                  <i class="osf-icon-dots"></i>
+                <p-button
+                  severity="contrast"
+                  variant="text"
+                  raised
+                  icon="fas fa-ellipsis-v"
+                  (click)="componentActionMenu.toggle($event)"
+                >
                 </p-button>
 
                 <p-menu appendTo="body" #componentActionMenu popup>
diff --git a/src/app/features/project/settings/mappers/view-only-links.mapper.ts b/src/app/features/project/settings/mappers/view-only-links.mapper.ts
index e2270ccb5..2726cd954 100644
--- a/src/app/features/project/settings/mappers/view-only-links.mapper.ts
+++ b/src/app/features/project/settings/mappers/view-only-links.mapper.ts
@@ -10,8 +10,8 @@ export class ViewOnlyLinksMapper {
       name: item.attributes.name,
       anonymous: item.attributes.anonymous,
       creator: {
-        fullName: item.relationships.creator.data?.id ?? '',
-        url: item.relationships.creator.links.related.href,
+        id: item.embeds.creator.data.id,
+        fullName: item.embeds.creator.data.attributes.full_name ?? '',
       },
       nodes: [],
     }));
@@ -36,8 +36,8 @@ export class ViewOnlyLinksMapper {
       name: item.attributes.name,
       anonymous: item.attributes.anonymous,
       creator: {
-        fullName: item.relationships.creator.data?.id ?? '',
-        url: item.relationships.creator.links.related.href,
+        id: item.embeds.creator.data.id,
+        fullName: item.embeds.creator.data.attributes.full_name ?? '',
       },
       nodes: [],
     };
diff --git a/src/app/features/project/settings/models/view-only-link-response.model.ts b/src/app/features/project/settings/models/view-only-link-response.model.ts
index 6b96537a5..5692975e1 100644
--- a/src/app/features/project/settings/models/view-only-link-response.model.ts
+++ b/src/app/features/project/settings/models/view-only-link-response.model.ts
@@ -1,3 +1,5 @@
+import { UserGetResponse } from '@osf/core/models';
+
 export interface ViewOnlyLinksResponseModel {
   data: ViewOnlyLink[];
   links: PaginationLinks;
@@ -15,6 +17,11 @@ export interface ViewOnlyLink {
     anonymous: boolean;
     name: string;
   };
+  embeds: {
+    creator: {
+      data: UserGetResponse;
+    };
+  };
   relationships: {
     creator: {
       links: {
diff --git a/src/app/features/project/settings/models/view-only-link.model.ts b/src/app/features/project/settings/models/view-only-link.model.ts
index e377fe11d..fa84b83c5 100644
--- a/src/app/features/project/settings/models/view-only-link.model.ts
+++ b/src/app/features/project/settings/models/view-only-link.model.ts
@@ -1,6 +1,6 @@
 export interface ViewOnlyLinkCreatorModel {
+  id: string;
   fullName: string;
-  url: string;
 }
 
 export interface ViewOnlyLinkNodeModel {
diff --git a/src/app/features/project/settings/pipes/notification-description.pipe.ts b/src/app/features/project/settings/pipes/notification-description.pipe.ts
index cef2d524b..8322ae5a3 100644
--- a/src/app/features/project/settings/pipes/notification-description.pipe.ts
+++ b/src/app/features/project/settings/pipes/notification-description.pipe.ts
@@ -6,7 +6,6 @@ import { SubscriptionEvent, SubscriptionFrequency } from '@shared/enums';
 
 @Pipe({
   name: 'notificationDescription',
-  standalone: true,
 })
 export class NotificationDescriptionPipe implements PipeTransform {
   constructor(private translate: TranslateService) {}
diff --git a/src/app/features/project/settings/services/view-only-links.service.ts b/src/app/features/project/settings/services/view-only-links.service.ts
index b9a740b4e..bbc0f510e 100644
--- a/src/app/features/project/settings/services/view-only-links.service.ts
+++ b/src/app/features/project/settings/services/view-only-links.service.ts
@@ -16,16 +16,19 @@ export class ViewOnlyLinksService {
   private readonly jsonApiService = inject(JsonApiService);
 
   getViewOnlyLinksData(projectId: string): Observable<PaginatedViewOnlyLinksModel> {
+    const params: Record<string, unknown> = { embed: 'creator' };
+
     return this.jsonApiService
-      .get<ViewOnlyLinksResponseModel>(`${environment.apiUrl}/nodes/${projectId}/view_only_links`)
+      .get<ViewOnlyLinksResponseModel>(`${environment.apiUrl}/nodes/${projectId}/view_only_links`, params)
       .pipe(map((response) => ViewOnlyLinksMapper.fromResponse(response, projectId)));
   }
 
   createViewOnlyLink(projectId: string, payload: ViewOnlyLink): Observable<PaginatedViewOnlyLinksModel> {
+    const data = { data: { ...payload } };
+    const params: Record<string, unknown> = { embed: 'creator' };
+
     return this.jsonApiService
-      .post<ViewOnlyLink>(`${environment.apiUrl}/nodes/${projectId}/view_only_links/`, {
-        data: { ...payload },
-      })
+      .post<ViewOnlyLink>(`${environment.apiUrl}/nodes/${projectId}/view_only_links/`, data, params)
       .pipe(map((response) => ViewOnlyLinksMapper.fromSingleResponse(response, projectId)));
   }
 
diff --git a/src/app/features/project/settings/settings.component.html b/src/app/features/project/settings/settings.component.html
index 6bda0ffe7..6209cad4a 100644
--- a/src/app/features/project/settings/settings.component.html
+++ b/src/app/features/project/settings/settings.component.html
@@ -78,8 +78,7 @@ <h3 class="text-xl pb-4">{{ 'myProjects.settings.projectAffiliation' | translate
                   <p>{{ affiliation }}</p>
                 </div>
 
-                <p-button ariaLabel="Delete affiliation" icon="osf-icon-trash" class="btn-icon-text icon-copy-btn">
-                </p-button>
+                <p-button class="danger-icon-btn" icon="fas fa-trash" severity="danger" text></p-button>
               </div>
             }
           </div>
diff --git a/src/app/features/project/settings/store/settings.state.ts b/src/app/features/project/settings/store/settings.state.ts
index 5d4741d93..bd4c56569 100644
--- a/src/app/features/project/settings/store/settings.state.ts
+++ b/src/app/features/project/settings/store/settings.state.ts
@@ -212,6 +212,11 @@ export class SettingsState {
   @Action(CreateViewOnlyLink)
   createViewOnlyLink(ctx: StateContext<SettingsStateModel>, action: CreateViewOnlyLink) {
     const state = ctx.getState();
+
+    ctx.patchState({
+      viewOnlyLinks: { ...state.viewOnlyLinks, isLoading: true, error: null },
+    });
+
     return this.viewOnlyLinksService.createViewOnlyLink(action.projectId, action.payload).pipe(
       tap((data: PaginatedViewOnlyLinksModel) => {
         ctx.patchState({
@@ -231,6 +236,12 @@ export class SettingsState {
 
   @Action(DeleteViewOnlyLink)
   deleteViewOnlyLink(ctx: StateContext<SettingsStateModel>, action: DeleteViewOnlyLink) {
+    const state = ctx.getState();
+
+    ctx.patchState({
+      viewOnlyLinks: { ...state.viewOnlyLinks, isLoading: true, error: null },
+    });
+
     return this.viewOnlyLinksService.deleteLink(action.projectId, action.linkId).pipe(
       tap(() => {
         ctx.setState(
diff --git a/src/app/features/project/wiki/components/wiki-list/wiki-list.component.html b/src/app/features/project/wiki/components/wiki-list/wiki-list.component.html
index f61388b66..d3e9340ac 100644
--- a/src/app/features/project/wiki/components/wiki-list/wiki-list.component.html
+++ b/src/app/features/project/wiki/components/wiki-list/wiki-list.component.html
@@ -19,7 +19,14 @@
             outlined
             (click)="openAddWikiDialog()"
           />
-          <p-button icon="fas fa-backward" severity="contrast" raised outlined (click)="collapseNavigation()">
+          <p-button
+            class="btn-icon-only"
+            icon="fas fa-backward"
+            severity="contrast"
+            raised
+            outlined
+            (click)="collapseNavigation()"
+          >
           </p-button>
         </div>
         @if (!isHomeWikiSelected() || !list().length) {
@@ -67,7 +74,14 @@ <h4 class="ml-2">{{ item.label }}</h4>
           <i class="fas fa-forward"></i>
         </p-button>
       </div>
-      <p-button icon="fas fa-plus" raised outlined severity="success" (click)="openAddWikiDialog()" />
+      <p-button
+        class="btn-icon-only"
+        icon="fas fa-plus"
+        raised
+        outlined
+        severity="success"
+        (click)="openAddWikiDialog()"
+      />
     }
   }
 </div>
diff --git a/src/app/features/settings/account-settings/components/deactivate-account/components/cancel-deactivation/cancel-deactivation.component.html b/src/app/features/settings/account-settings/components/deactivate-account/components/cancel-deactivation/cancel-deactivation.component.html
index 239af46f3..8a8bcea7b 100644
--- a/src/app/features/settings/account-settings/components/deactivate-account/components/cancel-deactivation/cancel-deactivation.component.html
+++ b/src/app/features/settings/account-settings/components/deactivate-account/components/cancel-deactivation/cancel-deactivation.component.html
@@ -13,7 +13,7 @@ <h3 class="account-setting-description">
       class="w-full"
       styleClass="w-full"
       (click)="dialogRef.close()"
-      [text]="true"
+      text
       severity="info"
       [label]="'settings.accountSettings.deactivateAccount.cancelDeactivation.buttons.cancel' | translate"
     ></p-button>
diff --git a/src/app/features/settings/account-settings/components/deactivate-account/components/deactivation-warning/deactivation-warning.component.html b/src/app/features/settings/account-settings/components/deactivate-account/components/deactivation-warning/deactivation-warning.component.html
index 017d79bc6..ec2ce6dae 100644
--- a/src/app/features/settings/account-settings/components/deactivate-account/components/deactivation-warning/deactivation-warning.component.html
+++ b/src/app/features/settings/account-settings/components/deactivate-account/components/deactivation-warning/deactivation-warning.component.html
@@ -14,7 +14,7 @@ <h3 class="account-setting-description">
       styleClass="w-full"
       (click)="dialogRef.close()"
       [label]="'settings.accountSettings.common.buttons.cancel' | translate"
-      [text]="true"
+      text
       severity="info"
     ></p-button>
 
diff --git a/src/app/features/settings/account-settings/components/two-factor-auth/components/configure-two-factor/configure-two-factor.component.html b/src/app/features/settings/account-settings/components/two-factor-auth/components/configure-two-factor/configure-two-factor.component.html
index 375cccbc9..63e4421ba 100644
--- a/src/app/features/settings/account-settings/components/two-factor-auth/components/configure-two-factor/configure-two-factor.component.html
+++ b/src/app/features/settings/account-settings/components/two-factor-auth/components/configure-two-factor/configure-two-factor.component.html
@@ -13,7 +13,7 @@ <h3 class="account-setting-description">
       class="w-full"
       styleClass="w-full"
       (click)="dialogRef.close()"
-      [text]="true"
+      text
       severity="info"
       [label]="'settings.accountSettings.common.buttons.cancel' | translate"
     ></p-button>
diff --git a/src/app/features/settings/account-settings/components/two-factor-auth/components/verify-two-factor/verify-two-factor.component.html b/src/app/features/settings/account-settings/components/two-factor-auth/components/verify-two-factor/verify-two-factor.component.html
index 38fc920a7..83697af35 100644
--- a/src/app/features/settings/account-settings/components/two-factor-auth/components/verify-two-factor/verify-two-factor.component.html
+++ b/src/app/features/settings/account-settings/components/two-factor-auth/components/verify-two-factor/verify-two-factor.component.html
@@ -7,7 +7,7 @@ <h3 class="account-setting-description">
       class="w-full"
       styleClass="w-full"
       (click)="dialogRef.close()"
-      [text]="true"
+      text
       severity="info"
       [label]="'settings.accountSettings.common.buttons.cancel' | translate"
     ></p-button>
diff --git a/src/app/features/settings/profile-settings/components/name/name.component.html b/src/app/features/settings/profile-settings/components/name/name.component.html
index f30e09bc6..4f468d717 100644
--- a/src/app/features/settings/profile-settings/components/name/name.component.html
+++ b/src/app/features/settings/profile-settings/components/name/name.component.html
@@ -1,7 +1,8 @@
 <div class="border-1 border-round-lg p-3 sm:p-5 name-container">
-  <h3 class="font-normal">
+  <p>
     {{ 'settings.profileSettings.name.description' | translate }}
-  </h3>
+  </p>
+
   <form [formGroup]="form" class="flex flex-column row-gap-2 md:row-gap-4 mt-4">
     <div class="flex flex-column row-gap-2 xl:flex-row xl:align-items-end xl:column-gap-3 w-full md:0 md:mb-3">
       <div class="w-full xl:w-6">
@@ -17,7 +18,7 @@ <h3 class="font-normal">
       </div>
     </div>
 
-    <div class="flex flex-column row-gap-2 xl:flex-row xl:align-items-end xl:column-gap-3">
+    <div class="flex flex-column row-gap-3 xl:flex-row xl:align-items-end xl:column-gap-3">
       <div class="w-full xl:w-6">
         <label for="given-name" class="font-normal xl:font-light">
           {{ 'settings.profileSettings.name.givenName' | translate }}
@@ -35,7 +36,7 @@ <h3 class="font-normal">
       </div>
     </div>
 
-    <div class="flex flex-column row-gap-2 xl:flex-row xl:align-items-end xl:column-gap-3">
+    <div class="flex flex-column row-gap-3 xl:flex-row xl:align-items-end xl:column-gap-3">
       <div class="w-full xl:w-6">
         <label for="family-name" class="font-normal xl:font-light">
           {{ 'settings.profileSettings.name.familyName' | translate }}
@@ -59,31 +60,31 @@ <h2>
     <div class="flex flex-column row-gap-4 sm:flex-row styles-container">
       <div class="flex flex-row column-gap-5">
         <div class="flex flex-column style-wrapper">
-          <h3>
+          <p>
             {{ 'settings.profileSettings.name.citationPreview.style' | translate }}
-          </h3>
-          <h3>
+          </p>
+          <p>
             {{ 'settings.profileSettings.name.citationPreview.citationFormat' | translate }}
-          </h3>
+          </p>
         </div>
         <div class="flex flex-column style-wrapper">
-          <h3 class="font-bold">APA</h3>
-          <h3>Doe, J. T.</h3>
+          <p class="font-bold">APA</p>
+          <p>Doe, J. T.</p>
         </div>
       </div>
 
       <div class="flex column-gap-5">
         <div class="flex flex-column style-wrapper">
-          <h3>
+          <p>
             {{ 'settings.profileSettings.name.citationPreview.style' | translate }}
-          </h3>
-          <h3>
+          </p>
+          <p>
             {{ 'settings.profileSettings.name.citationPreview.citationFormat' | translate }}
-          </h3>
+          </p>
         </div>
         <div class="flex flex-column style-wrapper">
-          <h3 class="font-bold">MLA</h3>
-          <h3>Doe, John T.</h3>
+          <p class="font-bold">MLA</p>
+          <p>Doe, John T.</p>
         </div>
       </div>
     </div>
diff --git a/src/app/features/settings/profile-settings/components/name/name.component.scss b/src/app/features/settings/profile-settings/components/name/name.component.scss
index 7b2401611..62e06c7f4 100644
--- a/src/app/features/settings/profile-settings/components/name/name.component.scss
+++ b/src/app/features/settings/profile-settings/components/name/name.component.scss
@@ -6,10 +6,6 @@
     border: 1px solid var.$grey-2;
     border-radius: 8px;
 
-    h3 {
-      text-transform: none;
-    }
-
     label {
       font-weight: 300;
       color: var.$dark-blue-1;
@@ -24,10 +20,6 @@
     .styles-container {
       column-gap: 8.5rem;
 
-      h3 {
-        font-weight: 400;
-      }
-
       .style-wrapper {
         row-gap: 0.85rem;
       }
diff --git a/src/app/shared/components/copy-button/copy-button.component.html b/src/app/shared/components/copy-button/copy-button.component.html
index fa44b4332..ccb28ed1b 100644
--- a/src/app/shared/components/copy-button/copy-button.component.html
+++ b/src/app/shared/components/copy-button/copy-button.component.html
@@ -1,3 +1,9 @@
-<p-button class="icon-copy-btn btn-icon-text" ariaLabel="Copy" [pTooltip]="tooltip() | translate" (click)="copy()">
-  <i class="osf-icon-copy"></i>
+<p-button
+  class="copy-icon-btn"
+  severity="contrast"
+  icon="fas fa-clone"
+  text
+  [pTooltip]="tooltip() | translate"
+  (click)="copy()"
+>
 </p-button>
diff --git a/src/app/shared/components/copy-button/copy-button.component.scss b/src/app/shared/components/copy-button/copy-button.component.scss
index 3a6d12984..bd2d523ab 100644
--- a/src/app/shared/components/copy-button/copy-button.component.scss
+++ b/src/app/shared/components/copy-button/copy-button.component.scss
@@ -1,13 +1,16 @@
-@use "assets/styles/variables" as var;
-
 :host {
   display: flex;
 }
 
-.icon-copy-btn {
-  cursor: pointer;
+.copy-icon-btn {
+  --p-button-padding-y: 0.125rem;
+  --p-button-text-contrast-color: var(--dark-blue-1);
+  --p-button-contrast-focus-ring-color: var(--dark-blue-1);
+  --p-button-text-contrast-active-background: transparent;
+  --p-button-text-contrast-hover-background: transparent;
+  --p-button-icon-only-width: 1.5rem;
 
   &:hover {
-    color: var.$dark-blue-2;
+    --p-button-text-contrast-color: var(--dark-blue-2);
   }
 }
diff --git a/src/app/shared/components/sub-header/sub-header.component.html b/src/app/shared/components/sub-header/sub-header.component.html
index 7263e0272..e2cc778eb 100644
--- a/src/app/shared/components/sub-header/sub-header.component.html
+++ b/src/app/shared/components/sub-header/sub-header.component.html
@@ -8,10 +8,14 @@
       @if (isLoading()) {
         <p-skeleton width="12rem" height="37px"></p-skeleton>
       } @else {
-        <h1 class="flex">
+        <h1 class="flex align-items-center">
           {{ title() }}
           @if (tooltip()) {
-            <i class="osf-icon-information text-base ml-1 blue-icon" [pTooltip]="tooltip()" tooltipPosition="right"></i>
+            <i
+              class="fas fa-circle-info ml-1 blue-icon cursor-pointer"
+              [pTooltip]="tooltip()"
+              tooltipPosition="right"
+            ></i>
           }
         </h1>
       }
diff --git a/src/app/shared/components/view-only-table/view-only-table.component.html b/src/app/shared/components/view-only-table/view-only-table.component.html
index b256a7a46..01e7f5a65 100644
--- a/src/app/shared/components/view-only-table/view-only-table.component.html
+++ b/src/app/shared/components/view-only-table/view-only-table.component.html
@@ -52,9 +52,10 @@
           <td>{{ item.anonymous ? 'Yes' : 'No' }}</td>
           <td>
             <p-button
-              ariaLabel="Delete link"
-              icon="osf-icon-trash"
-              class="btn-icon-text icon-copy-btn"
+              class="danger-icon-btn"
+              icon="fas fa-trash"
+              severity="danger"
+              text
               (click)="deleteLink.emit(item)"
             >
             </p-button>
diff --git a/src/app/shared/components/view-only-table/view-only-table.component.scss b/src/app/shared/components/view-only-table/view-only-table.component.scss
index da65d756c..1925187ea 100644
--- a/src/app/shared/components/view-only-table/view-only-table.component.scss
+++ b/src/app/shared/components/view-only-table/view-only-table.component.scss
@@ -1,9 +1,8 @@
-@use "assets/styles/variables" as var;
 @use "assets/styles/mixins" as mix;
 
 .icon-copy-btn {
   top: 50%;
-  right: mix.rem(16px);
+  right: mix.rem(6px);
   transform: translateY(-50%);
   width: mix.rem(24px);
   z-index: 1;
diff --git a/src/app/shared/pipes/decode-html.pipe.ts b/src/app/shared/pipes/decode-html.pipe.ts
index abcfdd5dc..30fb4d942 100644
--- a/src/app/shared/pipes/decode-html.pipe.ts
+++ b/src/app/shared/pipes/decode-html.pipe.ts
@@ -2,7 +2,6 @@ import { Pipe, PipeTransform } from '@angular/core';
 
 @Pipe({
   name: 'decodeHtml',
-  standalone: true,
 })
 export class DecodeHtmlPipe implements PipeTransform {
   transform(value: string): string {
diff --git a/src/assets/styles/_common.scss b/src/assets/styles/_common.scss
index 3d64ceb06..d5954d37d 100644
--- a/src/assets/styles/_common.scss
+++ b/src/assets/styles/_common.scss
@@ -42,7 +42,7 @@
   transition: opacity 0.3s ease;
   white-space: nowrap;
   border-radius: 8px;
-  box-shadow: 0 0 4px 0 #00000029;
+  box-shadow: 0 0 4px 0 var(--grey-outline);
   background: var.$white;
 
   &.visible {
@@ -61,15 +61,6 @@
   }
 }
 
-// ------------------------- Red icon -------------------------
-.red-icon {
-  color: var.$red-1;
-
-  &:hover {
-    color: var.$red-3;
-  }
-}
-
 // ------------------------- Blue icon -------------------------
 .blue-icon {
   color: var.$pr-blue-1;
diff --git a/src/assets/styles/overrides/button.scss b/src/assets/styles/overrides/button.scss
index e512db382..47dfaaf65 100644
--- a/src/assets/styles/overrides/button.scss
+++ b/src/assets/styles/overrides/button.scss
@@ -1,9 +1,20 @@
 @use "../variables" as var;
 @use "../mixins" as mix;
 
+:root {
+  --p-button-padding-x: 1rem;
+  --p-button-padding-y: 0.5625rem;
+
+  --p-button-label-font-weight: 700;
+
+  --p-button-raised-shadow: 0 0 4px 0 var(--grey-outline);
+}
+
 .p-button {
-  font-size: 0.875rem;
-  line-height: 1.5rem;
+  &:not(.p-button-icon-only) {
+    font-size: 0.875rem;
+    line-height: 1.5rem;
+  }
 
   &.p-button-info {
     --p-button-label-font-weight: 400;
@@ -20,44 +31,8 @@
   }
 }
 
-.p-button-icon-only,
 .btn-icon-only .p-button {
-  padding: mix.rem(15px) mix.rem(22px);
-}
-
-.btn-icon-text,
-.btn-icon {
-  .p-button {
-    background-color: transparent;
-    color: var.$pr-blue-1;
-    font-weight: 600;
-    @include mix.flex-center;
-    box-shadow: 0 0 4px 0 var.$grey-outline;
-    border: none;
-
-    &:hover {
-      color: var.$pr-blue-3;
-    }
-
-    &:disabled {
-      color: var.$grey-1;
-    }
-  }
-}
-
-.btn-icon {
-  .p-button {
-    color: var.$dark-blue-1;
-    padding: 0.7rem;
-
-    &:hover {
-      color: var.$pr-blue-1;
-    }
-
-    &:disabled {
-      color: var.$grey-1;
-    }
-  }
+  padding: mix.rem(13px) mix.rem(20px);
 }
 
 .btn-full-width {
@@ -68,11 +43,11 @@
   }
 }
 
-:root {
-  --p-button-padding-x: 1rem;
-  --p-button-padding-y: 0.5625rem;
+.danger-icon-btn {
+  --p-button-text-danger-hover-background: transparent;
+  --p-button-text-danger-active-background: transparent;
 
-  --p-button-label-font-weight: 700;
-
-  --p-button-raised-shadow: 0 0 4px 0 var(--grey-outline);
+  &:hover {
+    --p-button-text-danger-color: var(--red-3);
+  }
 }
diff --git a/src/assets/styles/overrides/tooltip.scss b/src/assets/styles/overrides/tooltip.scss
index e01a506d2..9f0ecc950 100644
--- a/src/assets/styles/overrides/tooltip.scss
+++ b/src/assets/styles/overrides/tooltip.scss
@@ -1,24 +1,14 @@
-@use "assets/styles/variables" as var;
+:root {
+  --p-tooltip-max-width: 20rem;
+}
 
 .p-tooltip-text {
-  display: flex !important;
-  background: var.$white;
-  color: var.$dark-blue-1;
-  border: 1px solid var.$grey-3;
-  padding: 1rem;
+  --p-tooltip-background: var(--white);
+  --p-tooltip-color: var(--dark-blue-1);
+  --p-tooltip-padding: 1rem;
+  --p-overlay-popover-shadow: 0px 0px 4px 0px var(--grey-outline);
 }
 
 .p-tooltip-arrow {
-  border-right-color: var.$white;
-  border: 1px solid var.$grey-3;
-}
-
-.p-tooltip.p-tooltip-bottom {
-  .p-tooltip-text {
-    min-width: auto;
-  }
-
-  .p-tooltip-arrow {
-    border: none;
-  }
+  border: none;
 }