diff --git a/src/app/cdk/alert-message/alert-message.component.html b/src/app/cdk/alert-message/alert-message.component.html
index 732272488..3da6fe496 100644
--- a/src/app/cdk/alert-message/alert-message.component.html
+++ b/src/app/cdk/alert-message/alert-message.component.html
@@ -35,7 +35,7 @@
   </div>
 
   <div>
-    <strong class="title orc-font-body">
+    <strong class="title">
       <ng-content select="[title]"></ng-content>
     </strong>
     <div class="content orc-font-body-small">
diff --git a/src/app/cdk/alert-message/alert-message.component.scss b/src/app/cdk/alert-message/alert-message.component.scss
index cdcddc88f..3cafed228 100644
--- a/src/app/cdk/alert-message/alert-message.component.scss
+++ b/src/app/cdk/alert-message/alert-message.component.scss
@@ -19,7 +19,6 @@
 
 .content {
   line-height: 21px !important;
-  letter-spacing: 0.25px !important;
 }
 
 .alert-container {
diff --git a/src/app/cdk/alert-message/alert-message.component.ts b/src/app/cdk/alert-message/alert-message.component.ts
index d796d75a7..84c474910 100644
--- a/src/app/cdk/alert-message/alert-message.component.ts
+++ b/src/app/cdk/alert-message/alert-message.component.ts
@@ -13,7 +13,7 @@ import { AlertType } from 'src/app/constants'
  * Use `title` and `content` attributes to display the message
  * Use headings (h1, h2...) for the title
  * Margin is set to `0 0 8px 0` for all headings
- * Line height and letter spacing is also standardized
+ * Line height is also standardized
  */
 export class AlertMessageComponent {
   @Input() type: AlertType = 'notice'
diff --git a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
index 8f35dc4b5..79c3b114c 100644
--- a/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
+++ b/src/app/cdk/side-bar/modals/modal-email/modal-email.component.html
@@ -50,14 +50,11 @@
     </p>
 
     <app-alert-message *ngIf="!hasVerifiedEmailAddress()">
-      <ng-container
-        title
-        class="orc-font-body"
-        i18n="@@side-bar.pleaseVerifyWarning"
-        >Please verify your email addresses</ng-container
-      >
+      <h3 title class="orc-font-body" i18n="@@side-bar.pleaseVerifyWarning">
+        Please verify your email addresses
+      </h3>
 
-      <p class="orc-font-body-small" content>
+      <div class="orc-font-body-small" content>
         <ng-container i18n="@@side-bar.verifyToAccessOrcidFeatures"
           >To access all of ORCID’s editing features you must verify at least
           one email address. Until then you will only be able to
@@ -69,7 +66,7 @@
         <ng-container i18n="@@side-bar.inYourOrcidRecord"
           >in your ORCID record.</ng-container
         >
-      </p>
+      </div>
     </app-alert-message>
     <!-- EMAIL LIST -->
     <section id="Email addresses" class="row email-list">
diff --git a/src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.html b/src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.html
index 8005e17d9..9ee91c881 100644
--- a/src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.html
+++ b/src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.html
@@ -51,7 +51,7 @@ <h3 title class="orc-font-body" i18n="@@side-bar.pleaseVerify">
       </p>
       <div class="no-wrap orc-font-body-small">
         <p class="email-container">{{ primaryEmail }}</p>
-        <p>
+        <p class="need-help">
           <strong i18n="@@side-bar.needHelp"> Need help?</strong> <br />
           <ng-container i18n="@@side-bar.visitOur"> Visit our </ng-container>
           <a
diff --git a/src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.scss b/src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.scss
index a8ddfca3a..abd869d50 100644
--- a/src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.scss
+++ b/src/app/cdk/top-bar-verification-email/top-bar-verification-email.component.scss
@@ -4,5 +4,13 @@
 }
 
 button {
-  margin-top: 16px;
+  margin-top: 8px;
+}
+
+.need-help {
+  margin-bottom: 0;
+}
+
+app-alert-message {
+  margin-bottom: 16px;
 }
diff --git a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
index 8fdde6dd7..3ccb9d421 100644
--- a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
+++ b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.html
@@ -133,14 +133,11 @@ <h2 class="orc-font-body-large" i18n="@@developerTools.additionalResources">
 </p>
 
 <app-alert-message *ngIf="!hasVerifiedEmailAddress">
-  <ng-container
-    title
-    class="orc-font-body"
-    i18n="@@developerTools.noVerifiedEmailAddresses"
-    >No verified email addresses found</ng-container
-  >
+  <h3 title i18n="@@developerTools.noVerifiedEmailAddresses">
+    No verified email addresses found
+  </h3>
 
-  <p content class="orc-font-body-small">
+  <div content>
     <ng-container i18n="@@developerTools.youMustHaveAtLeastOneVerifiedEmail"
       >You must have at least one verified email address in your ORCID account
       to register for your Public API credentials. Manage your email addresses
@@ -151,17 +148,21 @@ <h2 class="orc-font-body-large" i18n="@@developerTools.additionalResources">
       i18n="@@developerTools.emailsAndDomainsSection"
       >Emails and domains section of your ORCID record</a
     >.
-  </p>
+  </div>
 </app-alert-message>
 
-<app-alert-message *ngIf="!checked && dirty" type="warning">
-  <ng-container
+<app-alert-message
+  *ngIf="!checked && dirty"
+  type="warning"
+  class="alert-warning"
+>
+  <div
     content
     i18n="@@developerTools.youMustAcceptThePublicClientTermsOfService"
   >
     You must accept the Public Client Terms of Service before you can register
     for your Public API credentials.
-  </ng-container>
+  </div>
 </app-alert-message>
 
 <app-top-bar-verification-email
diff --git a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.scss b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.scss
index 0746ee38e..6686ca15f 100644
--- a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.scss
+++ b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.scss
@@ -20,19 +20,6 @@ h2 {
   margin-top: 32px;
 }
 
-.info {
-  padding: 16px;
-  margin-top: 16px;
-  margin-bottom: 16px;
-  border: solid 2px;
-  border-radius: 4px;
-  display: flex;
-
-  p {
-    margin: 0;
-  }
-}
-
 .checkbox-container {
   margin-bottom: 32px;
   margin-top: 16px;
@@ -56,3 +43,9 @@ app-alert-message {
     margin-bottom: 0;
   }
 }
+
+.alert-warning {
+  div {
+    line-height: 24px;
+  }
+}
diff --git a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.scss-theme.scss b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.scss-theme.scss
index 3cad1695d..78bb1ad58 100644
--- a/src/app/developer-tools/components/terms-of-use/terms-of-use.component.scss-theme.scss
+++ b/src/app/developer-tools/components/terms-of-use/terms-of-use.component.scss-theme.scss
@@ -7,20 +7,6 @@
   $warn: map-get($theme, accent);
   $foreground: map-get($theme, foreground);
   $background: map-get($theme, background);
-
-  .info {
-    border-color: mat.get-color-from-palette(
-      $foreground,
-      'state-warning-dark'
-    ) !important;
-
-    mat-icon {
-      color: mat.get-color-from-palette(
-        $foreground,
-        'state-warning-dark'
-      ) !important;
-    }
-  }
 }
 
 @include developer-tools-theme($orcid-app-theme);
diff --git a/src/app/developer-tools/pages/developer-tools/developer-tools.component.html b/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
index 3d4ac9467..479a687d4 100644
--- a/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
+++ b/src/app/developer-tools/pages/developer-tools/developer-tools.component.html
@@ -46,12 +46,12 @@ <h3 title i18n="@@developerTools.warningDuplicated">
               You’ve registered for your ORCID Public API credentials
             </h3>
 
-            <p content i18n="@@developerTools.addYourApplicationDetails">
+            <div content i18n="@@developerTools.addYourApplicationDetails">
               Add your application details and one or more redirect URIs in the
               form below. Once these details are saved we’ll generate your
               client ID and secret so you can start using the Public API right
               away.
-            </p>
+            </div>
           </app-alert-message>
 
           <h2
@@ -244,9 +244,9 @@ <h4 title i18n="@@developerTools.pleaseNote">Please note</h4>
             *ngIf="triedToSaveWithoutUrls"
             class="warning-panel"
           >
-            <ng-container content i18n="@@developerTools.addARedirectUriBefore">
+            <div content i18n="@@developerTools.addARedirectUriBefore">
               Please add a redirect URI before saving your application
-            </ng-container>
+            </div>
           </app-alert-message>
 
           <div class="input-container" formArrayName="redirectUris">
@@ -484,10 +484,7 @@ <h3 class="orc-font-body" i18n="@@developerTools.exampleCode">
         </ng-container>
       </ng-container>
 
-      <app-terms-of-use
-        *ngIf="!developerToolsEnable && !this.loadingUserDevTolsState"
-        (developerToolsEnable)="ngOnInit()"
-      ></app-terms-of-use>
+      <app-terms-of-use (developerToolsEnable)="ngOnInit()"></app-terms-of-use>
     </main>
   </div>
 </div>
diff --git a/src/app/developer-tools/pages/developer-tools/developer-tools.component.scss b/src/app/developer-tools/pages/developer-tools/developer-tools.component.scss
index 2eb3b3b41..b8c6bdeba 100644
--- a/src/app/developer-tools/pages/developer-tools/developer-tools.component.scss
+++ b/src/app/developer-tools/pages/developer-tools/developer-tools.component.scss
@@ -119,6 +119,9 @@ app-alert-message {
     margin-top: 16px;
   }
   &.warning-panel {
+    div {
+      line-height: 24px !important;
+    }
     margin-bottom: 16px;
     margin-top: -16px;
   }
diff --git a/src/app/record/components/work/modals/modal-combine-works/modal-combine-works.component.html b/src/app/record/components/work/modals/modal-combine-works/modal-combine-works.component.html
index 03623ddd6..f9fdc4028 100644
--- a/src/app/record/components/work/modals/modal-combine-works/modal-combine-works.component.html
+++ b/src/app/record/components/work/modals/modal-combine-works/modal-combine-works.component.html
@@ -84,9 +84,9 @@ <h2 class="orc-font-body-small">
       </div>
     </ng-container>
     <app-alert-message type="warning">
-      <ng-container title i18n="@@works.groupWorksAreYouSure"
-        >Are you sure you want to group these works?</ng-container
-      >
+      <h3 title i18n="@@works.groupWorksAreYouSure">
+        Are you sure you want to group these works?
+      </h3>
       <div content class="orc-font-body-small">
         <p i18n="@@works.groupWorksRecommendation">
           We recommend only grouping similar or related works together. Related